Value-set: compare against real type, not followed type

Author: smowton

src/pointer-analysis/value_set.cpp

@@ -1154,10 +1154,10 @@ void value_sett::assign(
       }
       else
       {
-        if(rhs.type() != type)
+        if(rhs.type() != lhs.type())
           throw "value_sett::assign type mismatch: "
                 "rhs.type():\n"+rhs.type().pretty()+"\n"+
-                "type:\n"+type.pretty();
+                "lhs.type():\n"+lhs.type().pretty();
 
         rhs_member=make_member(rhs, name, ns);
 

src/pointer-analysis/value_set_fi.cpp

@@ -989,10 +989,10 @@ void value_set_fit::assign(
       }
       else
       {
-        if(rhs.type() != type)
+        if(rhs.type() != lhs.type())
           throw "value_set_fit::assign type mismatch: "
                 "rhs.type():\n"+rhs.type().pretty()+"\n"+
-                "type:\n"+type.pretty();
+                "type:\n"+lhs.type().pretty();
 
         if(rhs.id()==ID_struct ||
            rhs.id()==ID_constant)

src/pointer-analysis/value_set_fivr.cpp

@@ -1104,10 +1104,9 @@ void value_set_fivrt::assign(
       }
       else
       {
-        if(rhs.type() != type)
-          throw
-            "type mismatch:\nRHS: "+rhs.type().pretty()+"\n"+
-            "LHS: "+type.pretty();
+        if(rhs.type() != lhs.type())
+          throw "type mismatch:\nRHS: " + rhs.type().pretty() + "\n" +
+            "LHS: " + lhs.type().pretty();
 
         if(rhs.id()==ID_struct ||
            rhs.id()==ID_constant)

src/pointer-analysis/value_set_fivrns.cpp

@@ -797,10 +797,9 @@ void value_set_fivrnst::assign(
       }
       else
       {
-        if(rhs.type() != type)
-          throw
-            "type mismatch:\nRHS: "+rhs.type().pretty()+"\n"+
-            "LHS: "+type.pretty();
+        if(rhs.type() != lhs.type())
+          throw "type mismatch:\nRHS: " + rhs.type().pretty() + "\n" +
+            "LHS: " + lhs.type().pretty();
 
         if(rhs.id()==ID_struct ||
            rhs.id()==ID_constant)