diff options
author | Seth Tisue <seth@tisue.net> | 2017-02-16 14:09:29 -0800 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2017-02-16 14:09:29 -0800 |
commit | 3e99598973ceaa1c4afe00b0d3c3a17c57da8fea (patch) | |
tree | e21072b5781ba8eaaac116b4cb51bb84cc9f948c /src/compiler/scala/tools/nsc/symtab/classfile | |
parent | 2324405ca0087604f8c3f3ad78d7488cf8d7ea49 (diff) | |
parent | 36967321c7a8a99cab2f9f1c4c0c46f09d3d34a6 (diff) | |
download | scala-3e99598973ceaa1c4afe00b0d3c3a17c57da8fea.tar.gz scala-3e99598973ceaa1c4afe00b0d3c3a17c57da8fea.tar.bz2 scala-3e99598973ceaa1c4afe00b0d3c3a17c57da8fea.zip |
Merge commit '36967321c7' into merge-2.11.x-to-2.12.x-20170214
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab/classfile')
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 1a4671e15f..9129478b41 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -663,10 +663,9 @@ abstract class ClassfileParser { // so have to check unsafeTypeParams.isEmpty before worrying about raw type case below, // or we'll create a boatload of needless existentials. else if (classSym.isMonomorphicType || classSym.unsafeTypeParams.isEmpty) tp - else debuglogResult(s"raw type from $classSym"){ + else debuglogResult(s"raw type from $classSym") { // raw type - existentially quantify all type parameters - val eparams = typeParamsToExistentials(classSym, classSym.unsafeTypeParams) - newExistentialType(eparams, typeRef(pre, classSym, eparams.map(_.tpeHK))) + classExistentialType(pre, classSym) } case tp => assert(sig.charAt(index) != '<', s"sig=$sig, index=$index, tp=$tp") |