diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-07-09 09:51:03 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-07-09 09:51:03 +0000 |
commit | ba975223e8854db866a55f7207ad889327c4100d (patch) | |
tree | 6499eaef89f86f6751f1515c347a2b55b9aea92e /src | |
parent | 2182f4d283594462445f2a8cd6773dc648cdb147 (diff) | |
download | scala-ba975223e8854db866a55f7207ad889327c4100d.tar.gz scala-ba975223e8854db866a55f7207ad889327c4100d.tar.bz2 scala-ba975223e8854db866a55f7207ad889327c4100d.zip |
close #3649. no review
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 2 |
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) |