From 9eb3a1d30b85f2ec0e94b5ea4e1539be82ac51c2 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 24 Jan 2014 01:01:47 +0000
Subject: [PATCH] compiler: Convert named types before flattening.

From-SVN: r207018
---
 gcc/go/gofrontend/go.cc        | 3 +++
 gcc/go/gofrontend/gogo-tree.cc | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcc/go/gofrontend/go.cc b/gcc/go/gofrontend/go.cc
index 26e83a1db64f..ac772a095f74 100644
--- a/gcc/go/gofrontend/go.cc
+++ b/gcc/go/gofrontend/go.cc
@@ -119,6 +119,9 @@ go_parse_input_files(const char** filenames, unsigned int filename_count,
   // Use temporary variables to force order of evaluation.
   ::gogo->order_evaluations();
 
+  // Convert named types to backend representation.
+  ::gogo->convert_named_types();
+
   // Flatten the parse tree.
   ::gogo->flatten();
 
diff --git a/gcc/go/gofrontend/gogo-tree.cc b/gcc/go/gofrontend/gogo-tree.cc
index b04e660a92d6..1950090b9e05 100644
--- a/gcc/go/gofrontend/gogo-tree.cc
+++ b/gcc/go/gofrontend/gogo-tree.cc
@@ -755,7 +755,6 @@ sort_var_inits(Gogo* gogo, Var_inits* var_inits)
 void
 Gogo::write_globals()
 {
-  this->convert_named_types();
   this->build_interface_method_tables();
 
   Bindings* bindings = this->current_bindings();
-- 
2.47.3