checking supertypes for annotations

Reviewed By: jeremydubreil

Differential Revision: D3221560

fb-gh-sync-id: 3ac68ef
fbshipit-source-id: 3ac68ef

infer/src/checkers/annotationReachability.ml

@@ -120,9 +120,13 @@ let is_modeled_expensive =
 let check_attributes check tenv pname =
   let check_class_attributes check tenv = function
     | Procname.Java java_pname ->
+        let check_class_annots { Sil.struct_annotations; } =
+          check struct_annotations in
         begin
-          match Annotations.get_declaring_class_annotations java_pname tenv with
-          | Some annotations -> check annotations
+          match Tenv.proc_extract_declaring_class_typ tenv java_pname with
+          | Some current_class ->
+              check_class_annots current_class ||
+              PatternMatch.strict_supertype_exists tenv check_class_annots current_class
           | None -> false
         end
     | _ -> false in

infer/tests/endtoend/java/checkers/ExpensiveCallTest.java

@@ -50,10 +50,9 @@ public class ExpensiveCallTest {
         "performanceCriticalMethod1",
         "performanceCriticalMethod2",
         "performanceCriticalMethod3",
-        // TODO: make subclassing work
-        //"subclassPerformanceCriticalMethod1",
-        //"subclassPerformanceCriticalMethod2",
-        //"subclassPerformanceCriticalMethod3",
+        "subclassPerformanceCriticalMethod1",
+        "subclassPerformanceCriticalMethod2",
+        "subclassPerformanceCriticalMethod3",
         "callMethodOnExpensiveClass",
         "onlyOneExpensiveCallUsingUnlikely",
         "callsExpensiveInTheUnlikelyElseBranch",