Merge pull request github#12864 from egregius313/egregius313/java/mad/update-typeAsModel

egregius313 · web-flow · commit 733a00039efd · 2023-05-02T15:28:51.000-04:00
Java: Erase generics in `typeAsModel` predicate used in model generator
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll
@@ -73,7 +73,9 @@ private string isExtensible(J::RefType ref) {
 }
 
 private string typeAsModel(J::RefType type) {
-  result = type.getCompilationUnit().getPackage().getName() + ";" + type.nestedName()
+  result =
+    type.getCompilationUnit().getPackage().getName() + ";" +
+      type.getErasure().(J::RefType).nestedName()
 }
 
 private J::RefType bestTypeForModel(TargetApiSpecific api) {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,9 @@ private string isExtensible(J::RefType ref) {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`private string typeAsModel(J::RefType type) {`
`76`		`- result = type.getCompilationUnit().getPackage().getName() + ";" + type.nestedName()`
	`76`	`+ result =`
	`77`	`+ type.getCompilationUnit().getPackage().getName() + ";" +`
	`78`	`+ type.getErasure().(J::RefType).nestedName()`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`private J::RefType bestTypeForModel(TargetApiSpecific api) {`