authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2019-11-25 23:12:55-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2019-11-25 23:12:55-05:00
logf96d818770fa8264b7b87e55ef7e01ff5df44c77
tree97b2cd81f4079eedbb67b5d5987a274add5ce470
parentc0cb6767451441fcc9cd3dc4fee3b4794c8b0646
parentd20df7df09ab5352ced84505e79e3a5b50bbeab4
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #3776 from mikdusan/stage1-intern-housekeeping

stage1: fix bad intern counting

1 files changed, 0 insertions(+), 15 deletions(-)

src/ir.cpp-15
...@@ -1230,9 +1230,6 @@ static IrInstruction *ir_build_return(IrBuilder *irb, Scope *scope, AstNode *sou...@@ -1230,9 +1230,6 @@ static IrInstruction *ir_build_return(IrBuilder *irb, Scope *scope, AstNode *sou
1230}1230}
12311231
1232static IrInstruction *ir_build_const_void(IrBuilder *irb, Scope *scope, AstNode *source_node) {1232static IrInstruction *ir_build_const_void(IrBuilder *irb, Scope *scope, AstNode *source_node) {
1233#ifdef ZIG_ENABLE_MEM_PROFILE
1234 memprof_intern_count.x_void += 1;
1235#endif
1236 IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);1233 IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);
1237 ir_instruction_append(irb->current_basic_block, &const_instruction->base);1234 ir_instruction_append(irb->current_basic_block, &const_instruction->base);
1238 const_instruction->base.value = irb->codegen->intern.for_void();1235 const_instruction->base.value = irb->codegen->intern.for_void();
...@@ -1240,9 +1237,6 @@ static IrInstruction *ir_build_const_void(IrBuilder *irb, Scope *scope, AstNode...@@ -1240,9 +1237,6 @@ static IrInstruction *ir_build_const_void(IrBuilder *irb, Scope *scope, AstNode
1240}1237}
12411238
1242static IrInstruction *ir_build_const_undefined(IrBuilder *irb, Scope *scope, AstNode *source_node) {1239static IrInstruction *ir_build_const_undefined(IrBuilder *irb, Scope *scope, AstNode *source_node) {
1243#ifdef ZIG_ENABLE_MEM_PROFILE
1244 memprof_intern_count.x_undefined += 1;
1245#endif
1246 IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);1240 IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);
1247 ir_instruction_append(irb->current_basic_block, &const_instruction->base);1241 ir_instruction_append(irb->current_basic_block, &const_instruction->base);
1248 const_instruction->base.value = irb->codegen->intern.for_undefined();1242 const_instruction->base.value = irb->codegen->intern.for_undefined();
...@@ -1274,9 +1268,6 @@ static IrInstruction *ir_build_const_bigfloat(IrBuilder *irb, Scope *scope, AstN...@@ -1274,9 +1268,6 @@ static IrInstruction *ir_build_const_bigfloat(IrBuilder *irb, Scope *scope, AstN
1274}1268}
12751269
1276static IrInstruction *ir_build_const_null(IrBuilder *irb, Scope *scope, AstNode *source_node) {1270static IrInstruction *ir_build_const_null(IrBuilder *irb, Scope *scope, AstNode *source_node) {
1277#ifdef ZIG_ENABLE_MEM_PROFILE
1278 memprof_intern_count.x_null += 1;
1279#endif
1280 IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);1271 IrInstructionConst *const_instruction = ir_create_instruction_noval<IrInstructionConst>(irb, scope, source_node);
1281 ir_instruction_append(irb->current_basic_block, &const_instruction->base);1272 ir_instruction_append(irb->current_basic_block, &const_instruction->base);
1282 const_instruction->base.value = irb->codegen->intern.for_null();1273 const_instruction->base.value = irb->codegen->intern.for_null();
...@@ -11460,18 +11451,12 @@ static IrInstruction *ir_const_undef(IrAnalyze *ira, IrInstruction *source_instr...@@ -11460,18 +11451,12 @@ static IrInstruction *ir_const_undef(IrAnalyze *ira, IrInstruction *source_instr
11460}11451}
1146111452
11462static IrInstruction *ir_const_unreachable(IrAnalyze *ira, IrInstruction *source_instruction) {11453static IrInstruction *ir_const_unreachable(IrAnalyze *ira, IrInstruction *source_instruction) {
11463#ifdef ZIG_ENABLE_MEM_PROFILE
11464 memprof_intern_count.x_unreachable += 1;
11465#endif
11466 IrInstruction *result = ir_const_noval(ira, source_instruction);11454 IrInstruction *result = ir_const_noval(ira, source_instruction);
11467 result->value = ira->codegen->intern.for_unreachable();11455 result->value = ira->codegen->intern.for_unreachable();
11468 return result;11456 return result;
11469}11457}
1147011458
11471static IrInstruction *ir_const_void(IrAnalyze *ira, IrInstruction *source_instruction) {11459static IrInstruction *ir_const_void(IrAnalyze *ira, IrInstruction *source_instruction) {
11472#ifdef ZIG_ENABLE_MEM_PROFILE
11473 memprof_intern_count.x_void += 1;
11474#endif
11475 IrInstruction *result = ir_const_noval(ira, source_instruction);11460 IrInstruction *result = ir_const_noval(ira, source_instruction);
11476 result->value = ira->codegen->intern.for_void();11461 result->value = ira->codegen->intern.for_void();
11477 return result;11462 return result;