Python points-to: Add float objects for better backwards compatibility.

markshannon · markshannon · commit 931100c77214 · 2019-04-26T16:21:45.000+01:00
diff --git a/python/ql/src/semmle/python/objects/Constants.qll b/python/ql/src/semmle/python/objects/Constants.qll
@@ -169,7 +169,7 @@ class IntObjectInternal extends ConstantObjectInternal, TInt {
     }
 
     override Builtin getBuiltin() {
-        result.(Builtin).intValue() = this.intValue()
+        result.intValue() = this.intValue()
     }
 
     override int intValue() {
@@ -188,6 +188,45 @@ class IntObjectInternal extends ConstantObjectInternal, TInt {
 
 }
 
+class FloatObjectInternal extends ConstantObjectInternal, TFloat {
+
+    override string toString() {
+        result = "float " + this.floatValue().toString()
+    }
+
+    override predicate introduced(ControlFlowNode node, PointsToContext context) {
+        context.appliesTo(node) and
+        node.getNode().(FloatLiteral).getValue() = this.floatValue()
+    }
+
+    override ObjectInternal getClass() {
+        result = TBuiltinClassObject(Builtin::special("float"))
+    }
+
+    override Builtin getBuiltin() {
+        result.getName().toFloat() = this.floatValue()
+    }
+
+    private float floatValue() {
+        this = TFloat(result)
+    }
+
+    override int intValue() {
+        this = TFloat(result)
+    }
+
+    override string strValue() {
+        none()
+    }
+
+    override boolean booleanValue() {
+        this.floatValue() = 0.0 and result = false
+        or
+        this.floatValue() != 0.0 and result = true
+    }
+
+}
+
 
 class StringObjectInternal extends ConstantObjectInternal, TString {
 
diff --git a/python/ql/src/semmle/python/objects/Instances.qll b/python/ql/src/semmle/python/objects/Instances.qll
@@ -221,9 +221,7 @@ class UnknownInstanceInternal extends TUnknownInstance, ObjectInternal {
     }
 
     override predicate introduced(ControlFlowNode node, PointsToContext context) {
-        context.appliesTo(node) and
-        this.getClass() = ObjectInternal::builtin("float") and 
-        node.getNode() instanceof FloatLiteral
+        none()
     }
 
     /** Gets the class declaration for this object, if it is a declared class. */
diff --git a/python/ql/src/semmle/python/objects/TObject.qll b/python/ql/src/semmle/python/objects/TObject.qll
@@ -22,6 +22,7 @@ newtype TObject =
         not bltn.isMethod() and not bltn.isModule() and
         not bltn.getClass() = Builtin::special("tuple") and
         not exists(bltn.intValue()) and
+        not exists(bltn.floatValue()) and
         not exists(bltn.strValue()) and
         not py_special_objects(bltn, _)
     }
@@ -58,15 +59,19 @@ newtype TObject =
         // And all combinations of flags up to 2^8
         n in [0..511] or
         // Any number explicitly mentioned in the source code.
-        exists(Num num |
-            n = num.getN().toInt() or
+        exists(IntegerLiteral num |
+            n = num.getValue() or
             exists(UnaryExpr neg | neg.getOp() instanceof USub and neg.getOperand() = num)
             and n = -num.getN().toInt()
         )
         or
         n = any(Builtin b).intValue()
     }
     or
+    TFloat(float f) {
+        f = any(FloatLiteral num).getValue()
+    }
+    or
     TString(string s) {
         // Any string explicitly mentioned in the source code.
         s = any(StrConst str).getText()
@@ -139,8 +144,6 @@ predicate literal_instantiation(ControlFlowNode n, ClassObjectInternal cls, Poin
         or
         n instanceof DictNode and cls = ObjectInternal::builtin("dict")
         or
-        n.getNode() instanceof FloatLiteral and cls = ObjectInternal::builtin("float")
-        or
         n.getNode() instanceof ImaginaryLiteral and cls = ObjectInternal::builtin("complex")
     )
 }
@@ -303,6 +306,8 @@ library class ClassDecl extends @py_object {
             name = "MethodType" or
             name = "ModuleType"
         )
+        or
+        this = Builtin::builtin("float")
     }
 
 }
diff --git a/python/ql/src/semmle/python/types/Builtins.qll b/python/ql/src/semmle/python/types/Builtins.qll
@@ -87,6 +87,11 @@ class Builtin extends @py_cobject {
         result = this.getName().toInt()
     }
 
+    float floatValue() {
+        (this.getClass() = Builtin::special("float")) and
+        result = this.getName().toFloat()
+    }
+
     string strValue() {
         (this.getClass() = Builtin::special("unicode") or
         this.getClass() = Builtin::special("bytes")) and

Original file line number	Diff line number	Diff line change
`@@ -221,9 +221,7 @@ class UnknownInstanceInternal extends TUnknownInstance, ObjectInternal {`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`override predicate introduced(ControlFlowNode node, PointsToContext context) {`
`224`		`- context.appliesTo(node) and`
`225`		`- this.getClass() = ObjectInternal::builtin("float") and`
`226`		`- node.getNode() instanceof FloatLiteral`
	`224`	`+ none()`
`227`	`225`	`}`
`228`	`226`
`229`	`227`	`/** Gets the class declaration for this object, if it is a declared class. */`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ newtype TObject =`
`22`	`22`	`not bltn.isMethod() and not bltn.isModule() and`
`23`	`23`	`not bltn.getClass() = Builtin::special("tuple") and`
`24`	`24`	`not exists(bltn.intValue()) and`
	`25`	`+ not exists(bltn.floatValue()) and`
`25`	`26`	`not exists(bltn.strValue()) and`
`26`	`27`	`not py_special_objects(bltn, _)`
`27`	`28`	`}`
`@@ -58,15 +59,19 @@ newtype TObject =`
`58`	`59`	`// And all combinations of flags up to 2^8`
`59`	`60`	`n in [0..511] or`
`60`	`61`	`// Any number explicitly mentioned in the source code.`
`61`		`- exists(Num num \|`
`62`		`- n = num.getN().toInt() or`
	`62`	`+ exists(IntegerLiteral num \|`
	`63`	`+ n = num.getValue() or`
`63`	`64`	`exists(UnaryExpr neg \| neg.getOp() instanceof USub and neg.getOperand() = num)`
`64`	`65`	`and n = -num.getN().toInt()`
`65`	`66`	`)`
`66`	`67`	`or`
`67`	`68`	`n = any(Builtin b).intValue()`
`68`	`69`	`}`
`69`	`70`	`or`
	`71`	`+ TFloat(float f) {`
	`72`	`+ f = any(FloatLiteral num).getValue()`
	`73`	`+ }`
	`74`	`+ or`
`70`	`75`	`TString(string s) {`
`71`	`76`	`// Any string explicitly mentioned in the source code.`
`72`	`77`	`s = any(StrConst str).getText()`
`@@ -139,8 +144,6 @@ predicate literal_instantiation(ControlFlowNode n, ClassObjectInternal cls, Poin`
`139`	`144`	`or`
`140`	`145`	`n instanceof DictNode and cls = ObjectInternal::builtin("dict")`
`141`	`146`	`or`
`142`		`- n.getNode() instanceof FloatLiteral and cls = ObjectInternal::builtin("float")`
`143`		`- or`
`144`	`147`	`n.getNode() instanceof ImaginaryLiteral and cls = ObjectInternal::builtin("complex")`
`145`	`148`	`)`
`146`	`149`	`}`
`@@ -303,6 +306,8 @@ library class ClassDecl extends @py_object {`
`303`	`306`	`name = "MethodType" or`
`304`	`307`	`name = "ModuleType"`
`305`	`308`	`)`
	`309`	`+ or`
	`310`	`+ this = Builtin::builtin("float")`
`306`	`311`	`}`
`307`	`312`
`308`	`313`	`}`