Python: ObjectAPI to ValueAPI: ReturnValueIgnored: Reorganizes predicates

BekaValentine · BekaValentine · commit cc53b15a5d6e · 2020-04-01T14:41:49.000-07:00
diff --git a/python/ql/src/Functions/ReturnValueIgnored.ql b/python/ql/src/Functions/ReturnValueIgnored.ql
@@ -50,7 +50,7 @@ predicate returns_meaningful_value(FunctionValue f) {
          */
 
         f.isBuiltin() and
-        f.(CallableObjectInternal).getAnInferredReturnType() != ClassValue::nonetype() and
+        f.getAnInferredReturnType() != ClassValue::nonetype() and
         not f.getName() = "__import__"
     )
 }
diff --git a/python/ql/src/semmle/python/objects/Callables.qll b/python/ql/src/semmle/python/objects/Callables.qll
@@ -49,13 +49,6 @@ abstract class CallableObjectInternal extends ObjectInternal {
 
     /* Callables aren't iterable */
     override ObjectInternal getIterNext() { none() }
-
-    /** Gets a class that this function may return */
-    ClassValue getAnInferredReturnType() {
-        result = TBuiltinClassObject(this.(BuiltinFunctionObjectInternal).getReturnType())
-        or
-        result = TBuiltinClassObject(this.(BuiltinMethodObjectInternal).getReturnType())
-    }
 }
 
 /** Class representing Python functions */
diff --git a/python/ql/src/semmle/python/objects/ObjectAPI.qll b/python/ql/src/semmle/python/objects/ObjectAPI.qll
@@ -581,6 +581,13 @@ abstract class FunctionValue extends CallableValue {
             exists(Expr expr, AstNode origin | expr.pointsTo(this, origin) | not origin instanceof Lambda)
         )
     }
+
+    /** Gets a class that this function may return */
+    ClassValue getAnInferredReturnType() {
+        result = TBuiltinClassObject(this.(BuiltinFunctionObjectInternal).getReturnType())
+        or
+        result = TBuiltinClassObject(this.(BuiltinMethodObjectInternal).getReturnType())
+    }
 }
 
 /** Class representing Python functions */

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ predicate returns_meaningful_value(FunctionValue f) {`
`50`	`50`	`*/`
`51`	`51`
`52`	`52`	`f.isBuiltin() and`
`53`		`- f.(CallableObjectInternal).getAnInferredReturnType() != ClassValue::nonetype() and`
	`53`	`+ f.getAnInferredReturnType() != ClassValue::nonetype() and`
`54`	`54`	`not f.getName() = "__import__"`
`55`	`55`	`)`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,13 @@ abstract class FunctionValue extends CallableValue {`
`581`	`581`	`exists(Expr expr, AstNode origin \| expr.pointsTo(this, origin) \| not origin instanceof Lambda)`
`582`	`582`	`)`
`583`	`583`	`}`
	`584`	`+`
	`585`	`+ /** Gets a class that this function may return */`
	`586`	`+ ClassValue getAnInferredReturnType() {`
	`587`	`+ result = TBuiltinClassObject(this.(BuiltinFunctionObjectInternal).getReturnType())`
	`588`	`+ or`
	`589`	`+ result = TBuiltinClassObject(this.(BuiltinMethodObjectInternal).getReturnType())`
	`590`	`+ }`
`584`	`591`	`}`
`585`	`592`
`586`	`593`	`/** Class representing Python functions */`