Patchwork Go patch commited: Don't export embedded builtins

login
register
mail settings
Submitter Ian Taylor
Date Aug. 23, 2013, 9:04 p.m.
Message ID <mcrbo4o86fb.fsf@iant-glaptop.roam.corp.google.com>
Download mbox | patch
Permalink /patch/269561/
State New
Headers show

Comments

Ian Taylor - Aug. 23, 2013, 9:04 p.m.
This patch from Chris Manghane fixes a bug in the type reflection
information for a struct with an anonymous field of a builtin type.
Bootstrapped and ran Go testsuite on x86_64-unknown-linux-gnu.
Committed to mainline and 4.8 branch.

Ian

Patch

diff -r ea33e34cb12d go/types.cc
--- a/go/types.cc	Thu Aug 22 18:07:47 2013 -0700
+++ b/go/types.cc	Fri Aug 23 13:59:24 2013 -0700
@@ -4221,6 +4221,22 @@ 
     }
 }
 
+// Return whether this field is an embedded built-in type.
+
+bool
+Struct_field::is_embedded_builtin(Gogo* gogo) const
+{
+  const std::string& name(this->field_name());
+  // We know that a field is an embedded type if it is anonymous.
+  // We can decide if it is a built-in type by checking to see if it is
+  // registered globally under the field's name.
+  // This allows us to distinguish between embedded built-in types and
+  // embedded types that are aliases to built-in types.
+  return (this->is_anonymous()
+          && !Gogo::is_hidden_name(name)
+          && gogo->lookup_global(name.c_str()) != NULL);
+}
+
 // Class Struct_type.
 
 // A hash table used to find identical unnamed structs so that they
@@ -4835,11 +4851,16 @@ 
 
       ++q;
       go_assert(q->is_field_name("pkgPath"));
-      if (!Gogo::is_hidden_name(pf->field_name()))
-	fvals->push_back(Expression::make_nil(bloc));
+      bool is_embedded_builtin = pf->is_embedded_builtin(gogo);
+      if (!Gogo::is_hidden_name(pf->field_name()) && !is_embedded_builtin)
+        fvals->push_back(Expression::make_nil(bloc));
       else
 	{
-	  std::string n = Gogo::hidden_name_pkgpath(pf->field_name());
+	  std::string n;
+          if (is_embedded_builtin)
+            n = gogo->package_name();
+          else
+            n = Gogo::hidden_name_pkgpath(pf->field_name());
 	  Expression* s = Expression::make_string(n, bloc);
 	  fvals->push_back(Expression::make_unary(OPERATOR_AND, s, bloc));
 	}
diff -r ea33e34cb12d go/types.h
--- a/go/types.h	Thu Aug 22 18:07:47 2013 -0700
+++ b/go/types.h	Fri Aug 23 13:59:24 2013 -0700
@@ -1926,6 +1926,10 @@ 
   bool
   is_field_name(const std::string& name) const;
 
+  // Return whether this struct field is an embedded built-in type.
+  bool
+  is_embedded_builtin(Gogo*) const;
+
   // The field type.
   Type*
   type() const