summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-12-29 16:53:10 -0800
committerPaul Phillips <paulp@improving.org>2011-12-30 07:43:47 -0800
commitbfa49b0d545b087c578ebebc0c89bb1180fa9d85 (patch)
tree8062ca1f27c4526bc9a43bfebb52b24b1ba4f92a
parent0947d08eef6397efe6dd97c41cf480ff13762591 (diff)
downloadscala-bfa49b0d545b087c578ebebc0c89bb1180fa9d85.tar.gz
scala-bfa49b0d545b087c578ebebc0c89bb1180fa9d85.tar.bz2
scala-bfa49b0d545b087c578ebebc0c89bb1180fa9d85.zip
Optimizations in typeref creation.
A couple locations where more work than necessary is performed when created a typeref. (Not to mention creating bogus typerefs applying arguments to implementation classes.)
-rw-r--r--src/compiler/scala/reflect/internal/Types.scala2
-rw-r--r--src/compiler/scala/tools/nsc/transform/AddInterfaces.scala4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index 38f51b1459..f37509af39 100644
--- a/src/compiler/scala/reflect/internal/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -1900,7 +1900,7 @@ A type's typeSymbol should never be inspected directly.
// note: does not go through typeRef. There's no need to because
// neither `pre` nor `sym` changes. And there's a performance
// advantage to call TypeRef directly.
- override def typeConstructor = TypeRef(pre, sym, Nil)
+ override def typeConstructor = if (args.isEmpty) this else TypeRef(pre, sym, Nil)
// A reference (in a Scala program) to a type that has type
// parameters, but where the reference does not include type
diff --git a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
index 4e8e678dc8..c59a819b02 100644
--- a/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
+++ b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
@@ -148,8 +148,8 @@ abstract class AddInterfaces extends InfoTransform {
*/
def mixinToImplClass(tp: Type): Type = erasure(sym,
tp match { //@MATN: no normalize needed (comes after erasure)
- case TypeRef(pre, sym, args) if sym.needsImplClass =>
- typeRef(pre, implClass(sym), args)
+ case TypeRef(pre, sym, _) if sym.needsImplClass =>
+ typeRef(pre, implClass(sym), Nil)
case _ =>
tp
}