NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ir_function_inlining: Re-add the "s/return/retval =/" functionality.

Browse source 
I ripped it out with the cloning changes yesterday, and should have
tested and noticed that there were now returns all over.
This commit is contained in:
Eric Anholt 2010-06-24 08:59:57 -07:00
parent 1b2bcf7913
commit f66ba4f357
3 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ir_function_inlining.cpp
View file

@ -91,6 +91,26 @@ do_function_inlining(exec_list *instructions)
return v.progress;
}
static void
replace_return_with_assignment(ir_instruction *ir, void *data)
{
ir_variable *retval = (ir_variable *)data;
ir_return *ret = ir->as_return();
if (ret) {
if (ret->value) {
ir_rvalue *lhs = new ir_dereference_variable(retval);
ret->insert_before(new ir_assignment(lhs, ret->value, NULL));
ret->remove();
} else {
/* un-valued return has to be the last return, or we shouldn't
* have reached here. (see can_inline()).
*/
assert(!ret->next->is_tail_sentinal());
}
}
}
ir_rvalue *
ir_call::generate_inline(ir_instruction *next_ir)
{
@ -145,8 +165,10 @@ ir_call::generate_inline(ir_instruction *next_ir)
/* Generate the inlined body of the function. */
foreach_iter(exec_list_iterator, iter, callee->body) {
ir_instruction *ir = (ir_instruction *)iter.get();
ir_instruction *new_ir = ir->clone(ht);
next_ir->insert_before(ir->clone(ht));
next_ir->insert_before(new_ir);
visit_tree(new_ir, replace_return_with_assignment, retval);
}
/* Copy back the value of any 'out' parameters from the function body