aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2017-08-29 17:10:11 -0400
committerAndrew Kelley <superjoe30@gmail.com>2017-08-29 17:10:11 -0400
commit910a96f0468c635a135d9fccd39f139ba0775ef9 (patch)
tree7a8873846ea70892414e79585e5c64f3a0ccfa67
parent816689a3b1c98ec008438e7f868e1a123889b2a7 (diff)
downloadzig-910a96f0468c635a135d9fccd39f139ba0775ef9.tar.gz
zig-910a96f0468c635a135d9fccd39f139ba0775ef9.zip
fix tests
-rw-r--r--src/ir.cpp1
-rw-r--r--test/compile_errors.zig2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ir.cpp b/src/ir.cpp
index f7f097e99d..251c597224 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -10825,6 +10825,7 @@ static TypeTableEntry *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstruc
if (array_type->data.array.len == 0) {
ir_add_error_node(ira, elem_ptr_instruction->base.source_node,
buf_sprintf("index 0 outside array of size 0"));
+ return ira->codegen->builtin_types.entry_invalid;
}
TypeTableEntry *child_type = array_type->data.array.child_type;
if (ptr_type->data.pointer.unaligned_bit_count == 0) {
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index 96898d1744..21575bfc34 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -2014,7 +2014,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
cases.add("increase pointer alignment in @ptrCast",
\\export fn entry() -> u32 {
- \\ var bytes: [4]u8 align 4 = []u8{0x01, 0x02, 0x03, 0x04};
+ \\ var bytes: [4]u8 = []u8{0x01, 0x02, 0x03, 0x04};
\\ const ptr = @ptrCast(&u32, &bytes[0]);
\\ return *ptr;
\\}