Merge branch 'wala' into master

This commit is contained in:
Juergen Graf 2014-05-21 12:49:46 +02:00
commit 5a6f6c88e9
1 changed files with 5 additions and 1 deletions

View File

@ -131,7 +131,11 @@ public class BypassMethodTargetSelector implements MethodTargetSelector {
// we want to generate a NoOpSummary for this method.
return findOrCreateSyntheticMethod(site.getDeclaredTarget(), site.isStatic());
}
if (parent instanceof ClassHierarchyMethodTargetSelector) {
// not using if (instanceof ClassHierarchyMethodTargetSelector) because
// we want to make sure that getCalleeTarget() is still called if
// parent is a subclass of ClassHierarchyMethodTargetSelector
if (parent.getClass() == ClassHierarchyMethodTargetSelector.class) {
// already checked this case and decided not to bypass
return chaTarget;
}