From e29a5859891eb9e1587396dea0e8010f7d88f68c Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 31 Mar 2010 17:54:26 -0700 Subject: [PATCH] Use ir_variable::clone to copy parameters to the function body Several other code movements were also done. This partitions this function into two halves. The first half processes the prototype part, and the second have processes the actual function definition. The coming patch series will parition ast_function_definition::hir into (at least) two separate functions. --- ast_to_hir.cpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index 627d932..6d78383 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -1544,32 +1544,29 @@ ast_function_definition::hir(exec_list *instructions, } } + parameters.move_nodes_to(& signature->parameters); + assert(state->current_function == NULL); state->current_function = signature; - ast_function_parameters_to_hir(& this->prototype->parameters, - & signature->parameters, - state); - label = new ir_label(name); if (signature->definition == NULL) { signature->definition = label; } instructions->push_tail(label); - /* Add the function parameters to the symbol table. During this step the - * parameter declarations are also moved from the temporary "parameters" list - * to the instruction list. There are other more efficient ways to do this, - * but they involve ugly linked-list gymnastics. + /* Duplicate parameters declared in the prototype as concrete variables. + * Add these to the symbol table. */ state->symbols->push_scope(); - foreach_iter(exec_list_iterator, iter, parameters) { - ir_variable *const var = ((ir_instruction *) iter.get())->as_variable(); + foreach_iter(exec_list_iterator, iter, signature->parameters) { + ir_variable *const proto = ((ir_instruction *) iter.get())->as_variable(); + + assert(proto != NULL); - assert(var != NULL); + ir_variable *const var = proto->clone(); - iter.remove(); instructions->push_tail(var); /* The only way a parameter would "exist" is if two parameters have -- 2.7.4