Commit 4e9ab0306ac84227bff1188bbf4d65a1ae5255d9 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-11-05 11:44:07-05:00
committer	GitHub <noreply@github.com> 2019-11-05 11:44:07-05:00
log	4e9ab0306ac84227bff1188bbf4d65a1ae5255d9
tree	a4b31fbbe704dc1d19392ce3ea4f2670b5c2e57c
parent	1c22cb5e515548b22ccb260f4451edc119151584
parent	9170dcb73f7b654cdf8447452240c3bf8d3de838
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #3587 from LemonBoy/fix-things

Bunch'o'fixes

5 files changed, 65 insertions(+), 16 deletions(-)

lib
- std
  - debug.zig
src
- analyze.cpp
- ir.cpp
test
- compile_errors.zig
- stage1
  - behavior
    atomics.zig

lib/std/debug.zig+1-1

...	@@ -17,7 +17,7 @@ const maxInt = std.math.maxInt;	...	@@ -17,7 +17,7 @@ const maxInt = std.math.maxInt;
17	const File = std.fs.File;	17	const File = std.fs.File;
18	const windows = std.os.windows;	18	const windows = std.os.windows;
19		19
20	const leb = @import("debug/leb128.zig");	20	pub const leb = @import("debug/leb128.zig");
21		21
22	pub const FailingAllocator = @import("debug/failing_allocator.zig").FailingAllocator;	22	pub const FailingAllocator = @import("debug/failing_allocator.zig").FailingAllocator;
23	pub const failing_allocator = &FailingAllocator.init(global_allocator, 0).allocator;	23	pub const failing_allocator = &FailingAllocator.init(global_allocator, 0).allocator;

src/analyze.cpp+12-3

 @@ -4238,7 +4238,8 @@ AstNode *get_param_decl_node(ZigFn *fn_entry, size_t index) {
         return nullptr;
 }
-static void define_local_param_variables(CodeGen *g, ZigFn *fn_table_entry) {
+static Error define_local_param_variables(CodeGen *g, ZigFn *fn_table_entry) {
+    Error err;
     ZigType *fn_type = fn_table_entry->type_entry;
     assert(!fn_type->data.fn.is_generic);
     FnTypeId *fn_type_id = &fn_type->data.fn.fn_type_id;
 @@ -4257,8 +4258,11 @@ static void define_local_param_variables(CodeGen *g, ZigFn *fn_table_entry) {
         }
         ZigType *param_type = param_info->type;
-        bool is_noalias = param_info->is_noalias;
+        if ((err = type_resolve(g, param_type, ResolveStatusSizeKnown))) {
+            return err;
+        }
+        bool is_noalias = param_info->is_noalias;
         if (is_noalias && get_codegen_ptr_type(param_type) == nullptr) {
             add_node_error(g, param_decl_node, buf_sprintf("noalias on non-pointer parameter"));
         }
 @@ -4273,6 +4277,8 @@ static void define_local_param_variables(CodeGen *g, ZigFn *fn_table_entry) {
             fn_table_entry->variable_list.append(var);
         }
     }
+    return ErrorNone;
 }
 bool resolve_inferred_error_set(CodeGen *g, ZigType *err_set_type, AstNode *source_node) {
 @@ -4596,7 +4602,10 @@ static void analyze_fn_body(CodeGen *g, ZigFn *fn_table_entry) {
     if (!fn_table_entry->child_scope)
         fn_table_entry->child_scope = &fn_table_entry->fndef_scope->base;
-    define_local_param_variables(g, fn_table_entry);
+    if (define_local_param_variables(g, fn_table_entry) != ErrorNone) {
+        fn_table_entry->anal_state = FnAnalStateInvalid;
+        return;
+    }
     ZigType *fn_type = fn_table_entry->type_entry;
     assert(!fn_type->data.fn.is_generic);

src/ir.cpp+23-12

 @@ -1668,7 +1668,7 @@ static IrInstruction *ir_build_resize_slice(IrAnalyze *ira, IrInstruction *sourc
     instruction->result_loc = result_loc;
     ir_ref_instruction(operand, ira->new_irb.current_basic_block);
-    ir_ref_instruction(result_loc, ira->new_irb.current_basic_block);
+    if (result_loc != nullptr) ir_ref_instruction(result_loc, ira->new_irb.current_basic_block);
     return &instruction->base;
 }
 @@ -11297,7 +11297,10 @@ static ZigFn *ir_resolve_fn(IrAnalyze *ira, IrInstruction *fn_value) {
     if (!const_val)
         return nullptr;
-    assert(const_val->data.x_ptr.special == ConstPtrSpecialFunction);
+    // May be a ConstPtrSpecialHardCodedAddr
+    if (const_val->data.x_ptr.special != ConstPtrSpecialFunction)
+        return nullptr;
     return const_val->data.x_ptr.data.fn.fn_entry;
 }
 @@ -16737,9 +16740,8 @@ static IrInstruction *ir_analyze_instruction_call(IrAnalyze *ira, IrInstructionC
             return ir_finish_anal(ira, cast_instruction);
         } else if (fn_ref->value.type->id == ZigTypeIdFn) {
             ZigFn *fn_table_entry = ir_resolve_fn(ira, fn_ref);
-            if (fn_table_entry == nullptr)
+            ZigType *fn_type = fn_table_entry ? fn_table_entry->type_entry : fn_ref->value.type;
-                return ira->codegen->invalid_instruction;
+            return ir_analyze_fn_call(ira, call_instruction, fn_table_entry, fn_type,
-            return ir_analyze_fn_call(ira, call_instruction, fn_table_entry, fn_table_entry->type_entry,
                 fn_ref, nullptr, is_comptime, call_instruction->fn_inline);
         } else if (fn_ref->value.type->id == ZigTypeIdBoundFn) {
             assert(fn_ref->value.special == ConstValSpecialStatic);
 @@ -16756,7 +16758,7 @@ static IrInstruction *ir_analyze_instruction_call(IrAnalyze *ira, IrInstructionC
     if (fn_ref->value.type->id == ZigTypeIdFn) {
         return ir_analyze_fn_call(ira, call_instruction, nullptr, fn_ref->value.type,
-            fn_ref, nullptr, false, FnInlineAuto);
+            fn_ref, nullptr, false, call_instruction->fn_inline);
     } else {
         ir_add_error_node(ira, fn_ref->source_node,
             buf_sprintf("type '%s' not a function", buf_ptr(&fn_ref->value.type->name)));
 @@ -21798,7 +21800,8 @@ static IrInstruction *ir_analyze_instruction_cmpxchg(IrAnalyze *ira, IrInstructi
         return ira->codegen->invalid_instruction;
     }
-    if (instr_is_comptime(casted_ptr) && instr_is_comptime(casted_cmp_value) && instr_is_comptime(casted_new_value)) {
+    if (instr_is_comptime(casted_ptr) && casted_ptr->value.data.x_ptr.mut != ConstPtrMutRuntimeVar &&
+        instr_is_comptime(casted_cmp_value) && instr_is_comptime(casted_new_value)) {
         zig_panic("TODO compile-time execution of cmpxchg");
     }
 @@ -22948,12 +22951,20 @@ static IrInstruction *ir_analyze_instruction_slice(IrAnalyze *ira, IrInstruction
                 if (parent_ptr == nullptr)
                     return ira->codegen->invalid_instruction;
-                array_val = const_ptr_pointee(ira, ira->codegen, parent_ptr, instruction->base.source_node);
-                if (array_val == nullptr)
-                    return ira->codegen->invalid_instruction;
-                rel_end = child_array_type->data.array.len;
+                if (parent_ptr->special == ConstValSpecialUndef) {
-                abs_offset = 0;
+                    array_val = nullptr;
+                    abs_offset = 0;
+                    rel_end = SIZE_MAX;
+                    ptr_is_undef = true;
+                } else {
+                    array_val = const_ptr_pointee(ira, ira->codegen, parent_ptr, instruction->base.source_node);
+                    if (array_val == nullptr)
+                        return ira->codegen->invalid_instruction;
+                    rel_end = child_array_type->data.array.len;
+                    abs_offset = 0;
+                }
             } else {
                 array_val = const_ptr_pointee(ira, ira->codegen, &ptr_ptr->value, instruction->base.source_node);
                 if (array_val == nullptr)

test/compile_errors.zig+22

...	@@ -2,6 +2,28 @@ const tests = @import("tests.zig");	...	@@ -2,6 +2,28 @@ const tests = @import("tests.zig");
2	const builtin = @import("builtin");	2	const builtin = @import("builtin");
3		3
4	pub fn addCases(cases: *tests.CompileErrorContext) void {	4	pub fn addCases(cases: *tests.CompileErrorContext) void {
		5	cases.add(
		6	"slicing of global undefined pointer",
		7	\\var buf: *[1]u8 = undefined;
		8	\\export fn entry() void {
		9	\\ _ = buf[0..1];
		10	\\}
		11	,
		12	"tmp.zig:3:12: error: non-zero length slice of undefined pointer",
		13	);
		14
		15	cases.add(
		16	"using invalid types in function call raises an error",
		17	\\const MenuEffect = enum {};
		18	\\fn func(effect: MenuEffect) void {}
		19	\\export fn entry() void {
		20	\\ func(MenuEffect.ThisDoesNotExist);
		21	\\}
		22	,
		23	"tmp.zig:1:20: error: enums must have 1 or more fields",
		24	"tmp.zig:4:20: note: referenced here",
		25	);
		26
5	cases.add(	27	cases.add(
6	"using an unknown len ptr type instead of array",	28	"using an unknown len ptr type instead of array",
7	\\const resolutions = [][]const u8{	29	\\const resolutions = [][]const u8{

test/stage1/behavior/atomics.zig+7

...	@@ -100,3 +100,10 @@ test "cmpxchg with ignored result" {	...	@@ -100,3 +100,10 @@ test "cmpxchg with ignored result" {
100		100
101	expectEqual(i32(5678), x);	101	expectEqual(i32(5678), x);
102	}	102	}
		103
		104	var a_global_variable = u32(1234);
		105
		106	test "cmpxchg on a global variable" {
		107	_ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .Acquire, .Monotonic);
		108	expectEqual(u32(42), a_global_variable);
		109	}