Merge pull request scala#5518 from som-snytt/issue/10037-2.11

SI-10037 ASR/LSR switched in ICodeReader

Author: retronym

src/compiler/scala/tools/nsc/backend/icode/Primitives.scala

@@ -210,7 +210,7 @@ trait Primitives { self: ICodes =>
       case LSL =>  "LSL"
       case ASR =>  "ASR"
       case LSR =>  "LSR"
-      case _  => throw new RuntimeException("ShitOp unknown case")
+      case _  => throw new RuntimeException("ShiftOp unknown case")
     }
   }
 

src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala

@@ -452,10 +452,10 @@ abstract class ICodeReader extends ClassfileParser {
 
         case JVM.ishl        => code.emit(CALL_PRIMITIVE(Shift(LSL, INT)))
         case JVM.lshl        => code.emit(CALL_PRIMITIVE(Shift(LSL, LONG)))
-        case JVM.ishr        => code.emit(CALL_PRIMITIVE(Shift(LSR, INT)))
-        case JVM.lshr        => code.emit(CALL_PRIMITIVE(Shift(LSR, LONG)))
-        case JVM.iushr       => code.emit(CALL_PRIMITIVE(Shift(ASR, INT)))
-        case JVM.lushr       => code.emit(CALL_PRIMITIVE(Shift(ASR, LONG)))
+        case JVM.ishr        => code.emit(CALL_PRIMITIVE(Shift(ASR, INT)))
+        case JVM.lshr        => code.emit(CALL_PRIMITIVE(Shift(ASR, LONG)))
+        case JVM.iushr       => code.emit(CALL_PRIMITIVE(Shift(LSR, INT)))
+        case JVM.lushr       => code.emit(CALL_PRIMITIVE(Shift(LSR, LONG)))
         case JVM.iand        => code.emit(CALL_PRIMITIVE(Logical(AND, INT)))
         case JVM.land        => code.emit(CALL_PRIMITIVE(Logical(AND, LONG)))
         case JVM.ior         => code.emit(CALL_PRIMITIVE(Logical(OR, INT)))

test/files/run/t10037.check

@@ -0,0 +1,2 @@
+-1073741824
+1073741824

test/files/run/t10037.flags

@@ -0,0 +1 @@
+-optimise -Ybackend:GenASM -Yinline-warnings

test/files/run/t10037/shifter_2.scala

@@ -0,0 +1,8 @@
+
+object Test extends App {
+  val i = shifty.X.f(Int.MinValue)
+  val j = shifty.X.g(Int.MinValue)
+  println(i)
+  println(j)
+}
+

test/files/run/t10037/shifty_1.scala

@@ -0,0 +1,7 @@
+
+package shifty
+
+object X {
+  @inline def f(i: Int): Int = i >> 1
+  @inline def g(i: Int): Int = i >>> 1
+}