zig

commit fa34dfcce7bfe44840c0cf1ac450c2dc457ce94a (tree)
parent e0db54e89d6f4e9f56800ddb1017e30be1b7d58a
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu,  7 Nov 2019 14:46:48 -0500

fix result loc of cast not finding parent

Diffstat:
M
src/ir.cpp
 | 
2
+-
M
test/stage1/behavior.zig
 | 
4
++--
M
test/stage1/behavior/misc.zig
 | 
10
+++++-----

3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -15733,7 +15733,7 @@ static IrInstruction *ir_resolve_result_raw(IrAnalyze *ira, IrInstruction *suspe
                 casted_value = nullptr;
             }
 
-            if (casted_value == nullptr || type_is_invalid(casted_value->value.type)) {
+            if (casted_value != nullptr && type_is_invalid(casted_value->value.type)) {
                 return casted_value;
             }
 
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
@@ -1,5 +1,5 @@
 comptime {
-    //_ = @import("behavior/align.zig");
+    _ = @import("behavior/align.zig");
     _ = @import("behavior/alignof.zig");
     //_ = @import("behavior/array.zig");
     _ = @import("behavior/asm.zig");
@@ -73,7 +73,7 @@ comptime {
     _ = @import("behavior/ir_block_deps.zig");
     _ = @import("behavior/math.zig");
     _ = @import("behavior/merge_error_sets.zig");
-    //_ = @import("behavior/misc.zig");
+    _ = @import("behavior/misc.zig");
     _ = @import("behavior/muladd.zig");
     _ = @import("behavior/namespace_depends_on_compile_var.zig");
     _ = @import("behavior/new_stack_call.zig");
diff --git a/test/stage1/behavior/misc.zig b/test/stage1/behavior/misc.zig
@@ -241,14 +241,14 @@ fn memFree(comptime T: type, memory: []T) void {}
 
 test "cast undefined" {
     const array: [100]u8 = undefined;
-    const slice = ([]const u8)(array);
+    const slice = @as([]const u8, array);
     testCastUndefined(slice);
 }
 fn testCastUndefined(x: []const u8) void {}
 
 test "cast small unsigned to larger signed" {
-    expect(castSmallUnsignedToLargerSigned1(200) == i16(200));
-    expect(castSmallUnsignedToLargerSigned2(9999) == i64(9999));
+    expect(castSmallUnsignedToLargerSigned1(200) == @as(i16, 200));
+    expect(castSmallUnsignedToLargerSigned2(9999) == @as(i64, 9999));
 }
 fn castSmallUnsignedToLargerSigned1(x: u8) i16 {
     return x;
@@ -350,7 +350,7 @@ fn testTakeAddressOfParameter(f: f32) void {
 }
 
 test "pointer comparison" {
-    const a = ([]const u8)("a");
+    const a = @as([]const u8, "a");
     const b = &a;
     expect(ptrEql(b, b));
 }
@@ -642,7 +642,7 @@ test "self reference through fn ptr field" {
 
 test "volatile load and store" {
     var number: i32 = 1234;
-    const ptr = (*volatile i32)(&number);
+    const ptr = @as(*volatile i32, &number);
     ptr.* += 1;
     expect(ptr.* == 1235);
 }