Skip to content

Upgrade to Scala.js 1.0.0-M7. #6285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2019
Merged

Upgrade to Scala.js 1.0.0-M7. #6285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 56 additions & 39 deletions compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ class JSCodeGen()(implicit ctx: Context) {
}
}*/

js.FieldDef(static = false, name, irTpe, f.is(Mutable))
val flags = js.MemberFlags.empty.withMutable(f.is(Mutable))
js.FieldDef(flags, name, irTpe)
}).toList
}

Expand Down Expand Up @@ -514,7 +515,7 @@ class JSCodeGen()(implicit ctx: Context) {
/*if (primitives.isPrimitive(sym)) {
None
} else*/ if (sym.is(Deferred)) {
Some(js.MethodDef(static = false, methodName,
Some(js.MethodDef(js.MemberFlags.empty, methodName,
jsParams, toIRType(patchedResultType(sym)), None)(
OptimizerHints.empty, None))
} else /*if (isJSNativeCtorDefaultParam(sym)) {
Expand Down Expand Up @@ -549,15 +550,19 @@ class JSCodeGen()(implicit ctx: Context) {
val body1 =
if (!sym.isPrimaryConstructor) body0
else moveAllStatementsAfterSuperConstructorCall(body0)
js.MethodDef(static = false, methodName,
js.MethodDef(js.MemberFlags.empty, methodName,
jsParams, jstpe.NoType, body1)(optimizerHints, None)
} else*/ if (sym.isConstructor) {
js.MethodDef(static = false, methodName,
jsParams, jstpe.NoType,
} else*/ if (sym.isClassConstructor) {
val namespace = js.MemberNamespace.Constructor
js.MethodDef(js.MemberFlags.empty.withNamespace(namespace),
methodName, jsParams, jstpe.NoType,
Some(genStat(rhs)))(optimizerHints, None)
} else {
val namespace =
if (sym.isPrivate) js.MemberNamespace.Private
else js.MemberNamespace.Public
val resultIRType = toIRType(patchedResultType(sym))
genMethodDef(static = false, methodName,
genMethodDef(namespace, methodName,
params, resultIRType, rhs, optimizerHints)
}
}
Expand All @@ -576,7 +581,7 @@ class JSCodeGen()(implicit ctx: Context) {
* Methods Scala.js-defined JS classes are compiled as static methods taking
* an explicit parameter for their `this` value.
*/
private def genMethodDef(static: Boolean, methodName: js.PropertyName,
private def genMethodDef(namespace: js.MemberNamespace, methodName: js.PropertyName,
paramsSyms: List[Symbol], resultIRType: jstpe.Type,
tree: Tree, optimizerHints: OptimizerHints): js.MethodDef = {
implicit val pos = tree.span
Expand All @@ -595,10 +600,11 @@ class JSCodeGen()(implicit ctx: Context) {
else genExpr(tree)

//if (!isScalaJSDefinedJSClass(currentClassSym)) {
js.MethodDef(static, methodName, jsParams, resultIRType, Some(genBody()))(
val flags = js.MemberFlags.empty.withNamespace(namespace)
js.MethodDef(flags, methodName, jsParams, resultIRType, Some(genBody()))(
optimizerHints, None)
/*} else {
assert(!static, tree.span)
assert(!namespace.isStatic, tree.span)

withScopedVars(
thisLocalVarIdent := Some(freshLocalIdent("this"))
Expand Down Expand Up @@ -962,7 +968,8 @@ class JSCodeGen()(implicit ctx: Context) {
currentMethodSym.get.isClassConstructor) {
isModuleInitialized = true
val thisType = jstpe.ClassType(encodeClassFullName(currentClassSym))
val initModule = js.StoreModule(thisType, js.This()(thisType))
val initModule = js.StoreModule(encodeClassRef(currentClassSym),
js.This()(thisType))
js.Block(superCall, initModule)
} else {
superCall
Expand Down Expand Up @@ -1001,12 +1008,12 @@ class JSCodeGen()(implicit ctx: Context) {
else if (clsSym == jsdefn.JSArrayClass && args.isEmpty) js.JSArrayConstr(Nil)
else js.JSNew(genLoadJSConstructor(clsSym), genActualJSArgs(ctor, args))
} else {
toIRType(tpe) match {
case cls: jstpe.ClassType =>
toTypeRef(tpe) match {
case cls: jstpe.ClassRef =>
js.New(cls, encodeMethodSym(ctor), genActualArgs(ctor, args))

case other =>
throw new FatalError(s"Non ClassType cannot be instantiated: $other")
throw new FatalError(s"Non ClassRef cannot be instantiated: $other")
}
}
}
Expand All @@ -1030,7 +1037,7 @@ class JSCodeGen()(implicit ctx: Context) {
}
val newMethodIdent = js.Ident(newMethodName, origName)

js.Apply(genLoadModule(moduleClass), newMethodIdent, args)(
js.Apply(js.ApplyFlags.empty, genLoadModule(moduleClass), newMethodIdent, args)(
jstpe.ClassType(encodedName))
}

Expand Down Expand Up @@ -1575,11 +1582,8 @@ class JSCodeGen()(implicit ctx: Context) {
genApplyJSMethodGeneric(tree, sym, genExpr(receiver), genActualJSArgs(sym, args), isStat)
/*else
genApplyJSClassMethod(genExpr(receiver), sym, genActualArgs(sym, args))*/
} else if (sym.isClassConstructor) {
// Calls to constructors are always statically linked
genApplyMethodStatically(genExpr(receiver), sym, genActualArgs(sym, args))
} else {
genApplyMethod(genExpr(receiver), sym, genActualArgs(sym, args))
genApplyMethodMaybeStatically(genExpr(receiver), sym, genActualArgs(sym, args))
}
}

Expand Down Expand Up @@ -1789,7 +1793,7 @@ class JSCodeGen()(implicit ctx: Context) {

val genElems = tree.elems.map(genExpr)
val arrayTypeRef = toTypeRef(tree.tpe).asInstanceOf[jstpe.ArrayTypeRef]
js.ArrayValue(jstpe.ArrayType(arrayTypeRef), genElems)
js.ArrayValue(arrayTypeRef, genElems)
}

/** Gen JS code for a closure.
Expand Down Expand Up @@ -1877,7 +1881,8 @@ class JSCodeGen()(implicit ctx: Context) {

val genBody = {
val thisCaptureRef :: argCaptureRefs = formalCaptures.map(_.ref)
val call = genApplyMethod(thisCaptureRef, sym, argCaptureRefs ::: actualParams)
val call = genApplyMethodMaybeStatically(thisCaptureRef, sym,
argCaptureRefs ::: actualParams)
box(call, sym.info.finalResultType)
}

Expand All @@ -1892,7 +1897,7 @@ class JSCodeGen()(implicit ctx: Context) {
s"Invalid functional interface $funInterfaceSym reached the back-end")
val cls = "sjsr_AnonFunction" + formalParams.size
val ctor = js.Ident("init___sjs_js_Function" + formalParams.size)
js.New(jstpe.ClassType(cls), ctor, List(closure))
js.New(jstpe.ClassRef(cls), ctor, List(closure))
}
}

Expand Down Expand Up @@ -1993,30 +1998,41 @@ class JSCodeGen()(implicit ctx: Context) {
}
}

/** Gen a statically linked call to an instance method. */
private def genApplyMethodMaybeStatically(receiver: js.Tree, method: Symbol,
arguments: List[js.Tree])(implicit pos: Position): js.Tree = {
if (method.isPrivate || method.isClassConstructor)
genApplyMethodStatically(receiver, method, arguments)
else
genApplyMethod(receiver, method, arguments)
}

/** Gen a dynamically linked call to a Scala method. */
private def genApplyMethod(receiver: js.Tree,
methodSym: Symbol, arguments: List[js.Tree])(
private def genApplyMethod(receiver: js.Tree, method: Symbol,
arguments: List[js.Tree])(
implicit pos: Position): js.Tree = {
js.Apply(receiver, encodeMethodSym(methodSym), arguments)(
toIRType(patchedResultType(methodSym)))
assert(!method.isPrivate,
s"Cannot generate a dynamic call to private method $method at $pos")
js.Apply(js.ApplyFlags.empty, receiver, encodeMethodSym(method), arguments)(
toIRType(patchedResultType(method)))
}

/** Gen a statically linked call to an instance method. */
private def genApplyMethodStatically(receiver: js.Tree, method: Symbol,
arguments: List[js.Tree])(implicit pos: Position): js.Tree = {
val className = encodeClassFullName(method.owner)
val methodIdent = encodeMethodSym(method)
val resultType = toIRType(patchedResultType(method))
js.ApplyStatically(receiver, jstpe.ClassType(className),
methodIdent, arguments)(resultType)
val flags = js.ApplyFlags.empty
.withPrivate(method.isPrivate && !method.isClassConstructor)
.withConstructor(method.isClassConstructor)
js.ApplyStatically(flags, receiver, encodeClassRef(method.owner),
encodeMethodSym(method), arguments)(
toIRType(patchedResultType(method)))
}

/** Gen a call to a static method. */
private def genApplyStatic(method: Symbol, arguments: List[js.Tree])(
implicit pos: Position): js.Tree = {
val cls = jstpe.ClassType(encodeClassFullName(method.owner))
val methodIdent = encodeMethodSym(method)
js.ApplyStatic(cls, methodIdent, arguments)(
js.ApplyStatic(js.ApplyFlags.empty, encodeClassRef(method.owner),
encodeMethodSym(method), arguments)(
toIRType(patchedResultType(method)))
}

Expand Down Expand Up @@ -2264,7 +2280,7 @@ class JSCodeGen()(implicit ctx: Context) {
} else {
val inst = genLoadModule(sym.owner)
val method = encodeStaticMemberSym(sym)
js.Apply(inst, method, Nil)(toIRType(sym.info))
js.Apply(js.ApplyFlags.empty, inst, method, Nil)(toIRType(sym.info))
}
}

Expand All @@ -2279,13 +2295,13 @@ class JSCodeGen()(implicit ctx: Context) {

if (isJSType(sym)) {
if (isScalaJSDefinedJSClass(sym))
js.LoadJSModule(jstpe.ClassType(encodeClassFullName(sym)))
js.LoadJSModule(encodeClassRef(sym))
/*else if (sym.derivesFrom(jsdefn.JSGlobalScopeClass))
genLoadJSGlobal()*/
else
genLoadNativeJSModule(sym)
} else {
js.LoadModule(jstpe.ClassType(encodeClassFullName(sym)))
js.LoadModule(encodeClassRef(sym))
}
}

Expand All @@ -2294,7 +2310,7 @@ class JSCodeGen()(implicit ctx: Context) {
implicit pos: Position): js.Tree = {
assert(!isStaticModule(sym) && !sym.is(Trait),
s"genPrimitiveJSClass called with non-class $sym")
js.LoadJSConstructor(jstpe.ClassType(encodeClassFullName(sym)))
js.LoadJSConstructor(encodeClassRef(sym))
}

/** Gen JS code representing a native JS module. */
Expand Down Expand Up @@ -2331,11 +2347,12 @@ class JSCodeGen()(implicit ctx: Context) {
protected lazy val isHijackedClass: Set[Symbol] = {
/* This list is a duplicate of ir.Definitions.HijackedClasses, but
* with global.Symbol's instead of IR encoded names as Strings.
* We also add java.lang.Void, which BoxedUnit "erases" to.
*/
Set[Symbol](
defn.BoxedUnitClass, defn.BoxedBooleanClass, defn.BoxedCharClass, defn.BoxedByteClass,
defn.BoxedShortClass, defn.BoxedIntClass, defn.BoxedLongClass, defn.BoxedFloatClass,
defn.BoxedDoubleClass, defn.StringClass
defn.BoxedDoubleClass, defn.StringClass, jsdefn.JavaLangVoidClass
)
}

Expand Down
3 changes: 3 additions & 0 deletions compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ final class JSDefinitions()(implicit ctx: Context) {
lazy val NoinlineAnnotType: TypeRef = ctx.requiredClassRef("scala.noinline")
def NoinlineAnnot(implicit ctx: Context) = NoinlineAnnotType.symbol.asClass

lazy val JavaLangVoidType: TypeRef = ctx.requiredClassRef("java.lang.Void")
def JavaLangVoidClass(implicit ctx: Context) = JavaLangVoidType.symbol.asClass

lazy val ScalaJSJSPackageVal = ctx.requiredPackage("scala.scalajs.js")
lazy val ScalaJSJSPackageClass = ScalaJSJSPackageVal.moduleClass.asClass
lazy val JSPackage_typeOfR = ScalaJSJSPackageClass.requiredMethodRef("typeOf")
Expand Down
38 changes: 20 additions & 18 deletions compiler/src/dotty/tools/backend/sjs/JSEncoding.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,24 +146,17 @@ object JSEncoding {
}

private def encodeMethodNameInternal(sym: Symbol,
reflProxy: Boolean = false, inRTClass: Boolean = false)(
reflProxy: Boolean = false)(
implicit ctx: Context): (String, String) = {
require(sym.is(Flags.Method), "encodeMethodSym called with non-method symbol: " + sym)

def name = encodeMemberNameInternal(sym)

val encodedName = {
if (sym.isClassConstructor) {
"init_"
} else if (sym.is(Flags.Private)) {
(mangleJSName(name) + SignatureSep + "p" +
sym.owner.asClass.baseClasses.size.toString)
} else {
mangleJSName(name)
}
}
val encodedName =
if (sym.isClassConstructor) "init_"
else mangleJSName(name)

val paramsString = makeParamsString(sym, reflProxy, inRTClass)
val paramsString = makeParamsString(sym, reflProxy)

(encodedName, paramsString)
}
Expand Down Expand Up @@ -195,13 +188,24 @@ object JSEncoding {
}
}

def encodeClassRef(sym: Symbol)(implicit ctx: Context): jstpe.ClassRef =
jstpe.ClassRef(encodeClassFullName(sym))

def encodeClassFullNameIdent(sym: Symbol)(
implicit ctx: Context, pos: ir.Position): js.Ident = {
js.Ident(encodeClassFullName(sym), Some(sym.fullName.toString))
}

def encodeClassFullName(sym: Symbol)(implicit ctx: Context): String =
ir.Definitions.encodeClassName(sym.fullName.toString)
def encodeClassFullName(sym: Symbol)(implicit ctx: Context): String = {
if (sym == defn.BoxedUnitClass) {
/* Rewire scala.runtime.BoxedUnit to java.lang.Void, as the IR expects.
* BoxedUnit$ is a JVM artifact.
*/
ir.Definitions.BoxedUnitClass
} else {
ir.Definitions.encodeClassName(sym.fullName.toString)
}
}

private def encodeMemberNameInternal(sym: Symbol)(
implicit ctx: Context): String = {
Expand Down Expand Up @@ -320,15 +324,13 @@ object JSEncoding {

// Encoding of method signatures

private def makeParamsString(sym: Symbol, reflProxy: Boolean,
inRTClass: Boolean)(
private def makeParamsString(sym: Symbol, reflProxy: Boolean)(
implicit ctx: Context): String = {
val tpe = sym.info

val paramTypeNames0 = tpe.firstParamTypes.map(internalName(_))

val hasExplicitThisParameter =
inRTClass || isScalaJSDefinedJSClass(sym.owner)
val hasExplicitThisParameter = isScalaJSDefinedJSClass(sym.owner)
val paramTypeNames =
if (!hasExplicitThisParameter) paramTypeNames0
else encodeClassFullName(sym.owner) :: paramTypeNames0
Expand Down
5 changes: 0 additions & 5 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,11 +569,6 @@ object Build {
IO.createDirectory(trgDir)
IO.unzip(scalaJSIRSourcesJar, trgDir)

// Remove f interpolator macro call to avoid its expansion while compiling the compiler and the implementation of the f macro
val utilsFile = trgDir / "org/scalajs/ir/Utils.scala"
val patchedSource = IO.read(utilsFile).replace("""f"\\u$c%04x"""", """"\\u%04x".format(c)""")
IO.write(utilsFile, patchedSource)

(trgDir ** "*.scala").get.toSet
} (Set(scalaJSIRSourcesJar)).toSeq
}.taskValue,
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Scala IDE project file generator
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M6")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M7")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")

Expand Down