diff options
| author | François Garillot <francois@garillot.net> | 2013-12-19 15:27:01 +0100 |
|---|---|---|
| committer | François Garillot <francois@garillot.net> | 2014-01-16 11:42:44 +0100 |
| commit | 94e05a85013df444badef0c8b00503d71408ed08 (patch) | |
| tree | 01205dda04af632319cd9bc8a53245def486b867 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 6dd3653b9c443170492eba63be542440496d0432 (diff) | |
| download | scala-94e05a85013df444badef0c8b00503d71408ed08.tar.gz scala-94e05a85013df444badef0c8b00503d71408ed08.tar.bz2 scala-94e05a85013df444badef0c8b00503d71408ed08.zip | |
SI-8126 Puts SI-7335 fix behind a source level flag
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 6b5afce993..5d0d5392dd 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1793,7 +1793,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper val impl2 = finishMethodSynthesis(impl1, clazz, context) - if (mdef.symbol == PredefModule) + if (settings.isScala211 && mdef.symbol == PredefModule) ensurePredefParentsAreInSameSourceFile(impl2) // SI-5954. On second compile of a companion class contained in a package object we end up |