summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-07-27 22:24:51 -0700
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2013-07-27 22:24:51 -0700
commit0b7dddbf88f582c9e04105407509334fb1ee50ec (patch)
tree095b82a4ea91c73810b06650eceed0b82f1981e0 /src/compiler
parent6717d6d91af4d2e24e5c3884ddf3204dc078285e (diff)
parentc4bf1d5fb5a4d5e64e64b6af985fc795faa15bce (diff)
downloadscala-0b7dddbf88f582c9e04105407509334fb1ee50ec.tar.gz
scala-0b7dddbf88f582c9e04105407509334fb1ee50ec.tar.bz2
scala-0b7dddbf88f582c9e04105407509334fb1ee50ec.zip
Merge pull request #2738 from retronym/ticket/7636
SI-7636 Fix a NPE in typing class constructors
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 1a2e498bca..bf2170310f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -2010,6 +2010,8 @@ trait Typers extends Modes with Adaptations with Tags {
// !!! This method is redundant with other, less buggy ones.
def decompose(call: Tree): (Tree, List[Tree]) = call match {
+ case _ if call.isErrorTyped => // e.g. SI-7636
+ (call, Nil)
case Apply(fn, args) =>
// an object cannot be allowed to pass a reference to itself to a superconstructor
// because of initialization issues; SI-473, SI-3913, SI-6928.