[unboxing] Use List<IrField> in Pointer.atUnboxedField instead of IrSpec (#365)

Author: titzer

aeneas/src/core/Opcode.v3

@@ -161,8 +161,8 @@ type Opcode {
 	case PtrAtComponentField(field: IrField);
 	case PtrAtObjectField(field: IrField);
 	case PtrAtRefLayoutField(offset: int);
-	case PtrAtUnboxedObjectField(fields: List<IrSpec>);
-	case PtrAtUnboxedComponentField(fields: List<IrSpec>);
+	case PtrAtUnboxedObjectField(fields: List<IrField>);
+	case PtrAtUnboxedComponentField(fields: List<IrField>);
 	case PtrCmpSwp;
 	case PtrLoad;
 	case PtrStore;

aeneas/src/core/Operator.v3

@@ -479,11 +479,11 @@ component V3Op {
 	}
 	def newPtrAtUnboxedObjectField(specs: List<IrSpec>, ptrType: Type) -> Operator {
 		var ta = [specs.head.receiver];
-		return newOp0(Opcode.PtrAtUnboxedObjectField(specs), ta, ta, ptrType);
+		return newOp0(Opcode.PtrAtUnboxedObjectField(Lists.map(specs, IrSpec.asField)), ta, ta, ptrType);
 	}
 	def newPtrAtUnboxedComponentField(specs: List<IrSpec>, ptrType: Type) -> Operator {
 		var ta = [specs.head.receiver];
-		return newOp0(Opcode.PtrAtUnboxedComponentField(specs), ta, ta, ptrType);
+		return newOp0(Opcode.PtrAtUnboxedComponentField(Lists.map(specs, IrSpec.asField)), ta, ta, ptrType);
 	}
 	def newPtrCmpSwp(ptrType: Type, valueType: Type) -> Operator {
 		return newOp0(Opcode.PtrCmpSwp, [ptrType, valueType], [ptrType, valueType, valueType], type_z);
@@ -630,8 +630,8 @@ def renderOp(op: Operator, buf: StringBuilder) -> StringBuilder {
 		PtrAtComponentField(field) => rfunc = field.render;
 		PtrAtObjectField(field) => rfunc = field.render;
 		PtrAtRefLayoutField(field) => rfunc = StringBuilder.put1(_, "%d", field);
-		PtrAtUnboxedObjectField(specs) => rfunc = renderList<IrSpec>(_, specs, IrSpec.render, ",");
-		PtrAtUnboxedComponentField(specs) => rfunc = renderList<IrSpec>(_, specs, IrSpec.render, ",");
+		PtrAtUnboxedObjectField(specs) => rfunc = renderList<IrField>(_, specs, IrField.renderLong, ",");
+		PtrAtUnboxedComponentField(specs) => rfunc = renderList<IrField>(_, specs, IrField.renderLong, ",");
 		ClassAlloc(method) => if(method != null) rfunc = method.render;
 		ClassGetMethod(method) => rfunc = method.render;
 		ClassGetVirtual(method) => rfunc = method.render;

aeneas/src/ir/Reachability.v3

@@ -443,12 +443,11 @@ class ReachabilityAnalyzer(compilation: Compilation) {
 		rf.writeFacts = none;
 		rf.setFact(RaFact.RF_VAL_MANY);
 	}
-	def getPointerAtUnboxedField(op: SsaApplyOp, specs: List<IrSpec>, context: IrSpec) {
+	def getPointerAtUnboxedField(op: SsaApplyOp, specs: List<IrField>, context: IrSpec) {
 		var prevType: Type;
-		prevType = if(specs != null, specs.head.receiver);
+		prevType = if(specs != null, mono(op.op.typeArgs[0], context));
 		for (l = specs; l != null; l = l.tail) {
-			var spec = l.head;
-			var fld = spec.asField();
+			var fld = l.head;
 			var rf = makeField3(prevType, fld, context);
 			prevType = rf.fieldType;
 			if (prevType == null) prevType = rf.orig.fieldType;

aeneas/src/ir/SsaNormalizer.v3

@@ -1337,7 +1337,7 @@ class SsaRaNormalizer extends SsaRebuilder {
 		}
 		return mapN(i_old, vals);
 	}
-	def normPtrAtUnboxedField(i_old: SsaApplyOp, specs: List<IrSpec>, op: Operator, boxKind: BoxKind) {
+	def normPtrAtUnboxedField(i_old: SsaApplyOp, specs: List<IrField>, op: Operator, boxKind: BoxKind) {
 		// XXX: propagate O_NO_NULL_CHECK and O_PURE
 		var ai_new = genRefs(i_old.inputs);
 		if (i_old.useList == null) {
@@ -1346,7 +1346,7 @@ class SsaRaNormalizer extends SsaRebuilder {
 			return map1(i_old, result);
 		}
 		// Need to start with outermost field access to get initial set of fields
-		var raField = extractFieldRef(i_old, specs.head.asField());
+		var raField = extractFieldRef(i_old, specs.head);
 		var rc = norm.ra.getClass(raField.receiver);
 		var nf = raField.normOf(rc.liveFields);
 		normType(raField.receiver); // XXX: normType() side-effect of flattening
@@ -1355,7 +1355,7 @@ class SsaRaNormalizer extends SsaRebuilder {
 		for (elt = specs.tail; elt != null && nf.length != 0; elt = elt.tail) {
 			var spec = elt.head;
 			var ctxt = if (specSet != null, specSet.first(), context.spec);
-			raField = norm.ra.makeField3(prevType, spec.asField(), ctxt);
+			raField = norm.ra.makeField3(prevType, spec, ctxt);
 			prevType = raField.getClosedType();
 			nf = raField.normOf(nf);
 		}

aeneas/src/main/Version.v3

@@ -3,6 +3,6 @@
 
 // Updated by VCS scripts. DO NOT EDIT.
 component Version {
-	def version: string = "III-9.1805";
+	def version: string = "III-9.1806";
 	var buildData: string;
 }

test/pointer/Pointer_atUnboxedField28.v3

@@ -0,0 +1,13 @@
+//@execute 0=0; -99=-99
+
+type A<T>(x: B<T>) #unboxed;
+type B<U>(y: C<U>) #unboxed;
+type C<V>(z: V) #unboxed;
+
+var f: A<int>;
+
+def main(a: int) -> int {
+	f = A<int>(B<int>(C<int>(a)));
+	var p = Pointer.atField(f.x.y.z);
+	return p.load<int>();
+}

test/pointer/Pointer_atUnboxedField29.v3

@@ -0,0 +1,17 @@
+//@execute 0=0; -99=-99
+
+type A<T>(x: B<T>) #unboxed;
+type B<U>(y: C<U>) #unboxed;
+type C<V>(z: V) #unboxed;
+
+class X<W>(f: A<W>) { }
+
+def main(a: int) -> int {
+	var v = A<int>(B<int>(C<int>(a)));
+	var p = get(X<int>.new(v));
+	return p.load<int>();
+}
+
+def get<Z>(o: X<Z>) -> Pointer {
+	return Pointer.atField(o.f.x.y.z);
+}