summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Namers.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-07-09 09:51:03 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-07-09 09:51:03 +0000
commitba975223e8854db866a55f7207ad889327c4100d (patch)
tree6499eaef89f86f6751f1515c347a2b55b9aea92e /src/compiler/scala/tools/nsc/typechecker/Namers.scala
parent2182f4d283594462445f2a8cd6773dc648cdb147 (diff)
downloadscala-ba975223e8854db866a55f7207ad889327c4100d.tar.gz
scala-ba975223e8854db866a55f7207ad889327c4100d.tar.bz2
scala-ba975223e8854db866a55f7207ad889327c4100d.zip
close #3649. no review
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Namers.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 53fb15dbeb..756863f8f9 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -990,6 +990,8 @@ trait Namers { self: Analyzer =>
val module = companionModuleOf(meth.owner, context)
module.initialize // call type completer (typedTemplate), adds the
// module's templateNamer to classAndNamerOfModule
+ if (!classAndNamerOfModule.contains(module))
+ return // fix #3649 (prevent crash in erroneous source code)
val (cdef, nmr) = classAndNamerOfModule(module)
moduleNamer = Some(cdef, nmr)
(cdef, nmr)