Java 12: tweak queries to preserve behavior

yh-semmle · yh-semmle · commit 6d59b4e0491d · 2019-04-30T10:59:08.000-04:00
This accounts for the changes in af8faee1.
diff --git a/java/ql/src/Likely Bugs/Concurrency/WaitWithTwoLocks.ql b/java/ql/src/Likely Bugs/Concurrency/WaitWithTwoLocks.ql
@@ -13,10 +13,10 @@
 
 import java
 
-/** A `synchronized` method or statement. */
-class Synched extends StmtParent {
+/** A `synchronized` method body or statement. */
+class Synched extends Stmt {
   Synched() {
-    this.(Method).isSynchronized() or
+    this.getParent().(Method).isSynchronized() or
     this instanceof SynchronizedStmt
   }
 }
diff --git a/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.ql b/java/ql/src/Security/CWE/CWE-833/LockOrderInconsistency.ql
@@ -46,7 +46,9 @@ class Synched extends Top {
     or
     result = this.(SynchronizedStmt).getAChild+()
     or
-    exists(MethodAccess ma | ma = result | ma.getEnclosingStmt().getEnclosingStmt*() = this)
+    exists(MethodAccess ma | ma = result |
+      ma.getEnclosingStmt().getEnclosingStmt*() = this or ma.getEnclosingCallable() = this
+    )
   }
 
   /** The variable on which synchronization is performed, provided this element is a `SynchronizedStmt`. */

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@`
`13`	`13`
`14`	`14`	`import java`
`15`	`15`
`16`		-/** A `synchronized` method or statement. */
`17`		`-class Synched extends StmtParent {`
	`16`	+/** A `synchronized` method body or statement. */
	`17`	`+class Synched extends Stmt {`
`18`	`18`	`Synched() {`
`19`		`- this.(Method).isSynchronized() or`
	`19`	`+ this.getParent().(Method).isSynchronized() or`
`20`	`20`	`this instanceof SynchronizedStmt`
`21`	`21`	`}`
`22`	`22`	`}`