diff options
Diffstat (limited to 'gcc/d')
| -rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/dmodule.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index 9949925..e100264 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -bbc5ea66ab41ebd14abd9a0fbb9ca6ef6b2dcb14 +78dc311524341a76008b341ff6427e5a16e285db The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/gcc/d/dmd/dmodule.c b/gcc/d/dmd/dmodule.c index 1f6fd9f..bf1c0c1 100644 --- a/gcc/d/dmd/dmodule.c +++ b/gcc/d/dmd/dmodule.c @@ -679,7 +679,8 @@ void Module::importAll(Scope *) // If it isn't there, some compiler rewrites, like // classinst == classinst -> .object.opEquals(classinst, classinst) // would fail inside object.d. - if (members->dim == 0 || ((*members)[0])->ident != Id::object) + if (members->dim == 0 || ((*members)[0])->ident != Id::object || + (*members)[0]->isImport() == NULL) { Import *im = new Import(Loc(), NULL, Id::object, NULL, 0); members->shift(im); |