Fix hash code definition of PD vars

Author: maximilianruesch

OPAL/br/src/main/scala/org/opalj/br/PDUVar.scala

@@ -34,15 +34,18 @@ abstract class PDUVar[+Value <: ValueInformation] {
 }
 
 class PDVar[+Value <: ValueInformation /*org.opalj.ai.ValuesDomain#DomainValue*/ ] private (
-    val value:  Value,
-    val usePCs: PCs
+    val originPC: Int,
+    val value:    Value,
+    val usePCs:   PCs
 ) extends PDUVar[Value] {
 
     def defPCs: Nothing = throw new UnsupportedOperationException
 
+    override def hashCode(): Int = scala.util.hashing.MurmurHash3.productHash((originPC, usePCs))
+
     override def equals(other: Any): Boolean = {
         other match {
-            case that: PDVar[_] => this.usePCs == that.usePCs
+            case that: PDVar[_] => this.originPC == that.originPC && this.usePCs == that.usePCs
             case _              => false
         }
     }
@@ -54,9 +57,11 @@ class PDVar[+Value <: ValueInformation /*org.opalj.ai.ValuesDomain#DomainValue*/
 
 object PDVar {
 
-    def apply[Value <: ValueInformation](value: Value, useSites: IntTrieSet): PDVar[Value] = new PDVar(value, useSites)
+    def apply[Value <: ValueInformation](originSite: Int, value: Value, useSites: IntTrieSet): PDVar[Value] =
+        new PDVar(originSite, value, useSites)
 
-    def unapply[Value <: ValueInformation](d: PDVar[Value]): Some[(Value, IntTrieSet)] = Some((d.value, d.usePCs))
+    def unapply[Value <: ValueInformation](d: PDVar[Value]): Some[(Int, Value, IntTrieSet)] =
+        Some((d.originPC, d.value, d.usePCs))
 }
 
 class PUVar[+Value <: ValueInformation /*org.opalj.ai.ValuesDomain#DomainValue*/ ] private (
@@ -66,6 +71,8 @@ class PUVar[+Value <: ValueInformation /*org.opalj.ai.ValuesDomain#DomainValue*/
 
     def usePCs: Nothing = throw new UnsupportedOperationException
 
+    override def hashCode(): Int = defPCs.hashCode()
+
     override def equals(other: Any): Boolean = {
         other match {
             case that: PUVar[_] => this.defPCs == that.defPCs

OPAL/tac/src/main/scala/org/opalj/tac/DUVar.scala

@@ -199,7 +199,7 @@ class DVar[+Value <: ValueInformation /*org.opalj.ai.ValuesDomain#DomainValue*/
 
     override def toPersistentForm(
         implicit stmts: Array[Stmt[V]]
-    ): PDVar[Value] = PDVar(value, usedBy.map(pcOfDefSite _))
+    ): PDVar[Value] = PDVar(pcOfDefSite(origin), value, usedBy.map(pcOfDefSite _))
 
 }
 

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

@@ -163,7 +163,7 @@ private[string] class ContextFreeStringAnalysis(override val project: SomeProjec
             case PUVar(_, defPCs) =>
                 defPCs.map(pc => mapDefPCToStringTree(pc))
 
-            case PDVar(_, _) =>
+            case PDVar(_, _, _) =>
                 Set(mapDefPCToStringTree(state.entity.pc))
         }
 

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

@@ -96,7 +96,7 @@ class TrivialStringAnalysis(override val project: SomeProject) extends FPCFAnaly
             case PUVar(_, defPCs) =>
                 StringTreeOr(defPCs.map(pc => mapDefPCToStringTree(pc)))
 
-            case PDVar(_, _) =>
+            case PDVar(_, _, _) =>
                 mapDefPCToStringTree(state.entity.pc)
         }