darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-24 04:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: block-labels were NULLed after being set -_-

Browse source
This commit is contained in:
Wolfgang Bumiller 2012-04-28 11:49:52 +02:00
parent f3a9c8c362
commit 8035563a45
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ir.c
View file

@ -140,6 +140,7 @@ ir_function* ir_function_new(ir_builder* owner)
{ {
ir_function *self; ir_function *self;
self = (ir_function*)mem_a(sizeof(*self)); self = (ir_function*)mem_a(sizeof(*self));
self->name = NULL;
if (!ir_function_set_name(self, "<@unnamed>")) { if (!ir_function_set_name(self, "<@unnamed>")) {
mem_d(self); mem_d(self);
return NULL; return NULL;
@ -251,6 +252,7 @@ ir_block* ir_block_new(ir_function* owner, const char *name)
{ {
ir_block *self; ir_block *self;
self = (ir_block*)mem_a(sizeof(*self)); self = (ir_block*)mem_a(sizeof(*self));
self->label = NULL;
if (!ir_block_set_label(self, name)) { if (!ir_block_set_label(self, name)) {
mem_d(self); mem_d(self);
return NULL; return NULL;
@ -262,7 +264,6 @@ ir_block* ir_block_new(ir_function* owner, const char *name)
MEM_VECTOR_INIT(self, instr); MEM_VECTOR_INIT(self, instr);
MEM_VECTOR_INIT(self, entries); MEM_VECTOR_INIT(self, entries);
MEM_VECTOR_INIT(self, exits); MEM_VECTOR_INIT(self, exits);
self->label = NULL;
self->eid = 0; self->eid = 0;
self->is_return = false; self->is_return = false;
@ -278,7 +279,7 @@ MEM_VEC_FUNCTIONS_ALL(ir_block, ir_value*, living)
void ir_block_delete(ir_block* self) void ir_block_delete(ir_block* self)
{ {
size_t i; size_t i;
mem_d((void*)self->label); mem_d(self->label);
for (i = 0; i != self->instr_count; ++i) for (i = 0; i != self->instr_count; ++i)
ir_instr_delete(self->instr[i]); ir_instr_delete(self->instr[i]);
MEM_VECTOR_CLEAR(self, instr); MEM_VECTOR_CLEAR(self, instr);