Merge pull request #1183 from sjrd/scalajs-0.6.8

Upgrade to Scala.js 0.6.8.

Author: DarkDimius

project/plugins.sbt

@@ -7,4 +7,4 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.7")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8")

src/dotty/tools/backend/sjs/JSCodeGen.scala

@@ -557,21 +557,7 @@ class JSCodeGen()(implicit ctx: Context) {
           }
         }
 
-        /* Work around https://github.com/scala-js/scala-js/issues/2259
-         * TODO Remove this when we upgrade to Scala.js 0.6.8.
-         */
-        val methodDef1 = if (!sym.owner.is(Trait)) {
-          methodDef
-        } else {
-          val workaroundBody = js.Block(
-              js.Apply(js.ClassOf(jstpe.ClassType(encodeClassFullName(sym.owner))),
-                  js.Ident("isPrimitive__Z"), Nil)(jstpe.BooleanType),
-              methodDef.body)
-          methodDef.copy(body = workaroundBody)(
-              methodDef.optimizerHints, methodDef.hash)
-        }
-
-        Some(methodDef1)
+        Some(methodDef)
       }
     }
   }
@@ -2386,8 +2372,9 @@ class JSCodeGen()(implicit ctx: Context) {
 
   /** Gen JS code to load the JavaScript global scope. */
   private def genLoadJSGlobal()(implicit pos: Position): js.Tree = {
-    // TODO Change this when upgrading to Scala.js 0.6.8
-    js.JSBracketSelect(js.JSEnvInfo(), js.StringLiteral("global"))
+    js.JSBracketSelect(
+        js.JSBracketSelect(js.JSLinkingInfo(), js.StringLiteral("envInfo")),
+        js.StringLiteral("global"))
   }
 
   /** Generate a Class[_] value (e.g. coming from classOf[T]) */