Merge branch 'develop' into fix/reflective-field-accesses

Author: maximilianruesch

OPAL/tac/src/it/scala/org/opalj/tac/fpcf/analyses/FPCFAnalysesIntegrationTest.scala

@@ -173,7 +173,7 @@ class FPCFAnalysesIntegrationTest extends AnyFunSpec {
     }
 
     def getProperty(fqn: String): PropertyMetaInformation = {
-        getObjectReflectively[PropertyMetaInformation](fqn, this, "integration test").get
+        getObjectReflectively[PropertyMetaInformation](fqn.trim, this, "integration test").get
     }
 
     def getConfig: Seq[(String, Set[ComputationSpecification[FPCFAnalysis]], Seq[PropertyMetaInformation])] = {

OPAL/tac/src/main/resources/reference.conf

@@ -118,7 +118,7 @@ org.opalj {
         },
         "MethodStringFlowAnalysis" {
           description = "Computes results of data flow analysis for string variables in the context of a method.",
-          lazyFactory = "org.opalj.tac.fpcf.analyses.string.flowanalysis.MethodStringFlowAnalysis"
+          lazyFactory = "org.opalj.tac.fpcf.analyses.string.flowanalysis.LazyMethodStringFlowAnalysis"
         },
         "L0StringFlowAnalysis" {
           description = "Computes string flow functions on level L0 for individual statements in the context of a method to be used in data flow analysis.",

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/StringAnalysisScheduler.scala

@@ -11,10 +11,12 @@ import org.opalj.br.fpcf.ContextProviderKey
 import org.opalj.br.fpcf.FPCFAnalysis
 import org.opalj.br.fpcf.FPCFAnalysisScheduler
 import org.opalj.br.fpcf.FPCFLazyAnalysisScheduler
+import org.opalj.br.fpcf.properties.cg.Callers
 import org.opalj.br.fpcf.properties.string.StringConstancyProperty
 import org.opalj.fpcf.Entity
 import org.opalj.fpcf.PropertyBounds
 import org.opalj.fpcf.PropertyStore
+import org.opalj.tac.fpcf.properties.TACAI
 import org.opalj.tac.fpcf.properties.string.MethodStringFlow
 
 /**
@@ -27,7 +29,8 @@ sealed trait StringAnalysisScheduler extends FPCFAnalysisScheduler {
 
     final def derivedProperty: PropertyBounds = PropertyBounds.lub(StringConstancyProperty)
 
-    override def uses: Set[PropertyBounds] = Set(PropertyBounds.ub(MethodStringFlow))
+    override def uses: Set[PropertyBounds] =
+        PropertyBounds.ubs(MethodStringFlow, Callers, TACAI, StringConstancyProperty)
 
     override final type InitializationData =
         (ContextFreeStringAnalysis, ContextStringAnalysis, MethodParameterContextStringAnalysis)

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/interpretation/InterpretationHandler.scala

@@ -11,6 +11,7 @@ import org.opalj.br.fpcf.FPCFAnalysis
 import org.opalj.fpcf.FinalEP
 import org.opalj.fpcf.InterimResult
 import org.opalj.fpcf.ProperPropertyComputationResult
+import org.opalj.fpcf.PropertyBounds
 import org.opalj.fpcf.SomeEPS
 import org.opalj.tac.fpcf.properties.TACAI
 import org.opalj.tac.fpcf.properties.string.StringFlowFunctionProperty
@@ -76,5 +77,7 @@ abstract class InterpretationHandler extends FPCFAnalysis with StringAnalysisCon
 
 object InterpretationHandler {
 
+    def uses: Set[PropertyBounds] = PropertyBounds.ubs(TACAI)
+
     def getEntity(implicit state: InterpretationState): MethodPC = MethodPC(state.pc, state.dm)
 }

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/l0/L0StringAnalysis.scala

@@ -8,6 +8,7 @@ package l0
 
 import org.opalj.br.analyses.SomeProject
 import org.opalj.br.fpcf.FPCFLazyAnalysisScheduler
+import org.opalj.fpcf.PropertyBounds
 import org.opalj.fpcf.PropertyStore
 import org.opalj.tac.fpcf.analyses.string.flowanalysis.LazyMethodStringFlowAnalysis
 import org.opalj.tac.fpcf.analyses.string.interpretation.LazyStringFlowAnalysis
@@ -27,5 +28,7 @@ object LazyL0StringFlowAnalysis extends LazyStringFlowAnalysis {
         LazyL0StringFlowAnalysis
     )
 
+    override final def uses: Set[PropertyBounds] = super.uses ++ L0InterpretationHandler.uses
+
     override def init(p: SomeProject, ps: PropertyStore): InitializationData = L0InterpretationHandler(p)
 }

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/l0/interpretation/L0InterpretationHandler.scala

@@ -9,6 +9,7 @@ package interpretation
 
 import org.opalj.br.analyses.SomeProject
 import org.opalj.fpcf.ProperPropertyComputationResult
+import org.opalj.fpcf.PropertyBounds
 import org.opalj.tac.fpcf.analyses.string.interpretation.InterpretationHandler
 import org.opalj.tac.fpcf.analyses.string.interpretation.InterpretationState
 import org.opalj.tac.fpcf.properties.string.StringFlowFunctionProperty
@@ -50,5 +51,7 @@ class L0InterpretationHandler(implicit override val project: SomeProject) extend
 
 object L0InterpretationHandler {
 
+    def uses: Set[PropertyBounds] = InterpretationHandler.uses
+
     def apply(project: SomeProject): L0InterpretationHandler = new L0InterpretationHandler()(project)
 }

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/l1/L1StringAnalysis.scala

@@ -8,6 +8,7 @@ package l1
 
 import org.opalj.br.analyses.SomeProject
 import org.opalj.br.fpcf.FPCFLazyAnalysisScheduler
+import org.opalj.fpcf.PropertyBounds
 import org.opalj.fpcf.PropertyStore
 import org.opalj.tac.fpcf.analyses.string.flowanalysis.LazyMethodStringFlowAnalysis
 import org.opalj.tac.fpcf.analyses.string.interpretation.LazyStringFlowAnalysis
@@ -26,5 +27,7 @@ object LazyL1StringFlowAnalysis extends LazyStringFlowAnalysis {
         LazyL1StringFlowAnalysis
     )
 
+    override final def uses: Set[PropertyBounds] = super.uses ++ L1InterpretationHandler.uses
+
     override def init(p: SomeProject, ps: PropertyStore): InitializationData = L1InterpretationHandler(p)
 }

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/l1/interpretation/L1InterpretationHandler.scala

@@ -8,7 +8,10 @@ package l1
 package interpretation
 
 import org.opalj.br.analyses.SomeProject
+import org.opalj.br.fpcf.properties.SystemProperties
+import org.opalj.br.fpcf.properties.string.StringConstancyProperty
 import org.opalj.fpcf.ProperPropertyComputationResult
+import org.opalj.fpcf.PropertyBounds
 import org.opalj.tac.fpcf.analyses.string.interpretation.InterpretationState
 import org.opalj.tac.fpcf.analyses.string.l0.interpretation.L0InterpretationHandler
 import org.opalj.tac.fpcf.properties.string.StringFlowFunctionProperty
@@ -53,5 +56,8 @@ class L1InterpretationHandler(implicit override val project: SomeProject) extend
 
 object L1InterpretationHandler {
 
+    def uses: Set[PropertyBounds] = L0InterpretationHandler.uses ++
+        PropertyBounds.ubs(StringConstancyProperty, SystemProperties)
+
     def apply(project: SomeProject): L1InterpretationHandler = new L1InterpretationHandler()(project)
 }

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/l2/L2StringAnalysis.scala

@@ -9,9 +9,6 @@ package l2
 import org.opalj.br.analyses.ProjectInformationKeys
 import org.opalj.br.analyses.SomeProject
 import org.opalj.br.fpcf.FPCFLazyAnalysisScheduler
-import org.opalj.br.fpcf.properties.SystemProperties
-import org.opalj.br.fpcf.properties.cg.Callees
-import org.opalj.br.fpcf.properties.fieldaccess.FieldWriteAccessInformation
 import org.opalj.fpcf.PropertyBounds
 import org.opalj.fpcf.PropertyStore
 import org.opalj.tac.fpcf.analyses.string.flowanalysis.LazyMethodStringFlowAnalysis
@@ -31,11 +28,7 @@ object LazyL2StringFlowAnalysis extends LazyStringFlowAnalysis {
         LazyL2StringFlowAnalysis
     )
 
-    override final def uses: Set[PropertyBounds] = super.uses ++ PropertyBounds.ubs(
-        Callees,
-        FieldWriteAccessInformation,
-        SystemProperties
-    )
+    override final def uses: Set[PropertyBounds] = super.uses ++ L2InterpretationHandler.uses
 
     override final def init(p: SomeProject, ps: PropertyStore): InitializationData = L2InterpretationHandler(p)
 

OPAL/tac/src/main/scala/org/opalj/tac/fpcf/analyses/string/l2/interpretation/L2InterpretationHandler.scala

@@ -11,7 +11,9 @@ import org.opalj.br.analyses.ProjectInformationKeys
 import org.opalj.br.analyses.SomeProject
 import org.opalj.br.fpcf.ContextProviderKey
 import org.opalj.br.fpcf.analyses.ContextProvider
+import org.opalj.br.fpcf.properties.cg.Callees
 import org.opalj.fpcf.ProperPropertyComputationResult
+import org.opalj.fpcf.PropertyBounds
 import org.opalj.tac.fpcf.analyses.string.interpretation.InterpretationState
 import org.opalj.tac.fpcf.analyses.string.l1.interpretation.L1InterpretationHandler
 import org.opalj.tac.fpcf.properties.string.StringFlowFunctionProperty
@@ -53,5 +55,7 @@ object L2InterpretationHandler {
 
     def requiredProjectInformation: ProjectInformationKeys = Seq(ContextProviderKey)
 
+    def uses: Set[PropertyBounds] = L1InterpretationHandler.uses ++ PropertyBounds.ubs(Callees)
+
     def apply(project: SomeProject): L2InterpretationHandler = new L2InterpretationHandler()(project)
 }