diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2016-03-18 13:14:57 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2016-03-18 13:14:57 +0100 |
| commit | f8ebf777b92e858a7ff8cfdf022e151b4f056920 (patch) | |
| tree | 35717b72d2bcff11e2fb261b8350968d7e9b2cb5 /src | |
| parent | a675cbf90ce3dee2773aec376125054edefb895f (diff) | |
| parent | b17951d9f9fcafe920a7aad0af74b204af5f80c3 (diff) | |
| download | dotty-f8ebf777b92e858a7ff8cfdf022e151b4f056920.tar.gz dotty-f8ebf777b92e858a7ff8cfdf022e151b4f056920.tar.bz2 dotty-f8ebf777b92e858a7ff8cfdf022e151b4f056920.zip | |
Merge pull request #1183 from sjrd/scalajs-0.6.8
Upgrade to Scala.js 0.6.8.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/backend/sjs/JSCodeGen.scala | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/dotty/tools/backend/sjs/JSCodeGen.scala b/src/dotty/tools/backend/sjs/JSCodeGen.scala index 0aa211bc8..ec75a1c4d 100644 --- a/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/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]) */ |