diff options
author | Martin Odersky <odersky@gmail.com> | 2008-10-01 09:46:08 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2008-10-01 09:46:08 +0000 |
commit | 51f6183304b023cdcf75ad94e130739a30aee4e5 (patch) | |
tree | 28130e4bb5bc077c2c8d4154f7ef653d8504a6f2 /src | |
parent | 692afd6ddd782141db9acb234b2bc945ab3edcc9 (diff) | |
download | scala-51f6183304b023cdcf75ad94e130739a30aee4e5.tar.gz scala-51f6183304b023cdcf75ad94e130739a30aee4e5.tar.bz2 scala-51f6183304b023cdcf75ad94e130739a30aee4e5.zip |
fixed problem with plugin build caused by assig...
fixed problem with plugin build caused by assigning null to
EmptyTree.tpe
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Contexts.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala index 699faf96b4..755ebcd5d3 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala @@ -157,7 +157,7 @@ trait Contexts { self: Analyzer => assert(inIDE) def eq[T](x : T, y : T) = x == y val a0 = { - if (tree ne null) tree.setType(null) + if ((tree ne null) && (tree ne EmptyTree)) tree.setType(null) if ((tree eq null) || (that.tree eq null)) tree == that.tree else tree equalsStructure that.tree; } |