Hopefully fix breakage in spoon-dataflow

INRIA · Aug 28, 2023 · fa8b316 · fa8b316
1 parent 2710ce5
commit fa8b316
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/spoon-dataflow/src/main/java/fr/inria/spoon/dataflow/utils/CommonUtils.java b/spoon-dataflow/src/main/java/fr/inria/spoon/dataflow/utils/CommonUtils.java
@@ -28,7 +28,9 @@ public static IntExpr getTargetValue(Context context, Map<CtReference, Expr> var
             targets.addFirst(target);
             target = ((CtTargetedExpression) target).getTarget();
         }
-        targets.addFirst(target);
+        if (target != null) {
+            targets.addFirst(target);
+        }
 
         // Traverse all targets left to right
         IntExpr targetValue = null;
@@ -45,6 +47,9 @@ else if (t instanceof CtArrayRead)
                 Expr arrayIndex = (Expr) index.getMetadata("value");
                 targetValue = (IntExpr) memory.readArray((CtArrayTypeReference) arrayRead.getTarget().getType(), targetValue, arrayIndex);
             }
+            else if (t instanceof CtSuperAccess) {
+                targetValue = context.mkInt(Memory.thisPointer());
+            }
             else if (t instanceof CtVariableRead)
             {
                 targetValue = (IntExpr) variablesMap.get(((CtVariableRead) t).getVariable());