Fix #2467

scalajs-test-suite-test-fastopt.js.diff

diff --git "a/C:\\Users\\Sepi\\Documents\\Projets\\scalajs-test-suite-test-fastopt.js" "b/C:\\Users\\Sepi\\Documents\\Projets\\scalajs\\test-suite\\js\\target\\scala-2.11\\scalajs-test-suite-test-fastopt.js"
index 1b121cd..24aedbb 100644
--- "a/C:\\Users\\Sepi\\Documents\\Projets\\scalajs-test-suite-test-fastopt.js"
+++ "b/C:\\Users\\Sepi\\Documents\\Projets\\scalajs\\test-suite\\js\\target\\scala-2.11\\scalajs-test-suite-test-fastopt.js"
@@ -31557,6 +31557,7 @@ $c_Lorg_scalajs_testsuite_compiler_OptimizerTest.prototype.side$undeffect$unddis
     })
   })(this, b);
   var x$2 = $uI(this.org$scalajs$testsuite$compiler$OptimizerTest$$get$1__O__scm_ArrayBuilder__O(1, b));
+  $uI(f());
   this.mockPrintln$1__p1__O__scm_ArrayBuilder__V(((x$2 + $uI(f())) | 0), b);
   var xs = new $c_sjs_js_WrappedArray().init___sjs_js_Array(["get: 1", "get: 2", "get: 2", "3"]);
   $m_s_reflect_ManifestFactory$ObjectManifest$();
@@ -32243,6 +32244,7 @@ $c_Lorg_scalajs_testsuite_compiler_ReflectionTest.prototype.isInstance$undfor$un
   var this$10 = $m_Lorg_junit_Assert$();
   var condition$3 = $d_Lorg_scalajs_testsuite_compiler_ReflectionTest$ReflectionTestRawJSClass.getClassOf().isInstance__O__Z(other);
   this$10.assertFalse__T__Z__V(null, condition$3);
+  $m_s_reflect_package$();
   var this$17 = $m_Lorg_junit_Assert$();
   if ((obj === null)) {
     var jsx$1 = $m_s_None$()
@@ -34131,12 +34133,12 @@ $c_Lorg_scalajs_testsuite_compiler_RegressionTest.prototype.Wrong$unddivision$un
   var this$1 = $m_Lorg_junit_Assert$();
   this$1.assertEquals__T__O__O__V(null, 3.5, 3.5);
   var this$6 = $m_Lorg_junit_Assert$();
-  var actual = $d_D.getClassOf().getName__T();
+  var actual = ($m_s_reflect_package$(), $d_D.getClassOf()).getName__T();
   this$6.assertEquals__T__O__O__V(null, "double", actual);
   var this$7 = $m_Lorg_junit_Assert$();
   this$7.assertEquals__T__O__O__V(null, 1.0, 1.0);
   var this$12 = $m_Lorg_junit_Assert$();
-  var actual$1 = $d_D.getClassOf().getName__T();
+  var actual$1 = ($m_s_reflect_package$(), $d_D.getClassOf()).getName__T();
   this$12.assertEquals__T__O__O__V(null, "double", actual$1)
 });
 $c_Lorg_scalajs_testsuite_compiler_RegressionTest.prototype.clone__ = (function() {
@@ -132404,32 +132406,65 @@ $c_Lorg_scalajs_testsuite_scalalib_ClassTagTest.prototype.runtimeClass__V = (fun
   var actual$5 = $d_sr_Null$.getClassOf();
   this$56.assertSame__T__O__O__V(null, $d_sr_Null$.getClassOf(), actual$5);
   var this$59 = $m_Lorg_junit_Assert$();
-  this$59.assertSame__T__O__O__V(null, $d_T.getClassOf(), $d_T.getClassOf());
+  $m_s_reflect_package$();
+  var jsx$1_$_runtimeClass$1 = $d_T.getClassOf();
+  var actual$6 = jsx$1_$_runtimeClass$1;
+  this$59.assertSame__T__O__O__V(null, $d_T.getClassOf(), actual$6);
   var this$62 = $m_Lorg_junit_Assert$();
-  this$62.assertSame__T__O__O__V(null, $d_jl_Integer.getClassOf(), $d_jl_Integer.getClassOf());
+  $m_s_reflect_package$();
+  var jsx$2_$_runtimeClass$1 = $d_jl_Integer.getClassOf();
+  var actual$7 = jsx$2_$_runtimeClass$1;
+  this$62.assertSame__T__O__O__V(null, $d_jl_Integer.getClassOf(), actual$7);
   var this$65 = $m_Lorg_junit_Assert$();
-  this$65.assertSame__T__O__O__V(null, $d_sc_Seq.getClassOf(), $d_sc_Seq.getClassOf());
+  $m_s_reflect_package$();
+  var jsx$3_$_runtimeClass$1 = $d_sc_Seq.getClassOf();
+  var actual$8 = jsx$3_$_runtimeClass$1;
+  this$65.assertSame__T__O__O__V(null, $d_sc_Seq.getClassOf(), actual$8);
   var this$70 = $m_Lorg_junit_Assert$();
   $m_s_reflect_package$();
   $m_s_reflect_ManifestFactory$ObjectManifest$();
-  var actual$6 = $d_O.getClassOf();
-  this$70.assertSame__T__O__O__V(null, $d_O.getClassOf(), actual$6);
+  var actual$9 = $d_O.getClassOf();
+  this$70.assertSame__T__O__O__V(null, $d_O.getClassOf(), actual$9);
   var this$75 = $m_Lorg_junit_Assert$();
-  this$75.assertSame__T__O__O__V(null, $d_O.getArrayOf().getClassOf(), $d_O.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$4_$_runtimeClass$1 = $d_O.getArrayOf().getClassOf();
+  var actual$10 = jsx$4_$_runtimeClass$1;
+  this$75.assertSame__T__O__O__V(null, $d_O.getArrayOf().getClassOf(), actual$10);
   var this$78 = $m_Lorg_junit_Assert$();
-  this$78.assertSame__T__O__O__V(null, $d_O.getArrayOf().getClassOf(), $d_O.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$5_$_runtimeClass$1 = $d_O.getArrayOf().getClassOf();
+  var actual$11 = jsx$5_$_runtimeClass$1;
+  this$78.assertSame__T__O__O__V(null, $d_O.getArrayOf().getClassOf(), actual$11);
   var this$83 = $m_Lorg_junit_Assert$();
-  this$83.assertSame__T__O__O__V(null, $d_T.getArrayOf().getClassOf(), $d_T.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$6_$_runtimeClass$1 = $d_T.getArrayOf().getClassOf();
+  var actual$12 = jsx$6_$_runtimeClass$1;
+  this$83.assertSame__T__O__O__V(null, $d_T.getArrayOf().getClassOf(), actual$12);
   var this$86 = $m_Lorg_junit_Assert$();
-  this$86.assertSame__T__O__O__V(null, $d_sc_Seq.getArrayOf().getClassOf(), $d_sc_Seq.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$7_$_runtimeClass$1 = $d_sc_Seq.getArrayOf().getClassOf();
+  var actual$13 = jsx$7_$_runtimeClass$1;
+  this$86.assertSame__T__O__O__V(null, $d_sc_Seq.getArrayOf().getClassOf(), actual$13);
   var this$91 = $m_Lorg_junit_Assert$();
-  this$91.assertSame__T__O__O__V(null, $d_I.getArrayOf().getClassOf(), $d_I.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$8_$_runtimeClass$1 = $d_I.getArrayOf().getClassOf();
+  var actual$14 = jsx$8_$_runtimeClass$1;
+  this$91.assertSame__T__O__O__V(null, $d_I.getArrayOf().getClassOf(), actual$14);
   var this$96 = $m_Lorg_junit_Assert$();
-  this$96.assertSame__T__O__O__V(null, $d_sr_BoxedUnit.getArrayOf().getClassOf(), $d_sr_BoxedUnit.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$9_$_runtimeClass$1 = $d_sr_BoxedUnit.getArrayOf().getClassOf();
+  var actual$15 = jsx$9_$_runtimeClass$1;
+  this$96.assertSame__T__O__O__V(null, $d_sr_BoxedUnit.getArrayOf().getClassOf(), actual$15);
   var this$101 = $m_Lorg_junit_Assert$();
-  this$101.assertSame__T__O__O__V(null, $d_sr_Nothing$.getArrayOf().getClassOf(), $d_sr_Nothing$.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$10_$_runtimeClass$1 = $d_sr_Nothing$.getArrayOf().getClassOf();
+  var actual$16 = jsx$10_$_runtimeClass$1;
+  this$101.assertSame__T__O__O__V(null, $d_sr_Nothing$.getArrayOf().getClassOf(), actual$16);
   var this$106 = $m_Lorg_junit_Assert$();
-  this$106.assertSame__T__O__O__V(null, $d_sr_Null$.getArrayOf().getClassOf(), $d_sr_Null$.getArrayOf().getClassOf());
+  $m_s_reflect_package$();
+  var jsx$11_$_runtimeClass$1 = $d_sr_Null$.getArrayOf().getClassOf();
+  var actual$17 = jsx$11_$_runtimeClass$1;
+  this$106.assertSame__T__O__O__V(null, $d_sr_Null$.getArrayOf().getClassOf(), actual$17);
   var this$108 = $m_Lorg_junit_Assert$();
   this$108.assertSame__T__O__O__V(null, $d_T.getClassOf(), $d_T.getClassOf());
   var this$110 = $m_Lorg_junit_Assert$();
@@ -132438,8 +132473,8 @@ $c_Lorg_scalajs_testsuite_scalalib_ClassTagTest.prototype.runtimeClass__V = (fun
   this$112.assertSame__T__O__O__V(null, $d_sc_Seq.getClassOf(), $d_sc_Seq.getClassOf());
   var this$116 = $m_Lorg_junit_Assert$();
   $m_s_reflect_ManifestFactory$ObjectManifest$();
-  var actual$7 = $d_O.getClassOf();
-  this$116.assertSame__T__O__O__V(null, $d_O.getClassOf(), actual$7);
+  var actual$18 = $d_O.getClassOf();
+  this$116.assertSame__T__O__O__V(null, $d_O.getClassOf(), actual$18);
   var this$118 = $m_Lorg_junit_Assert$();
   this$118.assertSame__T__O__O__V(null, $d_O.getArrayOf().getClassOf(), $d_O.getArrayOf().getClassOf());
   var this$120 = $m_Lorg_junit_Assert$();
@@ -239982,6 +240017,7 @@ $c_Lorg_scalajs_testsuite_typedarray_ArraysTest.prototype.init___ = (function()
   return this
 });
 $c_Lorg_scalajs_testsuite_typedarray_ArraysTest.prototype.Array__sc_Seq__s_reflect_ClassTag__O = (function(v, evidence$1) {
+  $m_s_reflect_package$();
   var x = $m_s_reflect_ManifestFactory$ByteManifest$();
   if ((x === evidence$1)) {
     var jsx$2 = $g.Int8Array;
@@ -249071,7 +249107,7 @@ $c_sjs_niocharset_UTF$und8$Encoder.prototype.encodeLoop__Ljava_nio_CharBuffer__L
             out.put__B__Ljava_nio_ByteBuffer((((128 | (63 & c1)) << 24) >> 24));
             continue _loop
           }
-        } else if (((63488 & c1) !== 55296)) {
+        } else if ((!($m_sjs_niocharset_UTF$und8$(), ((63488 & c1) === 55296)))) {
           if ((((out.$$undlimit$1 - out.java$nio$Buffer$$$undposition$1) | 0) < 3)) {
             var result$2 = $m_Ljava_nio_charset_CoderResult$().OVERFLOW$1;
             $in.position__I__Ljava_nio_Buffer((((-1) + $in.java$nio$Buffer$$$undposition$1) | 0));
@@ -249198,7 +249234,7 @@ $c_sjs_niocharset_UTF$und8$Encoder.prototype.encodeLoopArray__p2__Ljava_nio_Char
           outPos = temp$outPos$2;
           continue _loop
         }
-      } else if (((63488 & c1) !== 55296)) {
+      } else if ((!($m_sjs_niocharset_UTF$und8$(), ((63488 & c1) === 55296)))) {
         if ((((3 + outPos) | 0) > outEnd)) {
           var result$3 = $m_Ljava_nio_charset_CoderResult$().OVERFLOW$1;
           var inPos$2$3 = inPos;
@@ -269020,11 +269056,15 @@ $c_Ljava_math_BigDecimal.prototype.toString__T = (function() {
       var exponent = new $c_sjsr_RuntimeLong().init___I(this.java$math$BigDecimal$$$undscale$2).unary$und$minus__sjsr_RuntimeLong().$$plus__sjsr_RuntimeLong__sjsr_RuntimeLong(new $c_sjsr_RuntimeLong().init___I(end)).$$minus__sjsr_RuntimeLong__sjsr_RuntimeLong(new $c_sjsr_RuntimeLong().init___I(begin));
       if (((this.java$math$BigDecimal$$$undscale$2 > 0) && exponent.$$greater$eq__sjsr_RuntimeLong__Z(new $c_sjsr_RuntimeLong().init___I__I((-6), (-1))))) {
         if (exponent.$$greater$eq__sjsr_RuntimeLong__Z($m_sjsr_RuntimeLong$().Zero__sjsr_RuntimeLong())) {
+          $m_Ljava_math_BigDecimal$();
           var pos = ((end - this.java$math$BigDecimal$$$undscale$2) | 0);
+          $m_Ljava_math_BigDecimal$();
           var result = (($as_T(intString.substring(0, pos)) + ".") + $as_T(intString.substring(pos)))
         } else {
           $m_Ljava_math_BigDecimal$();
+          $m_Ljava_math_BigDecimal$();
           var pos$1 = (((-1) + begin) | 0);
+          $m_Ljava_math_BigDecimal$();
           var s = (($as_T(intString.substring(0, pos$1)) + "0.") + $as_T(intString.substring(pos$1)));
           var pos$2 = ((1 + begin) | 0);
           var xs = $m_Ljava_math_BigDecimal$().java$math$BigDecimal$$CharZeros$1;
@@ -269056,7 +269096,7 @@ $c_Ljava_math_BigDecimal.prototype.toString__T = (function() {
           var result = ((("" + $as_T(s.substring(0, pos$2))) + s2$1) + $as_T(s.substring(pos$2)))
         }
       } else {
-        var r0 = ((((end - begin) | 0) >= 1) ? (($as_T(intString.substring(0, begin)) + ".") + $as_T(intString.substring(begin))) : intString);
+        var r0 = ((((end - begin) | 0) >= 1) ? ($m_Ljava_math_BigDecimal$(), $m_Ljava_math_BigDecimal$(), (($as_T(intString.substring(0, begin)) + ".") + $as_T(intString.substring(begin)))) : intString);
         var r1 = (r0 + "E");
         var r2 = (exponent.$$greater__sjsr_RuntimeLong__Z($m_sjsr_RuntimeLong$().Zero__sjsr_RuntimeLong()) ? (r1 + "+") : r1);
         var result = (r2 + $as_sjsr_RuntimeLong(exponent).toString__T())
@@ -269824,11 +269864,15 @@ $c_Ljava_math_BigDecimal.prototype.toEngineeringString__T = (function() {
     var exponent0 = new $c_sjsr_RuntimeLong().init___I(this.java$math$BigDecimal$$$undscale$2).unary$und$minus__sjsr_RuntimeLong().$$plus__sjsr_RuntimeLong__sjsr_RuntimeLong(new $c_sjsr_RuntimeLong().init___I(elem$1)).$$minus__sjsr_RuntimeLong__sjsr_RuntimeLong(new $c_sjsr_RuntimeLong().init___I(begin));
     if (((this.java$math$BigDecimal$$$undscale$2 > 0) && exponent0.$$greater$eq__sjsr_RuntimeLong__Z(new $c_sjsr_RuntimeLong().init___I__I((-6), (-1))))) {
       if (exponent0.$$greater$eq__sjsr_RuntimeLong__Z($m_sjsr_RuntimeLong$().Zero__sjsr_RuntimeLong())) {
+        $m_Ljava_math_BigDecimal$();
         var pos = ((elem$1 - this.java$math$BigDecimal$$$undscale$2) | 0);
+        $m_Ljava_math_BigDecimal$();
         var result = (($as_T(intString.substring(0, pos)) + ".") + $as_T(intString.substring(pos)))
       } else {
         $m_Ljava_math_BigDecimal$();
+        $m_Ljava_math_BigDecimal$();
         var pos$1 = (((-1) + begin) | 0);
+        $m_Ljava_math_BigDecimal$();
         var s = (($as_T(intString.substring(0, pos$1)) + "0.") + $as_T(intString.substring(pos$1)));
         var pos$2 = ((1 + begin) | 0);
         var xs = $m_Ljava_math_BigDecimal$().java$math$BigDecimal$$CharZeros$1;