diff options
author | Martin Odersky <odersky@gmail.com> | 2012-01-30 13:23:24 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2012-01-30 13:23:24 +0100 |
commit | df01dc8d91852a7d663a8fe4a15fef52933bab25 (patch) | |
tree | d7466f06f2c110901578b666af50295ae482287d /src/compiler/scala/tools/nsc/transform/Erasure.scala | |
parent | 5118fd0d0894012da2e9fc95ee4c6ae5de198bd4 (diff) | |
download | scala-df01dc8d91852a7d663a8fe4a15fef52933bab25.tar.gz scala-df01dc8d91852a7d663a8fe4a15fef52933bab25.tar.bz2 scala-df01dc8d91852a7d663a8fe4a15fef52933bab25.zip |
Fixed problems with step 2
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Erasure.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index 50350455a1..51941408a2 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -602,7 +602,7 @@ abstract class Erasure extends AddInterfaces Console.println("exception when typing " + tree) Console.println(er.msg + " in file " + context.owner.sourceFile) er.printStackTrace - abort() + abort("unrecoverable error") case ex: Exception => //if (settings.debug.value) try Console.println("exception when typing " + tree) @@ -986,8 +986,8 @@ abstract class Erasure extends AddInterfaces } } else if (fn.symbol.owner.isRefinementClass && !fn.symbol.isOverridingSymbol) { ApplyDynamic(qualifier, args) setSymbol fn.symbol setPos tree.pos - } else if (false && fn.symbol.owner.isInlineClass && classInlining.hasUnboxedVersion(fn.symbol)) { - Apply(gen.mkAttributedRef(classInlining.staticMethod(fn.symbol)), qualifier :: args) + } else if (fn.symbol.owner.isInlineClass && classInlining.hasUnboxedVersion(fn.symbol)) { + Apply(gen.mkAttributedRef(classInlining.unboxedMethod(fn.symbol)), qualifier :: args) } else { tree } |