Commit 6329f4e47a78dc75b234e6d89c82fb3cff058fe1 | zig

author	Robin Voetter <robin@voetter.nl> 2021-10-20 02:23:09+02:00
committer	Robin Voetter <robin@voetter.nl> 2021-10-20 03:44:02+02:00
log	6329f4e47a78dc75b234e6d89c82fb3cff058fe1
tree	e1fec3554f167a4ed473a46e40b3575b19016ad7
parent	d6f048c4565ee7b3d86c070c07dd555376a52ad2

stage2: union field value

2 files changed, 53 insertions(+), 24 deletions(-)

src
- Sema.zig
- codegen
  - llvm.zig

src/Sema.zig+26-14

 @@ -300,7 +300,7 @@ pub const Block = struct {
                         .ty = ty,
                         .payload = try block.sema.addExtra(Air.StructField{
                             .struct_operand = struct_ptr,
-                            .field_index = @intCast(u32, field_index),
+                            .field_index = field_index,
                         }),
                     } },
                 });
 @@ -315,6 +315,24 @@ pub const Block = struct {
         });
     }
+    pub fn addStructFieldVal(
+        block: *Block,
+        struct_val: Air.Inst.Ref,
+        field_index: u32,
+        field_ty: Type,
+    ) !Air.Inst.Ref {
+        return block.addInst(.{
+            .tag = .struct_field_val,
+            .data = .{ .ty_pl = .{
+                .ty = try block.sema.addType(field_ty),
+                .payload = try block.sema.addExtra(Air.StructField{
+                    .struct_operand = struct_val,
+                    .field_index = field_index,
+                }),
+            } },
+        });
+    }
     pub fn addInst(block: *Block, inst: Air.Inst) error{OutOfMemory}!Air.Inst.Ref {
         return Air.indexToRef(try block.addInstAsIndex(inst));
     }
 @@ -11261,8 +11279,10 @@ fn structFieldVal(
     const struct_ty = try sema.resolveTypeFields(block, src, unresolved_struct_ty);
     const struct_obj = struct_ty.castTag(.@"struct").?.data;
-    const field_index = struct_obj.fields.getIndex(field_name) orelse
+    const field_index_big = struct_obj.fields.getIndex(field_name) orelse
         return sema.failWithBadFieldAccess(block, struct_obj, field_name_src, field_name);
+    const field_index = @intCast(u32, field_index_big);
     const field = struct_obj.fields.values()[field_index];
     if (try sema.resolveMaybeUndefVal(block, src, struct_byval)) |struct_val| {
 @@ -11273,16 +11293,7 @@ fn structFieldVal(
     }
     try sema.requireRuntimeBlock(block, src);
-    return block.addInst(.{
+    return block.addStructFieldVal(struct_byval, field_index, field.ty);
-        .tag = .struct_field_val,
-        .data = .{ .ty_pl = .{
-            .ty = try sema.addType(field.ty),
-            .payload = try sema.addExtra(Air.StructField{
-                .struct_operand = struct_byval,
-                .field_index = @intCast(u32, field_index),
-            }),
-        } },
-    });
 }
 fn unionFieldPtr(
 @@ -11341,8 +11352,9 @@ fn unionFieldVal(
     const union_ty = try sema.resolveTypeFields(block, src, unresolved_union_ty);
     const union_obj = union_ty.cast(Type.Payload.Union).?.data;
-    const field_index = union_obj.fields.getIndex(field_name) orelse
+    const field_index_big = union_obj.fields.getIndex(field_name) orelse
         return sema.failWithBadUnionFieldAccess(block, union_obj, field_name_src, field_name);
+    const field_index = @intCast(u32, field_index_big);
     const field = union_obj.fields.values()[field_index];
 @@ -11355,7 +11367,7 @@ fn unionFieldVal(
     }
     try sema.requireRuntimeBlock(block, src);
-    return sema.fail(block, src, "TODO implement runtime union field access", .{});
+    return block.addStructFieldVal(union_byval, field_index, field.ty);
 }
 fn elemPtr(

src/codegen/llvm.zig+27-10

...	@@ -2236,17 +2236,34 @@ pub const FuncGen = struct {	...	@@ -2236,17 +2236,34 @@ pub const FuncGen = struct {
2236	const struct_field = self.air.extraData(Air.StructField, ty_pl.payload).data;	2236	const struct_field = self.air.extraData(Air.StructField, ty_pl.payload).data;
2237	const struct_ty = self.air.typeOf(struct_field.struct_operand);	2237	const struct_ty = self.air.typeOf(struct_field.struct_operand);
2238	const struct_llvm_val = try self.resolveInst(struct_field.struct_operand);	2238	const struct_llvm_val = try self.resolveInst(struct_field.struct_operand);
2239	const field_index = llvmFieldIndex(struct_ty, struct_field.field_index);	2239	const field_index = struct_field.field_index;
2240	if (isByRef(struct_ty)) {	2240	const field_ty = struct_ty.structFieldType(field_index);
2241	const field_ptr = self.builder.buildStructGEP(struct_llvm_val, field_index, "");	2241	if (!field_ty.hasCodeGenBits()) {
2242	const field_ty = struct_ty.structFieldType(struct_field.field_index);	2242	return null;
2243	if (isByRef(field_ty)) {	2243	}
2244	return field_ptr;	2244
2245	} else {	2245	assert(isByRef(struct_ty));
2246	return self.builder.buildLoad(field_ptr, "");	2246
2247	}	2247	const field_ptr = switch (struct_ty.zigTypeTag()) {
		2248	.Struct => blk: {
		2249	const llvm_field_index = llvmFieldIndex(struct_ty, field_index);
		2250	break :blk self.builder.buildStructGEP(struct_llvm_val, llvm_field_index, "");
		2251	},
		2252	.Union => blk: {
		2253	const llvm_field_ty = try self.dg.llvmType(field_ty);
		2254	const target = self.dg.module.getTarget();
		2255	const layout = struct_ty.unionGetLayout(target);
		2256	const payload_index = @boolToInt(layout.tag_align >= layout.payload_align);
		2257	const union_field_ptr = self.builder.buildStructGEP(struct_llvm_val, payload_index, "");
		2258	break :blk self.builder.buildBitCast(union_field_ptr, llvm_field_ty.pointerType(0), "");
		2259	},
		2260	else => unreachable,
		2261	};
		2262
		2263	if (isByRef(field_ty)) {
		2264	return field_ptr;
2248	} else {	2265	} else {
2249	return self.builder.buildExtractValue(struct_llvm_val, field_index, "");	2266	return self.builder.buildLoad(field_ptr, "");
2250	}	2267	}
2251	}	2268	}
2252		2269