Commit 73a751911e2c2be646287eb8c8d579dded25afe3 | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-12-26 03:16:19-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-12-26 03:16:19-05:00
log	73a751911e2c2be646287eb8c8d579dded25afe3
tree	77d14408a8eb895878baa9678ee714dfa03497b7
parent	6ed835ca67670098da79d4e329c6efcb12419599

IR: pass staticEvalListInit test

3 files changed, 41 insertions(+), 16 deletions(-)

src
- codegen.cpp
test
- cases
  - eval.zig
- self_hosted.zig

src/codegen.cpp+26-2

...	...	@@ -2181,6 +2181,30 @@ static LLVMValueRef ir_render_struct_init(CodeGen g, IrExecutable executable,
2181	2181	return instruction->tmp_ptr;
2182	2182	}
2183	2183
	2184	static LLVMValueRef ir_render_container_init_list(CodeGen g, IrExecutable executable,
	2185	IrInstructionContainerInitList *instruction)
	2186	{
	2187	TypeTableEntry *array_type = instruction->base.value.type;
	2188	assert(array_type->id == TypeTableEntryIdArray);
	2189	LLVMValueRef tmp_array_ptr = instruction->tmp_ptr;
	2190	assert(tmp_array_ptr);
	2191
	2192	size_t field_count = instruction->item_count;
	2193
	2194	TypeTableEntry *child_type = array_type->data.array.child_type;
	2195	for (size_t i = 0; i < field_count; i += 1) {
	2196	LLVMValueRef elem_val = ir_llvm_value(g, instruction->items[i]);
	2197	LLVMValueRef indices[] = {
	2198	LLVMConstNull(g->builtin_types.entry_usize->type_ref),
	2199	LLVMConstInt(g->builtin_types.entry_usize->type_ref, i, false),
	2200	};
	2201	LLVMValueRef elem_ptr = LLVMBuildInBoundsGEP(g->builder, tmp_array_ptr, indices, 2, "");
	2202	gen_assign_raw(g, elem_ptr, elem_val, child_type);
	2203	}
	2204
	2205	return tmp_array_ptr;
	2206	}
	2207
2184	2208	static void set_debug_location(CodeGen g, IrInstruction instruction) {
2185	2209	AstNode *source_node = instruction->source_node;
2186	2210	Scope *scope = instruction->scope;
...	...	@@ -2323,10 +2347,10 @@ static LLVMValueRef ir_render_instruction(CodeGen g, IrExecutable executable,
2323	2347	return ir_render_pointer_reinterpret(g, executable, (IrInstructionPointerReinterpret *)instruction);
2324	2348	case IrInstructionIdWidenOrShorten:
2325	2349	return ir_render_widen_or_shorten(g, executable, (IrInstructionWidenOrShorten *)instruction);
	2350	case IrInstructionIdContainerInitList:
	2351	return ir_render_container_init_list(g, executable, (IrInstructionContainerInitList *)instruction);
2326	2352	case IrInstructionIdSwitchVar:
2327	2353	zig_panic("TODO render switch var instruction to LLVM");
2328		case IrInstructionIdContainerInitList:
2329		zig_panic("TODO render container init list instruction to LLVM");
2330	2354	}
2331	2355	zig_unreachable();
2332	2356	}

test/cases/eval.zig+15

...	...	@@ -94,6 +94,21 @@ fn makePoint(x: i32, y: i32) -> Point {
94	94	}
95	95
96	96
	97	fn staticEvalListInit() {
	98	@setFnTest(this);
	99
	100	assert(static_vec3.data[2] == 1.0);
	101	assert(vec3(0.0, 0.0, 3.0).data[2] == 3.0);
	102	}
	103	const static_vec3 = vec3(0.0, 0.0, 1.0);
	104	pub const Vec3 = struct {
	105	data: [3]f32,
	106	};
	107	pub fn vec3(x: f32, y: f32, z: f32) -> Vec3 {
	108	Vec3 {
	109	.data = []f32 { x, y, z, },
	110	}
	111	}
97	112
98	113	// TODO const assert = @import("std").debug.assert;
99	114	fn assert(ok: bool) {

test/self_hosted.zig-14

...	...	@@ -4,20 +4,6 @@ const str = std.str;
4	4	const cstr = std.cstr;
5	5
6	6
7		fn staticEvalListInit() {
8		@setFnTest(this);
9
10		assert(static_vec3.data[2] == 1.0);
11		}
12		const static_vec3 = vec3(0.0, 0.0, 1.0);
13		pub const Vec3 = struct {
14		data: [3]f32,
15		};
16		pub fn vec3(x: f32, y: f32, z: f32) -> Vec3 {
17		Vec3 {
18		.data = []f32 { x, y, z, },
19		}
20		}
21	7
22	8	fn genericFnWithImplicitCast() {
23	9	@setFnTest(this, true);