Merge remote-tracking branch 'wala/master'

This commit is contained in:
Andrew Johnson 2014-05-22 00:40:20 -04:00
commit be4e805dc4
1 changed files with 5 additions and 1 deletions

View File

@ -125,7 +125,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;
}