From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sat, 1 May 2010 07:31:35 +0000 (-0700)
Subject: Fix ir_return cloning to actually use the cloned subexpression.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=05ddebac0a45bf07fa60b04b22f29234ca26a4a4;p=mesa.git

Fix ir_return cloning to actually use the cloned subexpression.

This caused a nasty bug where the function inliner would create new
variables for each of the formal parameters, but the body would still
reference the old copies.

This was highly visible since the dead code eliminator (rightly) removed
the new declarations, leading to printed IR that referenced non-existent
variable names.
---

diff --git a/ir_function_inlining.cpp b/ir_function_inlining.cpp
index c623cd010b6..0d072c1b764 100644
--- a/ir_function_inlining.cpp
+++ b/ir_function_inlining.cpp
@@ -264,8 +264,7 @@ ir_function_cloning_visitor::visit(ir_return *ir)
    rval = this->result->as_rvalue();
    assert(rval);
 
-   result = new ir_assignment(new ir_dereference(this->retval),
-			      ir->get_value(), NULL);
+   result = new ir_assignment(new ir_dereference(this->retval), rval, NULL);
 }