Merge pull request #1294 from yh-semmle/java12-ql

Java: add Java 12 support

Author: aschackmull

java/ql/src/Likely Bugs/Comparison/MissingInstanceofInEquals.ql

@@ -17,7 +17,7 @@ import semmle.code.java.JDK
 class CheckedCast extends CastExpr {
   CheckedCast() {
     exists(TryStmt try, RefType cce |
-      this.getEnclosingStmt().getParent+() = try and
+      this.getEnclosingStmt().getEnclosingStmt+() = try and
       try.getACatchClause().getVariable().getType() = cce and
       cce.getQualifiedName() = "java.lang.ClassCastException"
     )

java/ql/src/Likely Bugs/Concurrency/BusyWait.ql

@@ -69,8 +69,8 @@ class DangerStmt extends Stmt {
 
 from WhileStmt s, DangerStmt d
 where
-  d.getParent+() = s and
+  d.getEnclosingStmt+() = s and
   not exists(MethodAccess call | callsCommunicationMethod(call.getMethod()) |
-    call.getEnclosingStmt().getParent*() = s
+    call.getEnclosingStmt().getEnclosingStmt*() = s
   )
 select d, "Prefer wait/notify or java.util.concurrent to communicate between threads."

java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.ql

@@ -33,7 +33,7 @@ where
     1 = strictcount(FieldAccess fa |
         fa.getField() = f and
         fa.getEnclosingCallable() = sync.getEnclosingCallable() and
-        not fa.getEnclosingStmt().getParent*() = sync.getBlock()
+        not fa.getEnclosingStmt().getEnclosingStmt*() = sync.getBlock()
       )
   )
 select sync, "Double-checked locking on the non-volatile field $@ is not thread-safe.", f,

java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLocking.qll

@@ -35,8 +35,8 @@ private Expr getANullCheck(Field f) {
  * as they are always safe to initialize with double-checked locking.
  */
 predicate doubleCheckedLocking(IfStmt if1, IfStmt if2, SynchronizedStmt sync, Field f) {
-  if1.getThen() = sync.getParent*() and
-  sync.getBlock() = if2.getParent*() and
+  if1.getThen() = sync.getEnclosingStmt*() and
+  sync.getBlock() = if2.getEnclosingStmt*() and
   if1.getCondition() = getANullCheck(f) and
   if2.getCondition() = getANullCheck(f)
 }

java/ql/src/Likely Bugs/Concurrency/DoubleCheckedLockingWithInitRace.ql

@@ -34,8 +34,8 @@ class SideEffect extends Expr {
 from IfStmt if1, IfStmt if2, SynchronizedStmt sync, Field f, AssignExpr a, SideEffect se
 where
   doubleCheckedLocking(if1, if2, sync, f) and
-  a.getEnclosingStmt().getParent*() = if2.getThen() and
-  se.getEnclosingStmt().getParent*() = sync.getBlock() and
+  a.getEnclosingStmt().getEnclosingStmt*() = if2.getThen() and
+  se.getEnclosingStmt().getEnclosingStmt*() = sync.getBlock() and
   a.(ControlFlowNode).getASuccessor+() = se and
   a.getDest().(FieldAccess).getField() = f
 select a,

java/ql/src/Likely Bugs/Concurrency/FutileSynchOnField.ql

@@ -23,6 +23,6 @@ from SynchronizedStmt s, Field f, Assignment a
 where
   synchField(s) = f and
   assignmentToField(a) = f and
-  a.getEnclosingStmt().getParent*() = s
+  a.getEnclosingStmt().getEnclosingStmt*() = s
 select a, "Synchronization on field $@ in futile attempt to guard that field.", f,
   f.getDeclaringType().getName() + "." + f.getName()

java/ql/src/Likely Bugs/Concurrency/InconsistentAccess.ql

@@ -24,7 +24,7 @@ predicate withinInitializer(Expr e) {
 }
 
 predicate locallySynchronized(MethodAccess ma) {
-  ma.getEnclosingStmt().getParent+() instanceof SynchronizedStmt
+  ma.getEnclosingStmt().getEnclosingStmt+() instanceof SynchronizedStmt
 }
 
 predicate hasUnsynchronizedCall(Method m) {
@@ -41,7 +41,7 @@ predicate hasUnsynchronizedCall(Method m) {
 
 predicate withinLocalSynchronization(Expr e) {
   e.getEnclosingCallable().isSynchronized() or
-  e.getEnclosingStmt().getParent+() instanceof SynchronizedStmt
+  e.getEnclosingStmt().getEnclosingStmt+() instanceof SynchronizedStmt
 }
 
 class MyField extends Field {

java/ql/src/Likely Bugs/Concurrency/LazyInitStaticField.ql

@@ -94,14 +94,14 @@ where
   not method instanceof StaticInitializer and
   // There must be an unsynchronized read.
   exists(IfStmt unsyncNullCheck | unsyncNullCheck = init.getAnEnclosingNullCheck() |
-    not unsyncNullCheck.getParent+() instanceof ValidSynchStmt
+    not unsyncNullCheck.getEnclosingStmt+() instanceof ValidSynchStmt
   ) and
-  if i.getParent+() instanceof ValidSynchStmt
+  if i.getEnclosingStmt+() instanceof ValidSynchStmt
   then (
     not init.getField().isVolatile() and
     message = "The field must be volatile."
   ) else (
-    if i.getParent+() instanceof SynchronizedStmt
+    if i.getEnclosingStmt+() instanceof SynchronizedStmt
     then message = "Bad synchronization."
     else message = "Missing synchronization."
   )

java/ql/src/Likely Bugs/Concurrency/SleepWithLock.ql

@@ -20,7 +20,7 @@ where
   sleep.hasName("sleep") and
   sleep.getDeclaringType().hasQualifiedName("java.lang", "Thread") and
   (
-    ma.getEnclosingStmt().getParent*() instanceof SynchronizedStmt or
+    ma.getEnclosingStmt().getEnclosingStmt*() instanceof SynchronizedStmt or
     ma.getEnclosingCallable().isSynchronized()
   )
 select ma, "sleep() with lock held."

java/ql/src/Likely Bugs/Concurrency/WaitOutsideLoop.ql

@@ -23,5 +23,5 @@ class WaitMethod extends Method {
 from MethodAccess ma
 where
   ma.getMethod() instanceof WaitMethod and
-  not exists(LoopStmt s | ma.getEnclosingStmt().getParent*() = s)
+  not exists(LoopStmt s | ma.getEnclosingStmt().getEnclosingStmt*() = s)
 select ma, "To avoid spurious wake-ups, 'wait' should only be called inside a loop."