diff options
| author | Paul Phillips <paulp@improving.org> | 2012-10-02 08:05:28 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-10-02 09:50:43 -0700 |
| commit | b1307ff156c4b3ba736659ac3b5aee50bb38844f (patch) | |
| tree | 10dbe8964e80275ed32ad0e842c03b9b62ab8460 /src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | |
| parent | 609b3b8b740447b212f0ee04c1e52d8c72b8dfc8 (diff) | |
| download | scala-b1307ff156c4b3ba736659ac3b5aee50bb38844f.tar.gz scala-b1307ff156c4b3ba736659ac3b5aee50bb38844f.tar.bz2 scala-b1307ff156c4b3ba736659ac3b5aee50bb38844f.zip | |
All the actual changes of tpe to tpe_* or tpeHK.
These are the call sites which formerly could be seen to
call .tpe on a symbol with unapplied type parameters. Now
each such call site makes an explicit choice about what is
intended for the result type.
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 998cf17716..88c6f8d823 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -588,7 +588,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { res } - var parents = List(applyContext(enteringTyper(clazz.tpe))) + var parents = List(applyContext(enteringTyper(clazz.tpe_*))) // log("!!! Parents: " + parents + ", sym: " + parents.map(_.typeSymbol)) if (parents.head.typeSymbol.isTrait) parents = parents.head.parents.head :: parents @@ -1150,7 +1150,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { private def subst(env: TypeEnv)(decl: Symbol): Symbol = decl modifyInfo (info => - if (decl.isConstructor) MethodType(subst(env, info).params, decl.owner.tpe) + if (decl.isConstructor) MethodType(subst(env, info).params, decl.owner.tpe_*) else subst(env, info) ) |