Python: Adds preliminary modernization

BekaValentine · BekaValentine · commit 7ce905a31082 · 2020-03-09T19:29:47.000-07:00
diff --git a/python/ql/src/Functions/ReturnValueIgnored.ql b/python/ql/src/Functions/ReturnValueIgnored.ql
@@ -21,28 +21,28 @@ predicate meaningful_return_value(Expr val) {
     or
     val instanceof BooleanLiteral
     or
-    exists(FunctionObject callee | val = callee.getACall().getNode() and returns_meaningful_value(callee))
+    exists(FunctionValue callee | val = callee.getACall().getNode() and returns_meaningful_value(callee))
     or
-    not exists(FunctionObject callee | val = callee.getACall().getNode()) and not val instanceof Name
+    not exists(FunctionValue callee | val = callee.getACall().getNode()) and not val instanceof Name
 }
 
 /* Value is used before returning, and thus its value is not lost if ignored */
 predicate used_value(Expr val) {
     exists(LocalVariable var, Expr other | var.getAnAccess() = val and other = var.getAnAccess() and not other = val)
 }
 
-predicate returns_meaningful_value(FunctionObject f) { 
-    not exists(f.getFunction().getFallthroughNode())
+predicate returns_meaningful_value(FunctionValue f) { 
+    not exists(f.getScope().getFallthroughNode())
     and
     (
-      exists(Return ret, Expr val | ret.getScope() = f.getFunction() and val = ret.getValue() |
+      exists(Return ret, Expr val | ret.getScope() = f.getScope() and val = ret.getValue() |
            meaningful_return_value(val) and
            not used_value(val)
       )
       or
       /* Is f a builtin function that returns something other than None?
        * Ignore __import__ as it is often called purely for side effects */
-      f.isC() and f.getAnInferredReturnType() != theNoneType() and not f.getName() = "__import__"
+      f.isBuiltin() and f.getAnInferredReturnType() != theNoneType() and not f.getName() = "__import__"
     )
 }
 
@@ -55,7 +55,7 @@ predicate wrapped_in_try_except(ExprStmt call) {
     )
 }
 
-from ExprStmt call, FunctionObject callee, float percentage_used, int total
+from ExprStmt call, FunctionValue callee, float percentage_used, int total
 where call.getValue() = callee.getACall().getNode() and returns_meaningful_value(callee) and
 not wrapped_in_try_except(call) and
 exists(int unused |

Original file line number	Diff line number	Diff line change
`@@ -21,28 +21,28 @@ predicate meaningful_return_value(Expr val) {`
`21`	`21`	`or`
`22`	`22`	`val instanceof BooleanLiteral`
`23`	`23`	`or`
`24`		`- exists(FunctionObject callee \| val = callee.getACall().getNode() and returns_meaningful_value(callee))`
	`24`	`+ exists(FunctionValue callee \| val = callee.getACall().getNode() and returns_meaningful_value(callee))`
`25`	`25`	`or`
`26`		`- not exists(FunctionObject callee \| val = callee.getACall().getNode()) and not val instanceof Name`
	`26`	`+ not exists(FunctionValue callee \| val = callee.getACall().getNode()) and not val instanceof Name`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/* Value is used before returning, and thus its value is not lost if ignored */`
`30`	`30`	`predicate used_value(Expr val) {`
`31`	`31`	`exists(LocalVariable var, Expr other \| var.getAnAccess() = val and other = var.getAnAccess() and not other = val)`
`32`	`32`	`}`
`33`	`33`
`34`		`-predicate returns_meaningful_value(FunctionObject f) {`
`35`		`- not exists(f.getFunction().getFallthroughNode())`
	`34`	`+predicate returns_meaningful_value(FunctionValue f) {`
	`35`	`+ not exists(f.getScope().getFallthroughNode())`
`36`	`36`	`and`
`37`	`37`	`(`
`38`		`- exists(Return ret, Expr val \| ret.getScope() = f.getFunction() and val = ret.getValue() \|`
	`38`	`+ exists(Return ret, Expr val \| ret.getScope() = f.getScope() and val = ret.getValue() \|`
`39`	`39`	`meaningful_return_value(val) and`
`40`	`40`	`not used_value(val)`
`41`	`41`	`)`
`42`	`42`	`or`
`43`	`43`	`/* Is f a builtin function that returns something other than None?`
`44`	`44`	`* Ignore __import__ as it is often called purely for side effects */`
`45`		`- f.isC() and f.getAnInferredReturnType() != theNoneType() and not f.getName() = "__import__"`
	`45`	`+ f.isBuiltin() and f.getAnInferredReturnType() != theNoneType() and not f.getName() = "__import__"`
`46`	`46`	`)`
`47`	`47`	`}`
`48`	`48`
`@@ -55,7 +55,7 @@ predicate wrapped_in_try_except(ExprStmt call) {`
`55`	`55`	`)`
`56`	`56`	`}`
`57`	`57`
`58`		`-from ExprStmt call, FunctionObject callee, float percentage_used, int total`
	`58`	`+from ExprStmt call, FunctionValue callee, float percentage_used, int total`
`59`	`59`	`where call.getValue() = callee.getACall().getNode() and returns_meaningful_value(callee) and`
`60`	`60`	`not wrapped_in_try_except(call) and`
`61`	`61`	`exists(int unused \|`