diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-13 09:02:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-13 09:02:19 -0700 |
commit | 8a413ba7cc7a32210fc2d734c18032b718035116 (patch) | |
tree | 7d7cec3c558bb89db482863c3573cfe049f0affb /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
parent | 5167b691bbc6eccc671ef3a49c7ecaf3343c0baa (diff) | |
parent | 77917e94c70759602be0dae833e798e894999254 (diff) | |
download | scala-8a413ba7cc7a32210fc2d734c18032b718035116.tar.gz scala-8a413ba7cc7a32210fc2d734c18032b718035116.tar.bz2 scala-8a413ba7cc7a32210fc2d734c18032b718035116.zip |
Merge pull request #5846 from adriaanm/t10261-2.11
Actually retract clashing synthetic apply/unapply
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index b755ee3ebd..81299dc425 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -691,8 +691,21 @@ trait Namers extends MethodSynthesis { if (suppress) { sym setInfo ErrorType + // There are two ways in which we exclude the symbol from being added in typedStats::addSynthetics, + // because we don't know when the completer runs with respect to this loop in addSynthetics + // for (sym <- scope) + // for (tree <- context.unit.synthetics.get(sym) if shouldAdd(sym)) { + // if (!sym.initialize.hasFlag(IS_ERROR)) + // newStats += typedStat(tree) + // (1) If we're already in the loop, set the IS_ERROR flag and trigger the condition + // `sym.initialize.hasFlag(IS_ERROR)` in typedStats::addSynthetics, + // (2) Or, if we are not yet in the addSynthetics loop (and we're not going to emit an error anyway), + // we unlink the symbol from its scope. sym setFlag IS_ERROR + // For good measure. Removing it from its owner's scope and setting the IS_ERROR flag is enough to exclude it from addSynthetics + companionContext.unit.synthetics -= sym + // Don't unlink in an error situation to generate less confusing error messages. // Ideally, our error reporting would distinguish overloaded from recursive user-defined apply methods without signature, // but this would require some form of partial-completion of method signatures, so that we can @@ -702,7 +715,7 @@ trait Namers extends MethodSynthesis { // I hesitate to provide more info, because it would involve a WildCard or something for its result type, // which could upset other code paths) if (!scopePartiallyCompleted) - companionContext.scope.unlink(sym) + companionContext.scope.unlink(sym) // (2) } } } @@ -770,7 +783,7 @@ trait Namers extends MethodSynthesis { val completer = if (sym hasFlag SYNTHETIC) { if (name == nme.copy) copyMethodCompleter(tree) - else if (sym hasFlag CASE) applyUnapplyMethodCompleter(tree, context) + else if (settings.isScala212 && (sym hasFlag CASE)) applyUnapplyMethodCompleter(tree, context) else completerOf(tree) } else completerOf(tree) |