Commit a5ac06268972bd7279a1bb928a40d70cc7d515ed | zig

author	Veikka Tuominen <git@vexu.eu> 2022-02-20 11:25:19+02:00
committer	Veikka Tuominen <git@vexu.eu> 2022-02-20 11:59:49+02:00
log	a5ac06268972bd7279a1bb928a40d70cc7d515ed
tree	2773b5115c1633c303f9527bc4422fe2e68c0b74
parent	a2533e6fca0f28aa64717d8e4c13fe6a780b8b15

stage2: make field/array base ptr work at comptime

2 files changed, 17 insertions(+), 9 deletions(-)

src
- Sema.zig
test
- behavior
  - struct.zig

src/Sema.zig+16-8

 @@ -5337,11 +5337,15 @@ fn analyzeOptionalPayloadPtr(
     });
     if (try sema.resolveDefinedValue(block, src, optional_ptr)) |pointer_val| {
+        if (initializing) {
+            return sema.addConstant(
+                child_pointer,
+                try Value.Tag.opt_payload_ptr.create(sema.arena, pointer_val),
+            );
+        }
         if (try sema.pointerDeref(block, src, pointer_val, optional_ptr_ty)) |val| {
-            if (!initializing) {
+            if (val.isNull()) {
-                if (val.isNull()) {
+                return sema.fail(block, src, "unable to unwrap null", .{});
-                    return sema.fail(block, src, "unable to unwrap null", .{});
-                }
             }
             // The same Value represents the pointer to the optional and the payload.
             return sema.addConstant(
 @@ -5488,11 +5492,15 @@ fn analyzeErrUnionPayloadPtr(
     });
     if (try sema.resolveDefinedValue(block, src, operand)) |pointer_val| {
+        if (initializing) {
+            return sema.addConstant(
+                operand_pointer_ty,
+                try Value.Tag.eu_payload_ptr.create(sema.arena, pointer_val),
+            );
+        }
         if (try sema.pointerDeref(block, src, pointer_val, operand_ty)) |val| {
-            if (!initializing) {
+            if (val.getError()) |name| {
-                if (val.getError()) |name| {
+                return sema.fail(block, src, "caught unexpected error '{s}'", .{name});
-                    return sema.fail(block, src, "caught unexpected error '{s}'", .{name});
-                }
             }
             return sema.addConstant(

test/behavior/struct.zig+1-1

...	@@ -1222,7 +1222,7 @@ test "anon init through error unions and optionals" {	...	@@ -1222,7 +1222,7 @@ test "anon init through error unions and optionals" {
1222	};	1222	};
1223		1223
1224	try S.doTheTest();	1224	try S.doTheTest();
1225	// comptime try S.doTheTest(); // TODO	1225	comptime try S.doTheTest();
1226	}	1226	}
1227		1227
1228	test "anon init through optional" {	1228	test "anon init through optional" {