summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-03-23 10:20:35 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2015-03-23 10:20:35 +0100
commit9149cc9c720b2cfc2432fc79cac75bc7ac80ba56 (patch)
treecf7c9091364ff30fbbc2ee29b27f33bbc616207c /src
parentd30098c30de94e6ec07b5c8b6782357183e24179 (diff)
parent2030f3a314ae2444fc8dbf225542de4ecafcbf40 (diff)
downloadscala-9149cc9c720b2cfc2432fc79cac75bc7ac80ba56.tar.gz
scala-9149cc9c720b2cfc2432fc79cac75bc7ac80ba56.tar.bz2
scala-9149cc9c720b2cfc2432fc79cac75bc7ac80ba56.zip
Merge pull request #4368 from som-snytt/review/7784
SI-7784 Allow a singleton type over a constant value defn.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index e883bacc88..7f86a59164 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -5193,7 +5193,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
if (refTyped.isErrorTyped) {
setError(tree)
} else {
- tree setType refTyped.tpe.resultType
+ tree setType refTyped.tpe.resultType.deconst
if (refTyped.isErrorTyped || treeInfo.admitsTypeSelection(refTyped)) tree
else UnstableTreeError(tree)
}