diff options
| author | Seth Tisue <seth@tisue.net> | 2016-10-24 19:25:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 19:25:17 -0700 |
| commit | eff0aabb7824513498a4081072845001dbe4897f (patch) | |
| tree | 79e2dade4a231364d2aedc8e8f8f0d0b034a87c4 /src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala | |
| parent | 01b76a26ef4285aa4dfc9e1fc00c4886538e8b7d (diff) | |
| parent | e0a8ffe88740995150fa7ca58797a4cceed3169f (diff) | |
| download | scala-eff0aabb7824513498a4081072845001dbe4897f.tar.gz scala-eff0aabb7824513498a4081072845001dbe4897f.tar.bz2 scala-eff0aabb7824513498a4081072845001dbe4897f.zip | |
Merge pull request #5383 from SethTisue/post-rc1-cleanups
assorted cleanups
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala')
| -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) |