Java, C#: Refactor implicitSsaDefSign in sign analysis

tamasvajk · tamasvajk · commit 7545fe74e3c2 · 2020-10-02T09:09:23.000+02:00
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll
@@ -245,6 +245,13 @@ private Sign ssaDefSign(SsaVariable v) {
   )
 }
 
+/** Returns the sign of implicit SSA definition `v`. */
+private Sign implicitSsaDefSign(SsaVariable v) {
+  result = fieldSign(getImplicitSsaDeclaration(v))
+  or
+  anySign(result) and nonFieldImplicitSsaDefinition(v)
+}
+
 /** Gets a possible sign for `e`. */
 cached
 Sign exprSign(Expr e) {
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
@@ -122,11 +122,14 @@ private module Impl {
     )
   }
 
-  /** Returns the sign of implicit SSA definition `v`. */
-  Sign implicitSsaDefSign(Ssa::ImplicitDefinition v) {
-    result = fieldSign(v.getSourceVariable().getAssignable())
-    or
-    anySign(result) and not v.getSourceVariable().getAssignable() instanceof Field
+  /** Gets the variable underlying the implicit SSA variable `v`. */
+  Declaration getImplicitSsaDeclaration(Ssa::ImplicitDefinition v) {
+    result = v.getSourceVariable().getAssignable()
+  }
+
+  /** Holds if the variable underlying the implicit SSA variable `v` is not a field. */
+  predicate nonFieldImplicitSsaDefinition(Ssa::ImplicitDefinition v) {
+    not getImplicitSsaDeclaration(v) instanceof Field
   }
 
   /** Gets a possible sign for `f`. */
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll b/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll
@@ -245,6 +245,13 @@ private Sign ssaDefSign(SsaVariable v) {
   )
 }
 
+/** Returns the sign of implicit SSA definition `v`. */
+private Sign implicitSsaDefSign(SsaVariable v) {
+  result = fieldSign(getImplicitSsaDeclaration(v))
+  or
+  anySign(result) and nonFieldImplicitSsaDefinition(v)
+}
+
 /** Gets a possible sign for `e`. */
 cached
 Sign exprSign(Expr e) {
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
@@ -115,13 +115,15 @@ private module Impl {
     )
   }
 
-  /** Returns the sign of implicit SSA definition `v`. */
-  Sign implicitSsaDefSign(SsaVariable v) {
-    result = fieldSign(v.(SsaImplicitUpdate).getSourceVariable().getVariable())
-    or
-    result = fieldSign(v.(SsaImplicitInit).getSourceVariable().getVariable())
-    or
-    anySign(result) and exists(Parameter p | v.(SsaImplicitInit).isParameterDefinition(p))
+  /** Gets the variable underlying the implicit SSA variable `v`. */
+  Variable getImplicitSsaDeclaration(SsaVariable v) {
+    result = v.(SsaImplicitUpdate).getSourceVariable().getVariable() or
+    result = v.(SsaImplicitInit).getSourceVariable().getVariable()
+  }
+
+  /** Holds if the variable underlying the implicit SSA variable `v` is not a field. */
+  predicate nonFieldImplicitSsaDefinition(SsaImplicitInit v) {
+    exists(Parameter p | v.isParameterDefinition(p))
   }
 
   /** Gets a possible sign for `f`. */

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,13 @@ private Sign ssaDefSign(SsaVariable v) {`
`245`	`245`	`)`
`246`	`246`	`}`
`247`	`247`
	`248`	+/** Returns the sign of implicit SSA definition `v`. */
	`249`	`+private Sign implicitSsaDefSign(SsaVariable v) {`
	`250`	`+ result = fieldSign(getImplicitSsaDeclaration(v))`
	`251`	`+ or`
	`252`	`+ anySign(result) and nonFieldImplicitSsaDefinition(v)`
	`253`	`+}`
	`254`	`+`
`248`	`255`	/** Gets a possible sign for `e`. */
`249`	`256`	`cached`
`250`	`257`	`Sign exprSign(Expr e) {`
Original file line number	Diff line number	Diff line change
`@@ -122,11 +122,14 @@ private module Impl {`
`122`	`122`	`)`
`123`	`123`	`}`
`124`	`124`
`125`		- /** Returns the sign of implicit SSA definition `v`. */
`126`		`- Sign implicitSsaDefSign(Ssa::ImplicitDefinition v) {`
`127`		`- result = fieldSign(v.getSourceVariable().getAssignable())`
`128`		`- or`
`129`		`- anySign(result) and not v.getSourceVariable().getAssignable() instanceof Field`
	`125`	+ /** Gets the variable underlying the implicit SSA variable `v`. */
	`126`	`+ Declaration getImplicitSsaDeclaration(Ssa::ImplicitDefinition v) {`
	`127`	`+ result = v.getSourceVariable().getAssignable()`
	`128`	`+ }`
	`129`	`+`
	`130`	+ /** Holds if the variable underlying the implicit SSA variable `v` is not a field. */
	`131`	`+ predicate nonFieldImplicitSsaDefinition(Ssa::ImplicitDefinition v) {`
	`132`	`+ not getImplicitSsaDeclaration(v) instanceof Field`
`130`	`133`	`}`
`131`	`134`
`132`	`135`	/** Gets a possible sign for `f`. */