Merge pull request #86 from stg-tud/fix/merge-indirect-callees

Allow merging of indirect callee parameters if they are equal
stg-tud · Apr 1, 2021 · 93e0485 · 93e0485
2 parents dda4a09 + 84d8341
commit 93e0485
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callees.scala b/OPAL/br/src/main/scala/org/opalj/br/fpcf/properties/cg/Callees.scala
@@ -299,10 +299,12 @@ sealed class ConcreteCallees(
             _incompleteCallSites ++ incompleteCallSites,
             _indirectCallReceivers.unionWith(
                 indirectCallReceivers,
-                (_, r, l) ⇒ {
+                (_, l, r) ⇒ {
                     r.unionWith(
                         l,
-                        (_, _, _) ⇒ throw new UnknownError("Indirect callee derived by two analyses")
+                        (_, vl, vr) ⇒
+                            if (vl == vr) vl
+                            else throw new UnknownError("Incompatible receivers for indirect call")
                     )
                 }
             ),
@@ -311,7 +313,9 @@ sealed class ConcreteCallees(
                 (_, r, l) ⇒ {
                     r.unionWith(
                         l,
-                        (_, _, _) ⇒ throw new UnknownError("Indirect callee derived by two analyses")
+                        (_, vl, vr) ⇒
+                            if (vl == vr) vl
+                            else throw new UnknownError("Incompatible parameters for indirect call")
                     )
                 }
             )