When checking whether an endpoint has already been modelled, make sure to take the extensibleType into account.

Max Schaefer · Max Schaefer · commit 3befce98b3eb · 2024-01-15T12:09:39.000Z
diff --git a/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll b/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
@@ -377,9 +377,9 @@ class ApplicationModeMetadataExtractor extends string {
       extensibleType = e.getExtensibleType()
     ) and
     (
-      not CharacteristicsImpl::isModeled(e, _, _, _) and alreadyAiModeled = ""
+      not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""
       or
-      CharacteristicsImpl::isModeled(e, _, _, alreadyAiModeled)
+      CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)
     )
   }
 }
diff --git a/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll b/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
@@ -322,9 +322,9 @@ class FrameworkModeMetadataExtractor extends string {
       e.getExtensibleType() = extensibleType
     ) and
     (
-      not CharacteristicsImpl::isModeled(e, _, _, _) and alreadyAiModeled = ""
+      not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""
       or
-      CharacteristicsImpl::isModeled(e, _, _, alreadyAiModeled)
+      CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -377,9 +377,9 @@ class ApplicationModeMetadataExtractor extends string {`
`377`	`377`	`extensibleType = e.getExtensibleType()`
`378`	`378`	`) and`
`379`	`379`	`(`
`380`		`- not CharacteristicsImpl::isModeled(e, _, _, _) and alreadyAiModeled = ""`
	`380`	`+ not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""`
`381`	`381`	`or`
`382`		`- CharacteristicsImpl::isModeled(e, _, _, alreadyAiModeled)`
	`382`	`+ CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)`
`383`	`383`	`)`
`384`	`384`	`}`
`385`	`385`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,9 +322,9 @@ class FrameworkModeMetadataExtractor extends string {`
`322`	`322`	`e.getExtensibleType() = extensibleType`
`323`	`323`	`) and`
`324`	`324`	`(`
`325`		`- not CharacteristicsImpl::isModeled(e, _, _, _) and alreadyAiModeled = ""`
	`325`	`+ not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""`
`326`	`326`	`or`
`327`		`- CharacteristicsImpl::isModeled(e, _, _, alreadyAiModeled)`
	`327`	`+ CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)`
`328`	`328`	`)`
`329`	`329`	`}`
`330`	`330`	`}`