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

fix extraneous nested union field instruction

Browse Source
This commit is contained in:
Andrew Kelley 2019-06-19 16:16:47 -04:00
parent e36680d3bd
commit 974db231a0
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/codegen.cpp
View File

@ -3853,6 +3853,9 @@ static LLVMValueRef ir_render_struct_field_ptr(CodeGen *g, IrExecutable *executa
static LLVMValueRef ir_render_union_field_ptr(CodeGen *g, IrExecutable *executable,
IrInstructionUnionFieldPtr *instruction)
{
if (instruction->base.value.special != ConstValSpecialRuntime)
return nullptr;
ZigType *union_ptr_type = instruction->union_ptr->value.type;
assert(union_ptr_type->id == ZigTypeIdPointer);
ZigType *union_type = union_ptr_type->data.pointer.child_type;
@ -4077,6 +4080,9 @@ static LLVMValueRef ir_render_test_non_null(CodeGen *g, IrExecutable *executable
static LLVMValueRef ir_render_optional_unwrap_ptr(CodeGen *g, IrExecutable *executable,
IrInstructionOptionalUnwrapPtr *instruction)
{
if (instruction->base.value.special != ConstValSpecialRuntime)
return nullptr;
ZigType *ptr_type = instruction->base_ptr->value.type;
assert(ptr_type->id == ZigTypeIdPointer);
ZigType *maybe_type = ptr_type->data.pointer.child_type;
@ -5750,7 +5756,6 @@ static void ir_render(CodeGen *g, ZigFn *fn_entry) {
assert(executable->basic_block_list.length > 0);
for (size_t block_i = 0; block_i < executable->basic_block_list.length; block_i += 1) {
IrBasicBlock *current_block = executable->basic_block_list.at(block_i);
//assert(current_block->ref_count > 0);
assert(current_block->llvm_block);
LLVMPositionBuilderAtEnd(g->builder, current_block->llvm_block);
for (size_t instr_i = 0; instr_i < current_block->instruction_list.length; instr_i += 1) {

2
test/stage1/behavior.zig
View File

@ -45,7 +45,7 @@ comptime {
//_ = @import("behavior/coroutine_await_struct.zig");
//_ = @import("behavior/coroutines.zig");
_ = @import("behavior/defer.zig");
_ = @import("behavior/enum.zig"); // TODO
_ = @import("behavior/enum.zig");
_ = @import("behavior/enum_with_members.zig");
_ = @import("behavior/error.zig"); // TODO
_ = @import("behavior/eval.zig");

32
test/stage1/behavior/enum.zig
View File

@ -1,22 +1,22 @@
const expect = @import("std").testing.expect;
const mem = @import("std").mem;
//test "enum type" {
// const foo1 = Foo{ .One = 13 };
// const foo2 = Foo{
// .Two = Point{
// .x = 1234,
// .y = 5678,
// },
// };
// const bar = Bar.B;
//
// expect(bar == Bar.B);
// expect(@memberCount(Foo) == 3);
// expect(@memberCount(Bar) == 4);
// expect(@sizeOf(Foo) == @sizeOf(FooNoVoid));
// expect(@sizeOf(Bar) == 1);
//}
test "enum type" {
const foo1 = Foo{ .One = 13 };
const foo2 = Foo{
.Two = Point{
.x = 1234,
.y = 5678,
},
};
const bar = Bar.B;
expect(bar == Bar.B);
expect(@memberCount(Foo) == 3);
expect(@memberCount(Bar) == 4);
expect(@sizeOf(Foo) == @sizeOf(FooNoVoid));
expect(@sizeOf(Bar) == 1);
}
test "enum as return value" {
switch (returnAnInt(13)) {