Fix rebase breakage

odersky · odersky · commit 63dc37b2bdfc · 2019-01-25T15:05:42.000+01:00
diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
@@ -2270,9 +2270,9 @@ class JSCodeGen()(implicit ctx: Context) {
     if (sym == defn.BoxedUnit_UNIT) {
       js.Undefined()
     } else {
-      val instance = genLoadModule(sym.owner)
+      val inst = genLoadModule(sym.owner)
       val method = encodeStaticMemberSym(sym)
-      js.Apply(instance, method, Nil)(toIRType(sym.info))
+      js.Apply(inst, method, Nil)(toIRType(sym.info))
     }
   }
 
diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist
@@ -10,3 +10,4 @@ t3249
 t3486
 t3612.scala
 typelevel0.scala
+reference

Original file line number	Diff line number	Diff line change
`@@ -2270,9 +2270,9 @@ class JSCodeGen()(implicit ctx: Context) {`
`2270`	`2270`	`if (sym == defn.BoxedUnit_UNIT) {`
`2271`	`2271`	`js.Undefined()`
`2272`	`2272`	`} else {`
`2273`		`- val instance = genLoadModule(sym.owner)`
	`2273`	`+ val inst = genLoadModule(sym.owner)`
`2274`	`2274`	`val method = encodeStaticMemberSym(sym)`
`2275`		`- js.Apply(instance, method, Nil)(toIRType(sym.info))`
	`2275`	`+ js.Apply(inst, method, Nil)(toIRType(sym.info))`
`2276`	`2276`	`}`
`2277`	`2277`	`}`
`2278`	`2278`