C++/C#: More sanity checks for IRType

dave-bartolomeo · dave-bartolomeo · commit 7241c1aae663 · 2019-10-21T14:22:46.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/Type.qll b/cpp/ql/src/semmle/code/cpp/Type.qll
@@ -610,7 +610,9 @@ class FloatingPointType extends ArithmeticType {
       (
         kind >= 24 and kind <= 32
         or
-        kind = 38
+        kind >= 38 and kind <= 42
+        or
+        kind >= 45 and kind <= 50
       )
     )
   }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/IRType.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/IRType.qll
@@ -258,4 +258,6 @@ module IRTypeSanity {
     strictcount(type.getIRType()) > 1 and
     message = "`LanguageType` " + type.getAQlClass() + " has multiple `IRType`s: " + concat(type.getIRType().toString(), ", ")
   }
+
+  import Language::LanguageTypeSanity
 }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/CppType.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/CppType.qll
@@ -532,3 +532,13 @@ string getOpaqueTagIdentityString(Type tag) {
   hasOpaqueType(tag, _) and
   result = getTypeIdentityString(tag)
 }
+
+module LanguageTypeSanity {
+  query predicate missingCppType(Type type, string message) {
+    not exists(getTypeForPRValue(type)) and
+    exists(type.getSize()) and
+    // `ProxyClass`es have a size, but only appear in uninstantiated templates
+    not type instanceof ProxyClass and 
+    message = "Type does not have an associated `CppType`."
+  }
+}
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ssa_sanity.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ssa_sanity.expected
@@ -17,3 +17,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_sanity.expected b/cpp/ql/test/library-tests/ir/ir/raw_sanity.expected
@@ -17,3 +17,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.expected b/cpp/ql/test/library-tests/ir/ir/unaliased_ssa_sanity.expected
@@ -17,3 +17,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_sanity.expected b/cpp/ql/test/library-tests/ir/ssa/aliased_ssa_sanity.expected
@@ -17,3 +17,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_sanity.expected b/cpp/ql/test/library-tests/ir/ssa/unaliased_ssa_sanity.expected
@@ -17,3 +17,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_sanity.expected b/cpp/ql/test/library-tests/syntax-zoo/aliased_ssa_sanity.expected
@@ -548,3 +548,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/cpp/ql/test/library-tests/syntax-zoo/raw_sanity.expected b/cpp/ql/test/library-tests/syntax-zoo/raw_sanity.expected
@@ -696,3 +696,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_sanity.expected b/cpp/ql/test/library-tests/syntax-zoo/unaliased_ssa_sanity.expected
@@ -557,3 +557,4 @@ missingCanonicalLanguageType
 multipleCanonicalLanguageTypes
 missingIRType
 multipleIRTypes
+missingCppType
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/IRType.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/IRType.qll
@@ -256,6 +256,8 @@ module IRTypeSanity {
 
   query predicate multipleIRTypes(Language::LanguageType type, string message) {
     strictcount(type.getIRType()) > 1 and
-    message = "`LanguageType` has multiple `IRType`s: " + concat(type.getIRType().toString(), ", ")
+    message = "`LanguageType` " + type.getAQlClass() + " has multiple `IRType`s: " + concat(type.getIRType().toString(), ", ")
   }
+
+  import Language::LanguageTypeSanity
 }
diff --git a/csharp/ql/src/semmle/code/csharp/ir/internal/CSharpType.qll b/csharp/ql/src/semmle/code/csharp/ir/internal/CSharpType.qll
@@ -420,3 +420,8 @@ CSharpPRValueType getCanonicalOpaqueType(Type tag, int byteSize) {
   result = TPRValueType(tag) and
   getTypeSize(tag) = byteSize
 }
+
+module LanguageTypeSanity {
+  // Nothing interesting here for C# yet, but the module still has to exist because it is imported
+  // by `IRTypeSanity`.
+}

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,9 @@ class FloatingPointType extends ArithmeticType {`
`610`	`610`	`(`
`611`	`611`	`kind >= 24 and kind <= 32`
`612`	`612`	`or`
`613`		`- kind = 38`
	`613`	`+ kind >= 38 and kind <= 42`
	`614`	`+ or`
	`615`	`+ kind >= 45 and kind <= 50`
`614`	`616`	`)`
`615`	`617`	`)`
`616`	`618`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,4 +258,6 @@ module IRTypeSanity {`
`258`	`258`	`strictcount(type.getIRType()) > 1 and`
`259`	`259`	message = "`LanguageType` " + type.getAQlClass() + " has multiple `IRType`s: " + concat(type.getIRType().toString(), ", ")
`260`	`260`	`}`
	`261`	`+`
	`262`	`+ import Language::LanguageTypeSanity`
`261`	`263`	`}`