summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Types.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index a12ae3a03d..707137dd78 100644
--- a/src/compiler/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
@@ -1414,7 +1414,10 @@ trait Types {
val args = typeArgsOrDummies
if (args.length == sym.typeParams.length)
tp.asSeenFrom(pre, sym.owner).instantiateTypeParams(sym.typeParams, args)
- else { assert(sym.typeParams.isEmpty || (args exists (_.isError)), tp); tp }
+ else {
+ assert(sym.typeParams.isEmpty || (args exists (_.isError)) || isRaw(sym, args)/*#2266/2305*/, tp)
+ tp
+ }
// @M TODO maybe we shouldn't instantiate type params if isHigherKinded -- probably needed for partial type application though
}