From 5db8e84cb0b92c4a5abe27574dfd51b8bd1fb54f Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 14 Mar 2012 13:09:43 -0700 Subject: The rest of the inline classes. Have you often thought that programming is just like the movie 'Hackers', only with less rollerblading? Now that we have @inline skates, that last caveat can be retired. It's just like the movie 'Hackers'. Signed-off-by: Zero Cool --- lib/forkjoin.jar.desired.sha1 | 2 +- lib/msil.jar.desired.sha1 | 2 +- lib/scala-compiler.jar.desired.sha1 | 2 +- lib/scala-dbc.jar.desired.sha1 | 1 - lib/scala-library-src.jar.desired.sha1 | 2 +- lib/scala-library.jar.desired.sha1 | 2 +- lib/scala-partest.jar.desired.sha1 | 1 - lib/scala-swing.jar.desired.sha1 | 1 - lib/scalacheck.jar.desired.sha1 | 1 - lib/scalap.jar.desired.sha1 | 1 - src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 2 +- src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 +- test/files/speclib/instrumented.jar.desired.sha1 | 2 +- 13 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 lib/scala-dbc.jar.desired.sha1 delete mode 100644 lib/scala-partest.jar.desired.sha1 delete mode 100644 lib/scala-swing.jar.desired.sha1 delete mode 100644 lib/scalacheck.jar.desired.sha1 delete mode 100644 lib/scalap.jar.desired.sha1 diff --git a/lib/forkjoin.jar.desired.sha1 b/lib/forkjoin.jar.desired.sha1 index b8c48df830..d37b84d8c7 100644 --- a/lib/forkjoin.jar.desired.sha1 +++ b/lib/forkjoin.jar.desired.sha1 @@ -1 +1 @@ -e29a62ba3abe56ba004b344e22be86dbeb12176f ?forkjoin.jar +996fc132b05046112b9d4dc62e2d2c9057d836bc ?forkjoin.jar diff --git a/lib/msil.jar.desired.sha1 b/lib/msil.jar.desired.sha1 index ac09965566..2c2fe79dda 100644 --- a/lib/msil.jar.desired.sha1 +++ b/lib/msil.jar.desired.sha1 @@ -1 +1 @@ -046beeda12838b9ad34306caad71a523d06b1f31 ?msil.jar +d48cb950ceded82a5e0ffae8ef2c68d0923ed00c ?msil.jar diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index d8c99fd8a7..0bbbea1e7b 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -c6fc8984eeabb722aca2d99e7afebdb96e834995 ?scala-compiler.jar +f9fcb59f3dbe1b060f8c57d4463dde5e0796951f ?scala-compiler.jar diff --git a/lib/scala-dbc.jar.desired.sha1 b/lib/scala-dbc.jar.desired.sha1 deleted file mode 100644 index e51fef11e9..0000000000 --- a/lib/scala-dbc.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -4018c45556de9674348f1bcdef042bfecdde9cdb ?scala-dbc.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index 1acb36ecd9..51704e29c9 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -8aca5d1d5890965ea4c8ece61a6018484566a95b ?scala-library-src.jar +d407ee67fa7e0d79e8e5786fb32ea7c9bdf5b088 ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index 00fc8b0018..703eb006da 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -3348de294ffc98750730e835e06a84dd4e1133fc ?scala-library.jar +1d53671b52f2052c0690fcef9c9989150d8a4704 ?scala-library.jar diff --git a/lib/scala-partest.jar.desired.sha1 b/lib/scala-partest.jar.desired.sha1 deleted file mode 100644 index 3e30ca7f99..0000000000 --- a/lib/scala-partest.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -d4d19b3891be3dd381066a83c4e35887b666dc27 ?scala-partest.jar diff --git a/lib/scala-swing.jar.desired.sha1 b/lib/scala-swing.jar.desired.sha1 deleted file mode 100644 index 9ecf764e44..0000000000 --- a/lib/scala-swing.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -e40b7ecf7cc346dce9400ba9c85275548937fbdf ?scala-swing.jar diff --git a/lib/scalacheck.jar.desired.sha1 b/lib/scalacheck.jar.desired.sha1 deleted file mode 100644 index c9b189f0ab..0000000000 --- a/lib/scalacheck.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -2c66d55c38859c50dcce39aeb1cd2611de7d9922 ?scalacheck.jar diff --git a/lib/scalap.jar.desired.sha1 b/lib/scalap.jar.desired.sha1 deleted file mode 100644 index 789a17cda5..0000000000 --- a/lib/scalap.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -0232fc4d34d65dc2a177b7eb9eb935bb156207ff ?scalap.jar diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 28a9818017..7b0f5254b6 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -348,7 +348,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { */ def specializesClass(sym: Symbol): Symbol = { val c = sym.companionClass - if (isValueClass(c)) c else AnyRefClass + if (isPrimitiveValueClass(c)) c else AnyRefClass } /** Return the types `sym` should be specialized at. This may be some of the primitive types diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 65c46fca98..9a2ef88821 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -637,7 +637,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { // to escape scope here, e.g. pos/t1107. I'm not sure how to properly handle this // so for now it requires the type symbol be public. && pre.typeSymbol.isPublic) - tree setType MethodType(Nil, erasure.getClassReturnType(pre)) + tree setType MethodType(Nil, getClassReturnType(pre)) else tree } diff --git a/test/files/speclib/instrumented.jar.desired.sha1 b/test/files/speclib/instrumented.jar.desired.sha1 index 7cdcf2f0b0..2d4cd04a92 100644 --- a/test/files/speclib/instrumented.jar.desired.sha1 +++ b/test/files/speclib/instrumented.jar.desired.sha1 @@ -1 +1 @@ -5a9ee30043737b5d40511063b386dcbf3de0caae ?instrumented.jar +d83c6bf3765ab1378943020a8d9cda8851604ffa ?instrumented.jar -- cgit v1.2.3