v = ir_builder_create_field(ir, self->name, self->expression.next->expression.vtype);
if (!v)
return false;
+ v->context = ast_ctx(self);
if (self->isconst) {
asterror(ast_ctx(self), "TODO: constant field pointers with value\n");
goto error;
asterror(ast_ctx(self), "ir_builder_create_global failed\n");
return false;
}
+ v->context = ast_ctx(self);
if (self->isconst) {
switch (self->expression.vtype)
v = ir_function_create_local(func, self->name, self->expression.vtype, param);
if (!v)
return false;
+ v->context = ast_ctx(self);
/* A constant local... hmmm...
* I suppose the IR will have to deal with this
/* TODO: check return types */
if (!self->curblock->is_return)
{
+ return ir_block_create_return(self->curblock, NULL);
+ /* From now on the parser has to handle this situation */
+#if 0
if (!self->vtype->expression.next ||
self->vtype->expression.next->expression.vtype == TYPE_VOID)
{
asterror(ast_ctx(self), "function `%s` missing return value", self->name);
return false;
}
+#endif
}
return true;
}
ir_block *cond = func->curblock;
ir_block *ontrue;
ir_block *onfalse;
+ ir_block *ontrue_endblock;
+ ir_block *onfalse_endblock;
ir_block *merge;
/* We don't output any value, thus also don't care about r/lvalue */
cgen = self->on_true->expression.codegen;
if (!(*cgen)((ast_expression*)(self->on_true), func, false, &dummy))
return false;
+
+ /* we now need to work from the current endpoint */
+ ontrue_endblock = func->curblock;
} else
ontrue = NULL;
cgen = self->on_false->expression.codegen;
if (!(*cgen)((ast_expression*)(self->on_false), func, false, &dummy))
return false;
+
+ /* we now need to work from the current endpoint */
+ onfalse_endblock = func->curblock;
} else
onfalse = NULL;
return false;
/* add jumps ot the merge block */
- if (ontrue && !ontrue->final && !ir_block_create_jump(ontrue, merge))
+ if (ontrue && !ontrue_endblock->final && !ir_block_create_jump(ontrue_endblock, merge))
return false;
- if (onfalse && !onfalse->final && !ir_block_create_jump(onfalse, merge))
+ if (onfalse && !onfalse_endblock->final && !ir_block_create_jump(onfalse_endblock, merge))
return false;
/* we create the if here, that way all blocks are ordered :)