Fix test-generation when a type variable's bound is itself a type variable

smowton · smowton · commit 5f1a491516d8 · 2021-06-29T15:59:14.000+01:00
For example, class G&lt;A, B extends A&gt;
diff --git a/java/ql/src/utils/GenerateFlowTestCase.qll b/java/ql/src/utils/GenerateFlowTestCase.qll
@@ -93,7 +93,7 @@ RefType getRootType(RefType t) {
  */
 RefType replaceTypeVariable(RefType t) {
   if t instanceof TypeVariable
-  then result = t.(TypeVariable).getFirstUpperBoundType()
+  then result = replaceTypeVariable(t.(TypeVariable).getFirstUpperBoundType())
   else result = t
 }
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ RefType getRootType(RefType t) {`
`93`	`93`	`*/`
`94`	`94`	`RefType replaceTypeVariable(RefType t) {`
`95`	`95`	`if t instanceof TypeVariable`
`96`		`- then result = t.(TypeVariable).getFirstUpperBoundType()`
	`96`	`+ then result = replaceTypeVariable(t.(TypeVariable).getFirstUpperBoundType())`
`97`	`97`	`else result = t`
`98`	`98`	`}`
`99`	`99`