Fix bug with unboxed refs

titzer · May 4, 2024 · af34d4e · af34d4e
1 parent d91bf69
commit af34d4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/aeneas/src/ir/VariantSolver.v3 b/aeneas/src/ir/VariantSolver.v3
@@ -17,7 +17,10 @@ def getScalarFromSet(s: Scalar.set) -> Scalar {
 	return Scalar.B32; // should be unreachable
 }
 def getTypeFromScalarSet(s: Scalar.set, usePacking: bool) -> Type {
-	for (i in s) return if(usePacking, IntRep.getType(i), i.ty);
+	for (i in s) match (i) {
+		R32, R64, Ref => return AnyRef.TYPE;
+		_ => return if(usePacking, IntRep.getType(i), i.ty);
+	}
 	return null;
 }
 

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.1717";
+	def version: string = "III-7.1718";
 	var buildData: string;
 }