aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-12-26 03:02:20 -0500
committerAndrew Kelley <superjoe30@gmail.com>2016-12-26 03:02:20 -0500
commit3ef6663b723e7391edbe84d3df48fcc79c66bc1f (patch)
tree3e646a0719a362fd547f1f250fa0e82bff620a1e /src
parent110a6f39ca9cf578e014461f2e9eef2691a2368d (diff)
downloadzig-3ef6663b723e7391edbe84d3df48fcc79c66bc1f.tar.gz
zig-3ef6663b723e7391edbe84d3df48fcc79c66bc1f.zip
IR: pass genericMallocFree test
Diffstat (limited to 'src')
-rw-r--r--src/analyze.cpp2
-rw-r--r--src/ir.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp
index 49245dfcf7..c1cced1251 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -2839,7 +2839,6 @@ bool type_requires_comptime(TypeTableEntry *type_entry) {
case TypeTableEntryIdUndefLit:
case TypeTableEntryIdNullLit:
case TypeTableEntryIdMetaType:
- case TypeTableEntryIdVoid:
case TypeTableEntryIdNamespace:
case TypeTableEntryIdBlock:
case TypeTableEntryIdBoundFn:
@@ -2857,6 +2856,7 @@ bool type_requires_comptime(TypeTableEntry *type_entry) {
case TypeTableEntryIdFloat:
case TypeTableEntryIdPointer:
case TypeTableEntryIdEnumTag:
+ case TypeTableEntryIdVoid:
return false;
}
zig_unreachable();
diff --git a/src/ir.cpp b/src/ir.cpp
index 369369aecf..51a652451b 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -6350,13 +6350,13 @@ static bool ir_analyze_fn_call_inline_arg(IrAnalyze *ira, AstNode *fn_proto_node
if (casted_arg->value.type->id == TypeTableEntryIdInvalid)
return false;
- ConstExprValue *first_arg_val = ir_resolve_const(ira, casted_arg, UndefBad);
- if (!first_arg_val)
+ ConstExprValue *arg_val = ir_resolve_const(ira, casted_arg, UndefBad);
+ if (!arg_val)
return false;
Buf *param_name = param_decl_node->data.param_decl.name;
VariableTableEntry *var = add_variable(ira->codegen, param_decl_node,
- *exec_scope, param_name, true, first_arg_val);
+ *exec_scope, param_name, true, arg_val);
*exec_scope = var->child_scope;
*next_proto_i += 1;