authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-06-28 17:56:28-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-06-28 18:38:25-07:00
logc3ae909e935f1548408f2e400464370ee02b7e82
tree165a355a68a838ec4fa894a0496ab471b0439a42
parenta058696df280ad50c28a2d501a6a2c38a7e3a532

Revert "AstGen: preserve inferred ptr result loc for breaks"

This reverts commit 8bf3e1f8d0902abd4133e2729b3625c25011c3ff, which introduced miscompilations for peer expressions any time they needed coercions to runtime types. I opened #11957 as a proposal to accomplish the goal of the reverted commit. Closes #11898

7 files changed, 21 insertions(+), 51 deletions(-)

lib/std/priority_queue.zig-15
...@@ -286,7 +286,6 @@ const PQlt = PriorityQueue(u32, void, lessThan);...@@ -286,7 +286,6 @@ const PQlt = PriorityQueue(u32, void, lessThan);
286const PQgt = PriorityQueue(u32, void, greaterThan);286const PQgt = PriorityQueue(u32, void, greaterThan);
287287
288test "std.PriorityQueue: add and remove min heap" {288test "std.PriorityQueue: add and remove min heap" {
289 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
290 var queue = PQlt.init(testing.allocator, {});289 var queue = PQlt.init(testing.allocator, {});
291 defer queue.deinit();290 defer queue.deinit();
292291
...@@ -305,7 +304,6 @@ test "std.PriorityQueue: add and remove min heap" {...@@ -305,7 +304,6 @@ test "std.PriorityQueue: add and remove min heap" {
305}304}
306305
307test "std.PriorityQueue: add and remove same min heap" {306test "std.PriorityQueue: add and remove same min heap" {
308 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
309 var queue = PQlt.init(testing.allocator, {});307 var queue = PQlt.init(testing.allocator, {});
310 defer queue.deinit();308 defer queue.deinit();
311309
...@@ -355,7 +353,6 @@ test "std.PriorityQueue: peek" {...@@ -355,7 +353,6 @@ test "std.PriorityQueue: peek" {
355}353}
356354
357test "std.PriorityQueue: sift up with odd indices" {355test "std.PriorityQueue: sift up with odd indices" {
358 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
359 var queue = PQlt.init(testing.allocator, {});356 var queue = PQlt.init(testing.allocator, {});
360 defer queue.deinit();357 defer queue.deinit();
361 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };358 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };
...@@ -370,7 +367,6 @@ test "std.PriorityQueue: sift up with odd indices" {...@@ -370,7 +367,6 @@ test "std.PriorityQueue: sift up with odd indices" {
370}367}
371368
372test "std.PriorityQueue: addSlice" {369test "std.PriorityQueue: addSlice" {
373 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
374 var queue = PQlt.init(testing.allocator, {});370 var queue = PQlt.init(testing.allocator, {});
375 defer queue.deinit();371 defer queue.deinit();
376 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };372 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };
...@@ -403,7 +399,6 @@ test "std.PriorityQueue: fromOwnedSlice trivial case 1" {...@@ -403,7 +399,6 @@ test "std.PriorityQueue: fromOwnedSlice trivial case 1" {
403}399}
404400
405test "std.PriorityQueue: fromOwnedSlice" {401test "std.PriorityQueue: fromOwnedSlice" {
406 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest;
407 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };402 const items = [_]u32{ 15, 7, 21, 14, 13, 22, 12, 6, 7, 25, 5, 24, 11, 16, 15, 24, 2, 1 };
408 const heap_items = try testing.allocator.dupe(u32, items[0..]);403 const heap_items = try testing.allocator.dupe(u32, items[0..]);
409 var queue = PQlt.fromOwnedSlice(testing.allocator, heap_items[0..], {});404 var queue = PQlt.fromOwnedSlice(testing.allocator, heap_items[0..], {});
...@@ -416,7 +411,6 @@ test "std.PriorityQueue: fromOwnedSlice" {...@@ -416,7 +411,6 @@ test "std.PriorityQueue: fromOwnedSlice" {
416}411}
417412
418test "std.PriorityQueue: add and remove max heap" {413test "std.PriorityQueue: add and remove max heap" {
419 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
420 var queue = PQgt.init(testing.allocator, {});414 var queue = PQgt.init(testing.allocator, {});
421 defer queue.deinit();415 defer queue.deinit();
422416
...@@ -435,7 +429,6 @@ test "std.PriorityQueue: add and remove max heap" {...@@ -435,7 +429,6 @@ test "std.PriorityQueue: add and remove max heap" {
435}429}
436430
437test "std.PriorityQueue: add and remove same max heap" {431test "std.PriorityQueue: add and remove same max heap" {
438 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
439 var queue = PQgt.init(testing.allocator, {});432 var queue = PQgt.init(testing.allocator, {});
440 defer queue.deinit();433 defer queue.deinit();
441434
...@@ -476,7 +469,6 @@ test "std.PriorityQueue: iterator" {...@@ -476,7 +469,6 @@ test "std.PriorityQueue: iterator" {
476}469}
477470
478test "std.PriorityQueue: remove at index" {471test "std.PriorityQueue: remove at index" {
479 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
480 var queue = PQlt.init(testing.allocator, {});472 var queue = PQlt.init(testing.allocator, {});
481 defer queue.deinit();473 defer queue.deinit();
482474
...@@ -512,7 +504,6 @@ test "std.PriorityQueue: iterator while empty" {...@@ -512,7 +504,6 @@ test "std.PriorityQueue: iterator while empty" {
512}504}
513505
514test "std.PriorityQueue: shrinkAndFree" {506test "std.PriorityQueue: shrinkAndFree" {
515 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
516 var queue = PQlt.init(testing.allocator, {});507 var queue = PQlt.init(testing.allocator, {});
517 defer queue.deinit();508 defer queue.deinit();
518509
...@@ -536,7 +527,6 @@ test "std.PriorityQueue: shrinkAndFree" {...@@ -536,7 +527,6 @@ test "std.PriorityQueue: shrinkAndFree" {
536}527}
537528
538test "std.PriorityQueue: update min heap" {529test "std.PriorityQueue: update min heap" {
539 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
540 var queue = PQlt.init(testing.allocator, {});530 var queue = PQlt.init(testing.allocator, {});
541 defer queue.deinit();531 defer queue.deinit();
542532
...@@ -552,7 +542,6 @@ test "std.PriorityQueue: update min heap" {...@@ -552,7 +542,6 @@ test "std.PriorityQueue: update min heap" {
552}542}
553543
554test "std.PriorityQueue: update same min heap" {544test "std.PriorityQueue: update same min heap" {
555 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
556 var queue = PQlt.init(testing.allocator, {});545 var queue = PQlt.init(testing.allocator, {});
557 defer queue.deinit();546 defer queue.deinit();
558547
...@@ -569,7 +558,6 @@ test "std.PriorityQueue: update same min heap" {...@@ -569,7 +558,6 @@ test "std.PriorityQueue: update same min heap" {
569}558}
570559
571test "std.PriorityQueue: update max heap" {560test "std.PriorityQueue: update max heap" {
572 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
573 var queue = PQgt.init(testing.allocator, {});561 var queue = PQgt.init(testing.allocator, {});
574 defer queue.deinit();562 defer queue.deinit();
575563
...@@ -585,7 +573,6 @@ test "std.PriorityQueue: update max heap" {...@@ -585,7 +573,6 @@ test "std.PriorityQueue: update max heap" {
585}573}
586574
587test "std.PriorityQueue: update same max heap" {575test "std.PriorityQueue: update same max heap" {
588 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
589 var queue = PQgt.init(testing.allocator, {});576 var queue = PQgt.init(testing.allocator, {});
590 defer queue.deinit();577 defer queue.deinit();
591578
...@@ -602,7 +589,6 @@ test "std.PriorityQueue: update same max heap" {...@@ -602,7 +589,6 @@ test "std.PriorityQueue: update same max heap" {
602}589}
603590
604test "std.PriorityQueue: siftUp in remove" {591test "std.PriorityQueue: siftUp in remove" {
605 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
606 var queue = PQlt.init(testing.allocator, {});592 var queue = PQlt.init(testing.allocator, {});
607 defer queue.deinit();593 defer queue.deinit();
608594
...@@ -623,7 +609,6 @@ fn contextLessThan(context: []const u32, a: usize, b: usize) Order {...@@ -623,7 +609,6 @@ fn contextLessThan(context: []const u32, a: usize, b: usize) Order {
623const CPQlt = PriorityQueue(usize, []const u32, contextLessThan);609const CPQlt = PriorityQueue(usize, []const u32, contextLessThan);
624610
625test "std.PriorityQueue: add and remove min heap with contextful comparator" {611test "std.PriorityQueue: add and remove min heap with contextful comparator" {
626 if (@import("builtin").zig_backend != .stage1) return error.SkipZigTest; // TODO
627 const context = [_]u32{ 5, 3, 4, 2, 2, 8, 0 };612 const context = [_]u32{ 5, 3, 4, 2, 2, 8, 0 };
628613
629 var queue = CPQlt.init(testing.allocator, context[0..]);614 var queue = CPQlt.init(testing.allocator, context[0..]);
src/AstGen.zig+1-1
...@@ -10007,7 +10007,7 @@ const GenZir = struct {...@@ -10007,7 +10007,7 @@ const GenZir = struct {
10007 .inferred_ptr => |ptr| {10007 .inferred_ptr => |ptr| {
10008 gz.rl_ty_inst = .none;10008 gz.rl_ty_inst = .none;
10009 gz.rl_ptr = ptr;10009 gz.rl_ptr = ptr;
10010 gz.break_result_loc = parent_rl;10010 gz.break_result_loc = .{ .block_ptr = gz };
10011 },10011 },
1001210012
10013 .block_ptr => |parent_block_scope| {10013 .block_ptr => |parent_block_scope| {
src/Sema.zig-22
...@@ -3079,28 +3079,6 @@ fn zirResolveInferredAlloc(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Com...@@ -3079,28 +3079,6 @@ fn zirResolveInferredAlloc(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Com
30793079
3080 if (var_is_mut) {3080 if (var_is_mut) {
3081 try sema.validateVarType(block, ty_src, final_elem_ty, false);3081 try sema.validateVarType(block, ty_src, final_elem_ty, false);
3082
3083 // The value might have been bitcasted into a comptime only
3084 // pointer type such as `*@Type(.EnumLiteral)` so we must now
3085 // update all the stores to not give backends invalid AIR.
3086
3087 var air_tags = sema.air_instructions.items(.tag);
3088 var air_data = sema.air_instructions.items(.data);
3089 var peer_inst_index: usize = 0;
3090 var i = ptr_inst;
3091 while (i < air_tags.len and peer_inst_index < peer_inst_list.len) : (i += 1) {
3092 if (air_tags[i] != .store) continue;
3093 if (air_data[i].bin_op.rhs == peer_inst_list[peer_inst_index]) {
3094 peer_inst_index += 1;
3095 _ = (try sema.resolveMaybeUndefVal(block, .unneeded, air_data[i].bin_op.rhs)) orelse continue;
3096 const coerced_val = try sema.coerce(block, final_elem_ty, air_data[i].bin_op.rhs, .unneeded);
3097 air_tags = sema.air_instructions.items(.tag);
3098 air_data = sema.air_instructions.items(.data);
3099
3100 air_data[i].bin_op.lhs = ptr;
3101 air_data[i].bin_op.rhs = coerced_val;
3102 }
3103 }
3104 } else ct: {3082 } else ct: {
3105 // Detect if the value is comptime known. In such case, the3083 // Detect if the value is comptime known. In such case, the
3106 // last 3 AIR instructions of the block will look like this:3084 // last 3 AIR instructions of the block will look like this:
test/behavior/basic.zig-12
...@@ -928,18 +928,6 @@ test "try in labeled block doesn't cast to wrong type" {...@@ -928,18 +928,6 @@ test "try in labeled block doesn't cast to wrong type" {
928 _ = s;928 _ = s;
929}929}
930930
931test "comptime int in switch in catch is casted to correct inferred type" {
932 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
933 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
934
935 var a: error{ A, B }!u64 = 0;
936 var b = a catch |err| switch (err) {
937 error.A => 0,
938 else => unreachable,
939 };
940 _ = b;
941}
942
943test "vector initialized with array init syntax has proper type" {931test "vector initialized with array init syntax has proper type" {
944 comptime {932 comptime {
945 const actual = -@Vector(4, i32){ 1, 2, 3, 4 };933 const actual = -@Vector(4, i32){ 1, 2, 3, 4 };
test/behavior/cast.zig+2
...@@ -812,6 +812,7 @@ test "peer type resolution: error union after non-error" {...@@ -812,6 +812,7 @@ test "peer type resolution: error union after non-error" {
812}812}
813813
814test "peer cast *[0]T to E![]const T" {814test "peer cast *[0]T to E![]const T" {
815 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
815 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;816 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
816 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO817 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
817 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO818 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
...@@ -826,6 +827,7 @@ test "peer cast *[0]T to E![]const T" {...@@ -826,6 +827,7 @@ test "peer cast *[0]T to E![]const T" {
826}827}
827828
828test "peer cast *[0]T to []const T" {829test "peer cast *[0]T to []const T" {
830 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
829 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;831 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
830 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO832 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
831 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO833 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
test/behavior/error.zig+1-1
...@@ -709,7 +709,7 @@ test "simple else prong allowed even when all errors handled" {...@@ -709,7 +709,7 @@ test "simple else prong allowed even when all errors handled" {
709 }709 }
710 };710 };
711 var value = S.foo() catch |err| switch (err) {711 var value = S.foo() catch |err| switch (err) {
712 error.Foo => 255,712 error.Foo => @as(u8, 255),
713 else => |e| return e,713 else => |e| return e,
714 };714 };
715 try expect(value == 255);715 try expect(value == 255);
test/behavior/if.zig+17
...@@ -111,3 +111,20 @@ test "if prongs cast to expected type instead of peer type resolution" {...@@ -111,3 +111,20 @@ test "if prongs cast to expected type instead of peer type resolution" {
111 try S.doTheTest(false);111 try S.doTheTest(false);
112 comptime try S.doTheTest(false);112 comptime try S.doTheTest(false);
113}113}
114
115test "if peer expressions inferred optional type" {
116 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
117 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
118 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
119
120 var self: []const u8 = "abcdef";
121 var index: usize = 0;
122 var left_index = (index << 1) + 1;
123 var right_index = left_index + 1;
124 var left = if (left_index < self.len) self[left_index] else null;
125 var right = if (right_index < self.len) self[right_index] else null;
126 try expect(left_index < self.len);
127 try expect(right_index < self.len);
128 try expect(left.? == 98);
129 try expect(right.? == 99);
130}