Skip to content

Commit 1dee611

Browse files
committed
[WIP] Upgrade backend for Java 9 support
This commit temporarily changes .gitmodules until lampepfl/scala#24 is merged.
1 parent a3a16a8 commit 1dee611

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "scala-backend"]
22
path = scala-backend
3-
url = https://github.com/lampepfl/scala.git
4-
branch = sharing-backend
3+
url = https://github.com/dotty-staging/scala.git
4+
branch = fix-java9-itf
55
[submodule "scala2-library"]
66
path = scala2-library
77
url = https://github.com/lampepfl/scala.git

compiler/src/dotty/tools/dotc/config/Settings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ object Settings {
132132
case (BooleanTag, _) =>
133133
update(true, args)
134134
case (OptionTag, _) =>
135-
update(Some(propertyClass.get.newInstance), args)
135+
update(Some(propertyClass.get.getConstructor().newInstance()), args)
136136
case (ListTag, _) =>
137137
if (argRest.isEmpty) missingArg
138138
else update((argRest split ",").toList, args)

compiler/src/dotty/tools/dotc/plugins/Plugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ object Plugin {
177177
/** Instantiate a plugin class, given the class and
178178
* the compiler it is to be used in.
179179
*/
180-
def instantiate(clazz: AnyClass): Plugin = clazz.newInstance.asInstanceOf[Plugin]
180+
def instantiate(clazz: AnyClass): Plugin = clazz.getConstructor().newInstance().asInstanceOf[Plugin]
181181
}
182182

183183
class PluginLoadException(val path: String, message: String, cause: Exception) extends Exception(message, cause) {

compiler/src/dotty/tools/dotc/quoted/QuoteDriver.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class QuoteDriver extends Driver {
3636

3737
val clazz = classLoader.loadClass(driver.outputClassName.toString)
3838
val method = clazz.getMethod("apply")
39-
val instance = clazz.newInstance()
39+
val instance = clazz.getConstructor().newInstance()
4040

4141
method.invoke(instance).asInstanceOf[T]
4242
}

compiler/src/dotty/tools/dotc/transform/Splicer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ object Splicer {
125125
} else {
126126
// nested object in an object
127127
val clazz = loadClass(sym.fullNameSeparated(FlatName))
128-
(clazz, clazz.newInstance().asInstanceOf[Object])
128+
(clazz, clazz.getConstructor().newInstance().asInstanceOf[Object])
129129
}
130130
}
131131

0 commit comments

Comments
 (0)