diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-05 11:37:47 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-05 12:29:47 +0200 |
| commit | d3da83f66f13d371f8bb73443fed32d5c820484d (patch) | |
| tree | 2455b1d0f737e396e800dabbaa653a42bb162005 /gcc/d/dmd/expressionsem.c | |
| parent | 9758d196f57950ea89baa5cdf6ebd7125b5056e0 (diff) | |
| download | gcc-d3da83f66f13d371f8bb73443fed32d5c820484d.zip gcc-d3da83f66f13d371f8bb73443fed32d5c820484d.tar.gz gcc-d3da83f66f13d371f8bb73443fed32d5c820484d.tar.bz2 | |
d: Merge upstream dmd 6d5bffa54
Removes an unused parameter from Condition::include(), all callers have
been updated in the front-end.
Reviewed-on: https://github.com/dlang/dmd/pull/11229
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd 6d5bffa54.
* d-builtins.cc (maybe_set_builtin_1): Update call to
Condition::include().
* decl.cc (DeclVisitor::visit(AttribDeclaration *)): Likewise.
* types.cc (layout_aggregate_members): Likewise.
Diffstat (limited to 'gcc/d/dmd/expressionsem.c')
| -rw-r--r-- | gcc/d/dmd/expressionsem.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gcc/d/dmd/expressionsem.c b/gcc/d/dmd/expressionsem.c index 048752d..cec57d4a 100644 --- a/gcc/d/dmd/expressionsem.c +++ b/gcc/d/dmd/expressionsem.c @@ -2160,9 +2160,7 @@ public: if (m <= MATCHnomatch) goto Lno; s->semantic(sc); - if (sc->sds) - s->addMember(sc, sc->sds); - else if (!sc->insert(s)) + if (!sc->insert(s)) e->error("declaration %s is already defined", s->toChars()); unSpeculative(sc, s); @@ -2194,8 +2192,6 @@ public: */ if (!tup && !sc->insert(s)) e->error("declaration %s is already defined", s->toChars()); - if (sc->sds) - s->addMember(sc, sc->sds); unSpeculative(sc, s); } |