Fix killPointedAt() in SsaOptimizer (again) (#305)

titzer · Nov 24, 2024 · 37ee6ff · 37ee6ff
1 parent d076309
commit 37ee6ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/aeneas/src/main/Version.v3 b/aeneas/src/main/Version.v3
@@ -3,6 +3,6 @@
 
 // Updated by VCS scripts. DO NOT EDIT.
 component Version {
-	def version: string = "III-7.1772";
+	def version: string = "III-7.1773";
 	var buildData: string;
 }
diff --git a/aeneas/src/ssa/SsaOptimizer.v3 b/aeneas/src/ssa/SsaOptimizer.v3
@@ -328,7 +328,7 @@ class SsaBlockState {
 		var v = impure_loads, i = 0;
 		for (j < v.length) {
 			var t = v[i];
-			if (t.1.facts.F_POINTED_AT) {
+			if (!t.1.facts.F_POINTED_AT) {
 				if (i != j) v[i] = t;
 				i++;
 			}
@@ -1025,6 +1025,9 @@ class SsaInstrReducer(context: SsaContext) extends SsaInstrMatcher {
 				if (Bool.unbox(xval)) return addThrow(i.source, exception);
 				else return killInstr(i);
 			}
+			PtrStore, PtrCmpSwp => {
+				if (optimize_loads) state.killPointedAt();
+			}
 			_ => ;
 		}
 		return i;

diff --git a/test/common.bash b/test/common.bash
@@ -340,6 +340,7 @@ function check_cached_target_tests() {
 function execute_target_tests() {
     target=$1
     R=$OUT/$target/run.out
+    FAIL=0
     if [ -d "$TEST_CACHE/$SUITE/$target" ]; then
 	print_status "   cached" ""
 	ext=""
@@ -362,6 +363,7 @@ function execute_target_tests() {
 	    if [ -x $runner ]; then
 		print_status "  running" "${r/test-$target/}"
 		$runner $OUT/$target $TORUN | tee $OUT/$target/run.out | $PROGRESS
+                FAIL=$(($FAIL | $?))
 		RAN=1
 	    fi
 	done
@@ -372,6 +374,7 @@ function execute_target_tests() {
 	    printf "$count ${YELLOW}no runners found${NORM}\n"
 	fi
     fi
+    return $FAIL
 }
 
 function execute_tests() {