commit be5fa26b2b1b5d0755bc1c7ce25f3aa26bea9d9c
author Than McIntosh <thanm@google.com> Tue Jun 13 08:08:28 2017 -0400
committer Ian Lance Taylor <iant@golang.org> Tue Jun 13 14:25:12 2017 +0000
tree 2af05cd31e6395d1d2f5ed209e16bdf8d812222a
parent c4ecdd3edb9febe72b5527481ae3d7310105ca67

compiler: containing small bfunction mixup in Gogo::write_globals

Fix buglet in Gogo::write_globals-- in a couple of places the
wrong Bfunction was being used for the containing (not target)
function when creating calls for init functions.

Change-Id: I45176d593b7672b4bf4a5e96730c0b90bf2e980e
Reviewed-on: https://go-review.googlesource.com/45510
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

go/gogo.cc

diff --git a/go/gogo.cc b/go/gogo.cc
index 9071bc8..a9d72ff 100644
--- a/go/gogo.cc
+++ b/go/gogo.cc
@@ -1504,10 +1504,10 @@
       Bfunction* initfn = func->get_or_make_decl(this, *p);
       Bexpression* func_code =
           this->backend()->function_code_expression(initfn, func_loc);
-      Bexpression* call = this->backend()->call_expression(initfn, func_code,
+      Bexpression* call = this->backend()->call_expression(init_bfn, func_code,
                                                            empty_args,
 							   NULL, func_loc);
-      Bstatement* ist = this->backend()->expression_statement(initfn, call);
+      Bstatement* ist = this->backend()->expression_statement(init_bfn, call);
       init_stmts.push_back(ist);
     }