diff options
| author | Seth Tisue <seth@tisue.net> | 2016-09-07 13:39:28 -0700 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-10-24 14:18:39 -0700 |
| commit | 08c72ee16be256cfc614f4e9c4035705de9e9cb4 (patch) | |
| tree | daba062c7787e03fb891332f5f1430ae8ada51c0 | |
| parent | 01b76a26ef4285aa4dfc9e1fc00c4886538e8b7d (diff) | |
| download | scala-08c72ee16be256cfc614f4e9c4035705de9e9cb4.tar.gz scala-08c72ee16be256cfc614f4e9c4035705de9e9cb4.tar.bz2 scala-08c72ee16be256cfc614f4e9c4035705de9e9cb4.zip | |
SI-9516 remove now-unneeded code
now that STARR includes the relevant fix
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala index 2cd4785fbf..8b62409076 100644 --- a/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala +++ b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala @@ -103,13 +103,13 @@ abstract class ConstantFolder { case nme.XOR => Constant(x.longValue ^ y.longValue) case nme.AND => Constant(x.longValue & y.longValue) case nme.LSL if x.tag <= IntTag - => Constant(x.intValue << y.longValue.toInt) // TODO: remove .toInt once starr includes the fix for SI-9516 (2.12.0-M5) + => Constant(x.intValue << y.longValue) case nme.LSL => Constant(x.longValue << y.longValue) case nme.LSR if x.tag <= IntTag - => Constant(x.intValue >>> y.longValue.toInt) // TODO: remove .toInt once starr includes the fix for SI-9516 (2.12.0-M5) + => Constant(x.intValue >>> y.longValue) case nme.LSR => Constant(x.longValue >>> y.longValue) case nme.ASR if x.tag <= IntTag - => Constant(x.intValue >> y.longValue.toInt) // TODO: remove .toInt once starr includes the fix for SI-9516 (2.12.0-M5) + => Constant(x.intValue >> y.longValue) case nme.ASR => Constant(x.longValue >> y.longValue) case nme.EQ => Constant(x.longValue == y.longValue) case nme.NE => Constant(x.longValue != y.longValue) |