diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-09-06 13:54:30 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-09-06 13:54:30 +1000 |
commit | 1629f61f6d42311b7bbb4803fbaf531d0915c379 (patch) | |
tree | 801aacf809aad1969f480e9e2212822a8429ce0e /src | |
parent | 8292bb3cea615b79685b8eea7c23c63903a0e810 (diff) | |
parent | 9d73937bb30c84a258ec523259353cbdb272cb2a (diff) | |
download | scala-1629f61f6d42311b7bbb4803fbaf531d0915c379.tar.gz scala-1629f61f6d42311b7bbb4803fbaf531d0915c379.tar.bz2 scala-1629f61f6d42311b7bbb4803fbaf531d0915c379.zip |
Merge pull request #4706 from VladUreche/issue/tree-checker
Re-enable tree checkers
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala index a7d48ceb89..e8db8309f1 100644 --- a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala @@ -262,7 +262,14 @@ abstract class TreeCheckers extends Analyzer { checkedTyped(tree, mode, pt) ) private def checkedTyped(tree: Tree, mode: Mode, pt: Type): Tree = { - val typed = wrap(tree)(super.typed(tree, mode, pt)) + val typed = wrap(tree)(super.typed(tree.clearType(), mode, pt)) + + // Vlad: super.typed returns null for package defs, why is that? + if (typed eq null) + return tree + + if (typed.tpe ne null) + assert(!typed.tpe.isErroneous, "Tree has erroneous type: " + typed) if (tree ne typed) treesDiffer(tree, typed) |