diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-03-07 21:29:46 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-03-07 21:29:46 +0000 |
| commit | b4ed59860a2fa536620e9b0b7bb6b3851fd6911c (patch) | |
| tree | 35f359d82c120ce4e5fae4a38d261de5e0ae73ed /gcc/go | |
| parent | 6481a43b012d6ab105b8fbc13a4673041ee20778 (diff) | |
| download | gcc-b4ed59860a2fa536620e9b0b7bb6b3851fd6911c.zip gcc-b4ed59860a2fa536620e9b0b7bb6b3851fd6911c.tar.gz gcc-b4ed59860a2fa536620e9b0b7bb6b3851fd6911c.tar.bz2 | |
Fix second import of package using _.
From-SVN: r170755
Diffstat (limited to 'gcc/go')
| -rw-r--r-- | gcc/go/gofrontend/gogo.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc index 5237049..69ad398 100644 --- a/gcc/go/gofrontend/gogo.cc +++ b/gcc/go/gofrontend/gogo.cc @@ -308,12 +308,7 @@ Gogo::import_package(const std::string& filename, ln = package->name(); is_ln_exported = Lex::is_exported_name(ln); } - if (ln != ".") - { - ln = this->pack_hidden_name(ln, is_ln_exported); - this->package_->bindings()->add_package(ln, package); - } - else + if (ln == ".") { Bindings* bindings = package->bindings(); for (Bindings::const_declarations_iterator p = @@ -322,6 +317,13 @@ Gogo::import_package(const std::string& filename, ++p) this->add_named_object(p->second); } + else if (ln == "_") + package->set_uses_sink_alias(); + else + { + ln = this->pack_hidden_name(ln, is_ln_exported); + this->package_->bindings()->add_package(ln, package); + } return; } |