mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-23 09:40:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

compiler: fix import of indirectly imported type alias

Browse Source 
We were looking for the " = " before the optional package name that
    appears for an indirect reference, but the exporter was putting it
    after.
    
    Test is https://golang.org/cl/70290.
    
    Reviewed-on: https://go-review.googlesource.com/70330

From-SVN: r253694
This commit is contained in:
Ian Lance Taylor 2017-10-12 19:01:50 +00:00
parent d89dac3602
commit 1baafc8d19
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -1,4 +1,4 @@
af46ad16dc34773877068393d331ac8ae34b2219
44132970e4b6c1186036bf8eda8982fb6e905d6f
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

14
gcc/go/gofrontend/import.cc
View File

@ -756,13 +756,6 @@ Import::read_type()
this->require_c_string(" ");
bool is_alias = false;
if (this->match_c_string("= "))
{
stream->advance(2);
is_alias = true;
}
// The package name may follow. This is the name of the package in
// the package clause of that package. The type name will include
// the pkgpath, which may be different.
@ -775,6 +768,13 @@ Import::read_type()
this->require_c_string(" ");
}
bool is_alias = false;
if (this->match_c_string("= "))
{
stream->advance(2);
is_alias = true;
}
// Declare the type in the appropriate package. If we haven't seen
// it before, mark it as invisible. We declare it before we read
// the actual definition of the type, since the definition may refer