diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-03-25 11:57:01 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-03-25 11:57:01 +0100 |
| commit | 430e9d88ed0bc58782638c97733690daa18596f8 (patch) | |
| tree | fcf4f94ffe6152356f186f922e7dee2bf7f7ea8b /src | |
| parent | 2aeb90778eafb8c3afdb102989546dbe28a41da4 (diff) | |
| parent | b6a54a8fa71515fd97c5f225c11b24d971a703c8 (diff) | |
| download | scala-430e9d88ed0bc58782638c97733690daa18596f8.tar.gz scala-430e9d88ed0bc58782638c97733690daa18596f8.tar.bz2 scala-430e9d88ed0bc58782638c97733690daa18596f8.zip | |
Merge pull request #3637 from densh/si/8420
SI-8420 don't crash on unquoting of non-liftable native type
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/reflect/quasiquotes/Holes.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Holes.scala b/src/compiler/scala/tools/reflect/quasiquotes/Holes.scala index 8376fca4ad..55a28f9f20 100644 --- a/src/compiler/scala/tools/reflect/quasiquotes/Holes.scala +++ b/src/compiler/scala/tools/reflect/quasiquotes/Holes.scala @@ -78,8 +78,10 @@ trait Holes { self: Quasiquotes => val (strippedTpe, tpe): (Type, Type) = { val (strippedRank, strippedTpe) = stripIterable(unquotee.tpe, limit = Some(annotatedRank)) if (isBottomType(strippedTpe)) cantSplice() - else if (isNativeType(strippedTpe)) (strippedTpe, iterableTypeFromRank(annotatedRank, strippedTpe)) - else if (isLiftableType(strippedTpe)) (strippedTpe, iterableTypeFromRank(annotatedRank, treeType)) + else if (isNativeType(strippedTpe)) { + if (strippedRank != NoDot && !(strippedTpe <:< treeType) && !isLiftableType(strippedTpe)) cantSplice() + else (strippedTpe, iterableTypeFromRank(annotatedRank, strippedTpe)) + } else if (isLiftableType(strippedTpe)) (strippedTpe, iterableTypeFromRank(annotatedRank, treeType)) else cantSplice() } |