Merge pull request #2244 from jbj/IRType-cached

Dave Bartolomeo · web-flow · commit df1d64fbebec · 2019-11-07T12:44:16.000-07:00
C++: Minimal caching of the IR type system
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/IRType.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/IRType.qll
@@ -4,6 +4,7 @@
 
 private import internal.IRTypeInternal
 
+cached
 private newtype TIRType =
   TIRVoidType() or
   TIRUnknownType() or
diff --git a/cpp/ql/src/semmle/code/cpp/ir/internal/CppType.qll b/cpp/ql/src/semmle/code/cpp/ir/internal/CppType.qll
@@ -175,6 +175,7 @@ private IRType getIRTypeForPRValue(Type type) {
   )
 }
 
+cached
 private newtype TCppType =
   TPRValueType(Type type) { exists(getIRTypeForPRValue(type)) } or
   TFunctionGLValueType() or
@@ -203,6 +204,7 @@ class CppType extends TCppType {
    * Gets the `IRType` that represents this `CppType`. Many different `CppType`s can map to a single
    * `IRType`.
    */
+  cached
   IRType getIRType() { none() }
 
   /**
diff --git a/csharp/ql/src/semmle/code/csharp/ir/implementation/IRType.qll b/csharp/ql/src/semmle/code/csharp/ir/implementation/IRType.qll
@@ -4,6 +4,7 @@
 
 private import internal.IRTypeInternal
 
+cached
 private newtype TIRType =
   TIRVoidType() or
   TIRUnknownType() or
diff --git a/csharp/ql/src/semmle/code/csharp/ir/internal/CSharpType.qll b/csharp/ql/src/semmle/code/csharp/ir/internal/CSharpType.qll
@@ -144,6 +144,7 @@ private IRType getIRTypeForPRValue(Type type) {
 
 string getOpaqueTagIdentityString(Type tag) { result = tag.getQualifiedName() }
 
+cached
 private newtype TCSharpType =
   TPRValueType(Type type) { exists(getIRTypeForPRValue(type)) } or
   TGLValueAddressType(Type type) { any() } or
@@ -163,6 +164,7 @@ class CSharpType extends TCSharpType {
    * Gets the `IRType` that represents this `CSharpType`. Many different `CSharpType`s can map to a
    * single `IRType`.
    */
+  cached
   abstract IRType getIRType();
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ private IRType getIRTypeForPRValue(Type type) {`
`175`	`175`	`)`
`176`	`176`	`}`
`177`	`177`
	`178`	`+cached`
`178`	`179`	`private newtype TCppType =`
`179`	`180`	`TPRValueType(Type type) { exists(getIRTypeForPRValue(type)) } or`
`180`	`181`	`TFunctionGLValueType() or`
`@@ -203,6 +204,7 @@ class CppType extends TCppType {`
`203`	`204`	* Gets the `IRType` that represents this `CppType`. Many different `CppType`s can map to a single
`204`	`205`	* `IRType`.
`205`	`206`	`*/`
	`207`	`+ cached`
`206`	`208`	`IRType getIRType() { none() }`
`207`	`209`
`208`	`210`	`/**`