[threadsafety] Model more xThreadUtil methods

Reviewed By: sblackshear

Differential Revision: D5137061

fbshipit-source-id: ffd030c

infer/src/checkers/ThreadSafety.ml

@@ -71,9 +71,14 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
     | Unknown
     | ThreadedIfTrue
 
+  let is_thread_utils_type java_pname =
+    let pn = (Typ.Procname.java_get_class_name java_pname) in
+    String.is_suffix ~suffix:"ThreadUtils" pn
+    || String.is_suffix ~suffix:"ThreadUtil" pn
+
   let is_thread_utils_method method_name_str = function
     | Typ.Procname.Java java_pname ->
-        String.is_suffix ~suffix:"ThreadUtils" (Typ.Procname.java_get_class_name java_pname)
+        is_thread_utils_type  java_pname
         && String.equal (Typ.Procname.java_get_method java_pname) method_name_str
     | _ -> false
 
@@ -117,11 +122,17 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
 
   let get_thread_model = function
     | Typ.Procname.Java java_pname ->
-        if is_thread_utils_method "assertMainThread" (Typ.Procname.Java java_pname) then
-          Threaded
-        else if is_thread_utils_method "isMainThread" (Typ.Procname.Java java_pname) then
-          ThreadedIfTrue
+        if is_thread_utils_type java_pname then
+          match Typ.Procname.java_get_method java_pname with
+          | "assertMainThread"
+          | "checkOnMainThread"
+          | "assertOnUiThread"   -> Threaded
+          | "isMainThread"
+          | "isUiThread"         -> ThreadedIfTrue
+          | _                    -> Unknown
         else Unknown
+    (*Note we are not modelling assertOnNonUiThread or
+      assertOnBackgroundThread. These treated as Unknown*)
     | _ -> Unknown
 
   let add_conditional_ownership_attribute access_path formal_map attribute_map attributes =

infer/tests/codetoanalyze/java/threadsafety/RaceWithMainThread.java

@@ -12,22 +12,35 @@ package codetoanalyze.java.checkers;
 import javax.annotation.concurrent.ThreadSafe;
 
 class OurThreadUtils{
-  native boolean isMainThread();
-  void assertMainThread(){}
-  void assertHoldsLock(Object lock){}
+  native static boolean isMainThread();
+  static void assertMainThread(){}
+  static void assertHoldsLock(Object lock){}
 }
 
+class OurThreadUtil{ /*This is like AndroidThreadUtil*/
+  native static boolean isUiThread();
+  static void assertOnUiThread(){}
+}
+
+
 @ThreadSafe
 class RaceWithMainThread{
 
   Integer f;
-  OurThreadUtils o;
 
   void main_thread_OK(){
-      o.assertMainThread();
+      OurThreadUtils.assertMainThread();
       f = 88;
    }
 
+  Integer f1;
+
+  void main_thread1_OK(){
+      OurThreadUtil.assertOnUiThread();
+      f1 = 88;
+   }
+
+
    void main_thread_indirect_OK() {
      main_thread_OK();
      f = 77;
@@ -35,7 +48,7 @@ class RaceWithMainThread{
 
   void read_from_main_thread_OK(){
     Integer x;
-    o.assertMainThread();
+    OurThreadUtils.assertMainThread();
     x = f;
   }
 
@@ -44,6 +57,11 @@ class RaceWithMainThread{
     x = f;
   }
 
+  void read_unprotected_unthreaded1_Bad(){
+    Integer x;
+    x = f1;
+  }
+
   /*There is a particularly subtle idiom which avoids races, where a
     variable can be read without protection on the main thread, if
     it is written with protection on the main thread and read with
@@ -53,7 +71,7 @@ class RaceWithMainThread{
   Integer i;
 
   void protected_write_on_main_thread_OK() {
-    o.assertMainThread();
+    OurThreadUtils.assertMainThread();
     synchronized (this) {
       i = 99;
     }
@@ -61,7 +79,7 @@ class RaceWithMainThread{
 
   void unprotected_read_on_main_thread_OK() {
     Integer x;
-    o.assertMainThread();
+    OurThreadUtils.assertMainThread();
     x = i;
   }
 
@@ -82,7 +100,7 @@ class RaceWithMainThread{
   Integer g;
 
   void holds_lock_OK(){
-      o.assertHoldsLock(this);
+      OurThreadUtils.assertHoldsLock(this);
       g = 88;
    }
 
@@ -97,7 +115,7 @@ Integer ff;
    if (b)
    { /*People not literally putting this assert inside if's,
        but implicitly by method calls */
-     o. assertMainThread();
+     OurThreadUtils.assertMainThread();
      ff = 88;
    }
  }
@@ -107,7 +125,7 @@ Integer ff;
  void conditional_Bad(boolean b){
    if (b)
    {
-     o.assertMainThread();
+     OurThreadUtils.assertMainThread();
      ff = 88;
    } else {
      ff = 99;
@@ -115,14 +133,22 @@ Integer ff;
  }
 
  void conditional_isMainThread_Ok(){
-   if (o.isMainThread())
+   if (OurThreadUtils.isMainThread())
+   {
+     ff = 88;
+   }
+ }
+
+ void conditional_isUiThread_Ok(){
+   if (OurThreadUtil.isUiThread())
    {
      ff = 88;
    }
  }
 
+
  void conditional_isMainThread_ElseBranch_Bad(){
-   if (o.isMainThread())
+   if (OurThreadUtils.isMainThread())
    {
     synchronized(this){
      ff = 88;
@@ -132,15 +158,27 @@ Integer ff;
    }
  }
 
+ void conditional_isUiThread_ElseBranch_Bad(){
+   if (OurThreadUtil.isUiThread())
+   {
+    synchronized(this){
+     ff = 88;
+   }
+   } else {
+     ff = 99;
+   }
+ }
+
+
  void conditional_isMainThread_Negation_Bad(){
-   if (!o.isMainThread())
+   if (!OurThreadUtils.isMainThread())
    {
      ff = 88;
    }
  }
 
  void conditional_isMainThread_ElseBranch_Ok(){
-   if (!o.isMainThread())
+   if (!OurThreadUtils.isMainThread())
    {
     synchronized(this){
      ff = 88;

infer/tests/codetoanalyze/java/threadsafety/issues.exp

@@ -68,7 +68,9 @@ codetoanalyze/java/threadsafety/Ownership.java, void Ownership.writeToOwnedInCal
 codetoanalyze/java/threadsafety/RaceWithMainThread.java, void RaceWithMainThread.conditional_Bad(boolean), 6, THREAD_SAFETY_VIOLATION, [access to `codetoanalyze.java.checkers.RaceWithMainThread.ff`]
 codetoanalyze/java/threadsafety/RaceWithMainThread.java, void RaceWithMainThread.conditional_isMainThread_ElseBranch_Bad(), 7, THREAD_SAFETY_VIOLATION, [access to `codetoanalyze.java.checkers.RaceWithMainThread.ff`]
 codetoanalyze/java/threadsafety/RaceWithMainThread.java, void RaceWithMainThread.conditional_isMainThread_Negation_Bad(), 3, THREAD_SAFETY_VIOLATION, [access to `codetoanalyze.java.checkers.RaceWithMainThread.ff`]
+codetoanalyze/java/threadsafety/RaceWithMainThread.java, void RaceWithMainThread.conditional_isUiThread_ElseBranch_Bad(), 7, THREAD_SAFETY_VIOLATION, [access to `codetoanalyze.java.checkers.RaceWithMainThread.ff`]
 codetoanalyze/java/threadsafety/RaceWithMainThread.java, void RaceWithMainThread.readProtectedUnthreadedBad(), 3, THREAD_SAFETY_VIOLATION, [access to `codetoanalyze.java.checkers.RaceWithMainThread.f`]
+codetoanalyze/java/threadsafety/RaceWithMainThread.java, void RaceWithMainThread.read_unprotected_unthreaded1_Bad(), 2, THREAD_SAFETY_VIOLATION, [<Beginning of read trace>,access to `codetoanalyze.java.checkers.RaceWithMainThread.f1`,<Beginning of write trace>,access to `codetoanalyze.java.checkers.RaceWithMainThread.f1`]
 codetoanalyze/java/threadsafety/RaceWithMainThread.java, void RaceWithMainThread.read_unprotected_unthreaded_Bad(), 2, THREAD_SAFETY_VIOLATION, [<Beginning of read trace>,access to `codetoanalyze.java.checkers.RaceWithMainThread.f`,<Beginning of write trace>,access to `codetoanalyze.java.checkers.RaceWithMainThread.f`]
 codetoanalyze/java/threadsafety/ReadWriteRaces.java, Object ReadWriteRaces.callUnprotecteReadInCallee(), 1, THREAD_SAFETY_VIOLATION, [<Beginning of read trace>,call to Object ReadWriteRaces.unprotectedReadInCallee(),access to `codetoanalyze.java.checkers.ReadWriteRaces.field1`,<Beginning of write trace>,access to `codetoanalyze.java.checkers.ReadWriteRaces.field1`]
 codetoanalyze/java/threadsafety/ReadWriteRaces.java, Object ReadWriteRaces.unprotectedRead1(), 1, THREAD_SAFETY_VIOLATION, [<Beginning of read trace>,access to `codetoanalyze.java.checkers.ReadWriteRaces.field1`,<Beginning of write trace>,access to `codetoanalyze.java.checkers.ReadWriteRaces.field1`]