#140 #157 fixing bugs introduced with new code

lisa-analyzer · Jan 12, 2022 · b0dc3f1 · b0dc3f1
1 parent b7ced68
commit b0dc3f1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/lisa/lisa-imp/src/main/java/it/unive/lisa/imp/expressions/IMPNewObj.java b/lisa/lisa-imp/src/main/java/it/unive/lisa/imp/expressions/IMPNewObj.java
@@ -59,8 +59,7 @@ V extends ValueDomain<V>> AnalysisState<A, H, V> expressionSemantics(
 		HeapAllocation created = new HeapAllocation(getRuntimeTypes(), getLocation());
 
 		// we need to add the receiver to the parameters
-		VariableRef paramThis = new VariableRef(getCFG(), getLocation(), "this",
-				getStaticType());
+		VariableRef paramThis = new VariableRef(getCFG(), getLocation(), "this", getStaticType());
 		Expression[] fullExpressions = ArrayUtils.insert(0, getSubExpressions(), paramThis);
 		ExpressionSet<SymbolicExpression>[] fullParams = ArrayUtils.insert(0, params, new ExpressionSet<>(created));
 

diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryExpression.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryExpression.java
@@ -90,7 +90,7 @@ protected NaryExpression(CFG cfg, CodeLocation location, String constructName, E
 	 */
 	protected NaryExpression(CFG cfg, CodeLocation location, String constructName, Type staticType,
 			Expression... subExpressions) {
-		this(cfg, location, constructName, LeftToRightEvaluation.INSTANCE, Untyped.INSTANCE, subExpressions);
+		this(cfg, location, constructName, LeftToRightEvaluation.INSTANCE, staticType, subExpressions);
 	}
 
 	/**

diff --git a/...k/src/main/java/it/unive/lisa/program/cfg/statement/evaluation/LeftToRightEvaluation.java b/...k/src/main/java/it/unive/lisa/program/cfg/statement/evaluation/LeftToRightEvaluation.java
@@ -37,15 +37,16 @@ V extends ValueDomain<V>> AnalysisState<A, H, V> evaluate(
 					StatementStore<A, H, V> expressions,
 					ExpressionSet<SymbolicExpression>[] computed)
 					throws SemanticException {
-		@SuppressWarnings("unchecked")
-		AnalysisState<A, H, V>[] subStates = new AnalysisState[subExpressions.length];
+		if (subExpressions.length == 0)
+			return entryState;
+
 		AnalysisState<A, H, V> preState = entryState;
 		for (int i = 0; i < computed.length; i++) {
-			preState = subStates[i] = subExpressions[i].semantics(preState, interprocedural, expressions);
-			expressions.put(subExpressions[i], subStates[i]);
-			computed[i] = subStates[i].getComputedExpressions();
+			preState = subExpressions[i].semantics(preState, interprocedural, expressions);
+			expressions.put(subExpressions[i], preState);
+			computed[i] = preState.getComputedExpressions();
 		}
 
-		return subStates[subStates.length - 1];
+		return preState;
 	}
 }
diff --git a/...k/src/main/java/it/unive/lisa/program/cfg/statement/evaluation/RightToLeftEvaluation.java b/...k/src/main/java/it/unive/lisa/program/cfg/statement/evaluation/RightToLeftEvaluation.java
@@ -37,15 +37,16 @@ V extends ValueDomain<V>> AnalysisState<A, H, V> evaluate(
 					StatementStore<A, H, V> expressions,
 					ExpressionSet<SymbolicExpression>[] computed)
 					throws SemanticException {
-		@SuppressWarnings("unchecked")
-		AnalysisState<A, H, V>[] subStates = new AnalysisState[subExpressions.length];
+		if (subExpressions.length == 0)
+			return entryState;
+
 		AnalysisState<A, H, V> preState = entryState;
 		for (int i = computed.length - 1; i >= 0; i--) {
-			preState = subStates[i] = subExpressions[i].semantics(preState, interprocedural, expressions);
-			expressions.put(subExpressions[i], subStates[i]);
-			computed[i] = subStates[i].getComputedExpressions();
+			preState = subExpressions[i].semantics(preState, interprocedural, expressions);
+			expressions.put(subExpressions[i], preState);
+			computed[i] = preState.getComputedExpressions();
 		}
 
-		return subStates[0];
+		return preState;
 	}
 }