Always consider Java types as subtypes of themselves

Summary: public
I realized that this code was returning false for `android.content.Context <: android.content.Context`.

Reviewed By: cristianoc

Differential Revision: D2699112

fb-gh-sync-id: 4c01c42

infer/src/harness/androidFramework.ml

@@ -278,7 +278,7 @@ let get_all_supertypes typ tenv =
   and get_supers_rec typ tenv all_supers =
     let direct_supers = get_direct_supers typ in
     IList.fold_left (fun typs (_, name) -> add_typ name typs) all_supers direct_supers in
-  get_supers_rec typ tenv TypSet.empty
+  get_supers_rec typ tenv (TypSet.add typ TypSet.empty)
 
 (** return true if [typ0] <: [typ1] *)
 let is_subtype (typ0 : Sil.typ) (typ1 : Sil.typ) tenv =

infer/tests/ant_report.json

@@ -9,6 +9,11 @@
     "file": "codetoanalyze/java/infer/ContextLeaks.java",
     "procedure": "void ContextLeaks.directLeak()"
   },
+  {
+    "bug_type": "CONTEXT_LEAK",
+    "file": "codetoanalyze/java/infer/ContextLeaks.java",
+    "procedure": "ContextLeaks$Singleton ContextLeaks$Singleton.getInstance(Context)"
+  },
   {
     "bug_type": "CONTEXT_LEAK",
     "file": "codetoanalyze/java/infer/ContextLeaks.java",

infer/tests/buck_report.json

@@ -9,6 +9,11 @@
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
     "procedure": "void ContextLeaks.directLeak()"
   },
+  {
+    "bug_type": "CONTEXT_LEAK",
+    "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",
+    "procedure": "ContextLeaks$Singleton ContextLeaks$Singleton.getInstance(Context)"
+  },
   {
     "bug_type": "CONTEXT_LEAK",
     "file": "infer/tests/codetoanalyze/java/infer/ContextLeaks.java",

infer/tests/endtoend/java/infer/ContextLeaksTest.java

@@ -45,7 +45,8 @@ public class ContextLeaksTest {
         "nonStaticInnerClassLeak",
         "leakAfterInstanceFieldWrite",
         "singletonLeak",
-        "indirectHandlerLeak"
+        "indirectHandlerLeak",
+        "getInstance",
     };
     assertThat(
         "Results should contain " + CONTEXT_LEAK,