gitback/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all compile error tests passing

Browse Source
This commit is contained in:
Andrew Kelley 2019-06-25 19:03:56 -04:00
parent 0a77325916
commit fd4c5f54f0
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ir.cpp
View File

@ -8736,7 +8736,16 @@ static ConstExprValue *ir_exec_const_result(CodeGen *codegen, IrExecutable *exec
return &codegen->invalid_instruction->value;
}
return &value->value;
} else if (ir_has_side_effects(instruction) && !instr_is_comptime(instruction)) {
} else if (ir_has_side_effects(instruction)) {
if (instr_is_comptime(instruction)) {
switch (instruction->id) {
case IrInstructionIdUnwrapErrPayload:
case IrInstructionIdUnionFieldPtr:
continue;
default:
break;
}
}
exec_add_error_node(codegen, exec, instruction->source_node,
buf_sprintf("unable to evaluate constant expression"));
return &codegen->invalid_instruction->value;
@ -14498,9 +14507,7 @@ static IrInstruction *ir_analyze_instruction_decl_var(IrAnalyze *ira,
if (type_is_invalid(result_type)) {
result_type = ira->codegen->builtin_types.entry_invalid;
} else if (result_type->id == ZigTypeIdUnreachable || result_type->id == ZigTypeIdOpaque) {
ir_add_error_node(ira, source_node,
buf_sprintf("variable of type '%s' not allowed", buf_ptr(&result_type->name)));
result_type = ira->codegen->builtin_types.entry_invalid;
zig_unreachable();
}
ConstExprValue *init_val = nullptr;
@ -15053,6 +15060,13 @@ static IrInstruction *ir_resolve_result_raw(IrAnalyze *ira, IrInstruction *suspe
case ResultLocIdVar: {
ResultLocVar *result_loc_var = reinterpret_cast<ResultLocVar *>(result_loc);
assert(result_loc->source_instruction->id == IrInstructionIdAllocaSrc);
if (value_type->id == ZigTypeIdUnreachable || value_type->id == ZigTypeIdOpaque) {
ir_add_error(ira, result_loc->source_instruction,
buf_sprintf("variable of type '%s' not allowed", buf_ptr(&value_type->name)));
return ira->codegen->invalid_instruction;
}
IrInstructionAllocaSrc *alloca_src =
reinterpret_cast<IrInstructionAllocaSrc *>(result_loc->source_instruction);
bool force_comptime;
@ -15060,6 +15074,7 @@ static IrInstruction *ir_resolve_result_raw(IrAnalyze *ira, IrInstruction *suspe
return ira->codegen->invalid_instruction;
bool is_comptime = force_comptime || (value != nullptr &&
value->value.special != ConstValSpecialRuntime && result_loc_var->var->gen_is_const);
if (alloca_src->base.child == nullptr || is_comptime) {
uint32_t align = 0;
if (alloca_src->align != nullptr && !ir_resolve_align(ira, alloca_src->align->child, &align)) {

51
test/compile_errors.zig
View File

@ -3880,7 +3880,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ return 2;
\\}
,
"tmp.zig:2:15: error: values of type 'comptime_int' must be comptime known",
"tmp.zig:5:17: error: cannot store runtime value in type 'comptime_int'",
);
cases.add(
@ -5132,7 +5132,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const array = [2]u8{1, 2, 3};
\\}
,
"tmp.zig:2:24: error: expected [2]u8 literal, found [3]u8 literal",
"tmp.zig:2:31: error: index 2 outside array of size 2",
);
cases.add(
@ -5149,36 +5149,47 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
cases.add(
"non-const variables of things that require const variables",
\\const Opaque = @OpaqueType();
\\
\\export fn entry(opaque: *Opaque) void {
\\export fn entry1() void {
\\ var m2 = &2;
\\ const y: u32 = m2.*;
\\
\\}
\\export fn entry2() void {
\\ var a = undefined;
\\}
\\export fn entry3() void {
\\ var b = 1;
\\}
\\export fn entry4() void {
\\ var c = 1.0;
\\}
\\export fn entry5() void {
\\ var d = null;
\\}
\\export fn entry6(opaque: *Opaque) void {
\\ var e = opaque.*;
\\}
\\export fn entry7() void {
\\ var f = i32;
\\}
\\export fn entry8() void {
\\ var h = (Foo {}).bar;
\\
\\}
\\export fn entry9() void {
\\ var z: noreturn = return;
\\}
\\
\\const Opaque = @OpaqueType();
\\const Foo = struct {
\\ fn bar(self: *const Foo) void {}
\\};
,
"tmp.zig:4:4: error: variable of type '*comptime_int' must be const or comptime",
"tmp.zig:7:4: error: variable of type '(undefined)' must be const or comptime",
"tmp.zig:2:4: error: variable of type '*comptime_int' must be const or comptime",
"tmp.zig:5:4: error: variable of type '(undefined)' must be const or comptime",
"tmp.zig:8:4: error: variable of type 'comptime_int' must be const or comptime",
"tmp.zig:9:4: error: variable of type 'comptime_float' must be const or comptime",
"tmp.zig:10:4: error: variable of type '(null)' must be const or comptime",
"tmp.zig:11:4: error: variable of type 'Opaque' not allowed",
"tmp.zig:12:4: error: variable of type 'type' must be const or comptime",
"tmp.zig:13:4: error: variable of type '(bound fn(*const Foo) void)' must be const or comptime",
"tmp.zig:15:4: error: unreachable code",
"tmp.zig:11:4: error: variable of type 'comptime_float' must be const or comptime",
"tmp.zig:14:4: error: variable of type '(null)' must be const or comptime",
"tmp.zig:17:4: error: variable of type 'Opaque' not allowed",
"tmp.zig:20:4: error: variable of type 'type' must be const or comptime",
"tmp.zig:23:4: error: variable of type '(bound fn(*const Foo) void)' must be const or comptime",
"tmp.zig:26:4: error: unreachable code",
);
cases.add(
@ -5324,7 +5335,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ }
\\}
,
"tmp.zig:37:16: error: cannot store runtime value in compile time variable",
"tmp.zig:37:29: error: cannot store runtime value in compile time variable",
);
cases.add(
@ -5948,7 +5959,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const foo = Foo { .Bar = x, .Baz = u8 };
\\}
,
"tmp.zig:7:30: error: unable to evaluate constant expression",
"tmp.zig:7:23: error: unable to evaluate constant expression",
);
cases.add(
@ -5962,7 +5973,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
\\ const foo = Foo { .Bar = x };
\\}
,
"tmp.zig:7:30: error: unable to evaluate constant expression",
"tmp.zig:7:23: error: unable to evaluate constant expression",
);
cases.addTest(