summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Namers.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-05-25 15:22:19 +0200
committerJason Zaugg <jzaugg@gmail.com>2016-06-06 14:37:47 +1000
commite1084299350bcc20f5d412993d77b8f956ba3165 (patch)
tree78d6f5ab040420ab877b203d2c60754feeae2d43 /src/compiler/scala/tools/nsc/typechecker/Namers.scala
parent59d6dbc0aac912567d235048b5114cccf965c7ce (diff)
downloadscala-e1084299350bcc20f5d412993d77b8f956ba3165.tar.gz
scala-e1084299350bcc20f5d412993d77b8f956ba3165.tar.bz2
scala-e1084299350bcc20f5d412993d77b8f956ba3165.zip
SI-9256 check companions in same compilation unit only if same run
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Namers.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 2773ee19cf..9c1ba7ced1 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -431,6 +431,7 @@ trait Namers extends MethodSynthesis {
&& !(module isCoDefinedWith clazz)
&& module.exists
&& clazz.exists
+ && (currentRun.compiles(clazz) == currentRun.compiles(module))
)
if (fails) {
reporter.error(tree.pos, (