aboutsummaryrefslogtreecommitdiff
path: root/src/ir.cpp
diff options
context:
space:
mode:
authorAlexandros Naskos <alex_naskos@hotmail.com>2020-02-28 02:43:33 +0200
committerAlexandros Naskos <alex_naskos@hotmail.com>2020-02-28 02:43:33 +0200
commitc020bc27ac8a8b18fe46c59f0dfb969b032fb303 (patch)
treeac16110b8fe4965d7619d813aa06ce3521585bf5 /src/ir.cpp
parent95a1d2feb496d64094d81c9477465cafc73ce49b (diff)
downloadzig-c020bc27ac8a8b18fe46c59f0dfb969b032fb303.tar.gz
zig-c020bc27ac8a8b18fe46c59f0dfb969b032fb303.zip
More fixes, removed debug prints
Diffstat (limited to 'src/ir.cpp')
-rw-r--r--src/ir.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/ir.cpp b/src/ir.cpp
index 28497b7c8a..de81a87657 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -17037,15 +17037,6 @@ static IrInstGen *ir_analyze_tuple_cat(IrAnalyze *ira, IrInst* source_instr,
}
}
IrInstGen *result = ir_get_deref(ira, source_instr, new_struct_ptr, nullptr);
- if (instr_is_comptime(result))
- return result;
-
- if (is_comptime) {
- ir_add_error(ira, &first_non_const_instruction->base,
- buf_sprintf("unable to evaluate constant expression"));
- return ira->codegen->invalid_inst_gen;
- }
-
return result;
}
@@ -18906,10 +18897,7 @@ static IrInstGen *ir_analyze_store_ptr(IrAnalyze *ira, IrInst* source_instr,
}
if (ptr->value->type->data.pointer.is_const && !allow_write_through_const) {
- // @TODO
- fprintf(stderr, "store ptr\n");
- ptr->src();
- ir_add_error(ira, source_instr, buf_sprintf("cannot assign to constant [FOO]"));
+ ir_add_error(ira, source_instr, buf_sprintf("cannot assign to constant"));
return ira->codegen->invalid_inst_gen;
}
@@ -23050,7 +23038,7 @@ static IrInstGen *ir_analyze_instruction_container_init_list(IrAnalyze *ira,
const_ptrs.deinit();
IrInstGen *result = ir_get_deref(ira, &instruction->base.base, result_loc, nullptr);
- // If the result is a tuple, we are allowed to use ConstValSpecialRuntime fields.
+ // If the result is a tuple, we are allowed to return a struct that uses ConstValSpecialRuntime fields at comptime.
if (instr_is_comptime(result) || is_tuple(container_type))
return result;