aboutsummaryrefslogtreecommitdiff
path: root/src/ir.cpp
diff options
context:
space:
mode:
authorMichael Dusan <michael.dusan@gmail.com>2019-11-25 17:18:56 -0500
committerMichael Dusan <michael.dusan@gmail.com>2019-11-25 17:18:56 -0500
commit6c89f96df1484fc5017eb484f0f8270ab4be341f (patch)
tree8c5e0e68f2d6294690903fd4c0fefbc86975a461 /src/ir.cpp
parent35d65cceb8aa4360accc0db30b2b1448159e7d26 (diff)
downloadzig-6c89f96df1484fc5017eb484f0f8270ab4be341f.tar.gz
zig-6c89f96df1484fc5017eb484f0f8270ab4be341f.zip
stage1: consolodate interning
- merge const_void_val → intern.x_void - move const_zero_byte → intern.zero_byte - wrap intern access
Diffstat (limited to 'src/ir.cpp')
-rw-r--r--src/ir.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ir.cpp b/src/ir.cpp
index f4bcfb6330..bb614982e1 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -1235,7 +1235,7 @@ static IrInstruction *ir_build_const_void(IrBuilder *irb, Scope *scope, AstNode
#endif
IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);
ir_instruction_append(irb->current_basic_block, &const_instruction->base);
- const_instruction->base.value = &irb->codegen->intern_values.x_void;
+ const_instruction->base.value = irb->codegen->intern.for_void();
return &const_instruction->base;
}
@@ -1245,7 +1245,7 @@ static IrInstruction *ir_build_const_undefined(IrBuilder *irb, Scope *scope, Ast
#endif
IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);
ir_instruction_append(irb->current_basic_block, &const_instruction->base);
- const_instruction->base.value = &irb->codegen->intern_values.x_undefined;
+ const_instruction->base.value = irb->codegen->intern.for_undefined();
return &const_instruction->base;
}
@@ -1279,7 +1279,7 @@ static IrInstruction *ir_build_const_null(IrBuilder *irb, Scope *scope, AstNode
#endif
IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);
ir_instruction_append(irb->current_basic_block, &const_instruction->base);
- const_instruction->base.value = &irb->codegen->intern_values.x_null;
+ const_instruction->base.value = irb->codegen->intern.for_null();
return &const_instruction->base;
}
@@ -11464,7 +11464,7 @@ static IrInstruction *ir_const_unreachable(IrAnalyze *ira, IrInstruction *source
memprof_intern_count.x_unreachable += 1;
#endif
IrInstruction *result = ir_const_noval(ira, source_instruction);
- result->value = &ira->codegen->intern_values.x_unreachable;
+ result->value = ira->codegen->intern.for_unreachable();
return result;
}
@@ -11473,7 +11473,7 @@ static IrInstruction *ir_const_void(IrAnalyze *ira, IrInstruction *source_instru
memprof_intern_count.x_void += 1;
#endif
IrInstruction *result = ir_const_noval(ira, source_instruction);
- result->value = &ira->codegen->intern_values.x_void;
+ result->value = ira->codegen->intern.for_void();
return result;
}
@@ -18493,7 +18493,7 @@ static IrInstruction *ir_analyze_instruction_elem_ptr(IrAnalyze *ira, IrInstruct
if (var) {
return ir_get_var_ptr(ira, &elem_ptr_instruction->base, var);
} else {
- return ir_get_const_ptr(ira, &elem_ptr_instruction->base, &ira->codegen->const_void_val,
+ return ir_get_const_ptr(ira, &elem_ptr_instruction->base, ira->codegen->intern.for_void(),
ira->codegen->builtin_types.entry_void, ConstPtrMutComptimeConst, is_const, is_volatile, 0);
}
} else if (array_type->id == ZigTypeIdVector) {
@@ -21856,7 +21856,7 @@ static Error ir_make_type_info_value(IrAnalyze *ira, IrInstruction *source_instr
case ZigTypeIdNull:
case ZigTypeIdArgTuple:
case ZigTypeIdOpaque:
- result = &ira->codegen->const_void_val;
+ result = ira->codegen->intern.for_void();
break;
case ZigTypeIdInt:
{