Scala requires compilation unit to generate fresh symbol

scala · Nov 20, 2014 · 9986e7d · 9986e7d · scala-jenkins · Nov 20, 2014
1 parent b1d096f
commit 9986e7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeSkelBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeSkelBuilder.scala
@@ -368,7 +368,8 @@ trait BCodeSkelBuilder extends BCodeHelpers {
        * The invoker must make sure inner classes are tracked for the sym's tpe.
        */
       def makeLocal(tk: BType, name: String): Symbol = {
-        val locSym = methSymbol.freshLocal(name, NoPosition, Flag_SYNTHETIC) // setInfo tpe
+
+        val locSym = methSymbol.freshLocal(cunit, name, NoPosition, Flag_SYNTHETIC) // setInfo tpe
         makeLocal(locSym, tk)
         locSym
       }

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BackendInterface.scala b/src/compiler/scala/tools/nsc/backend/jvm/BackendInterface.scala
@@ -505,7 +505,7 @@ trait BackendInterface extends BackendInterfaceDefinitions{
     def serialVUID: Option[Long]
 
 
-    def freshLocal(name: String, pos: Position, flags: Flags): Symbol
+    def freshLocal(cunit: CompilationUnit, name: String, pos: Position, flags: Flags): Symbol
 
     def getter(clz: Symbol): Symbol
     def setter(clz: Symbol): Symbol
@@ -702,7 +702,7 @@ trait BackendInterfaceDefinitions { self: BackendInterface =>
   val BoxedFloatClass: Symbol = requiredClass[java.lang.Float]
   val BoxedDoubleClass: Symbol = requiredClass[java.lang.Double]
   val StringClass: Symbol = requiredClass[java.lang.String]
-  val StringBuilderClass: Symbol = requiredClass[java.lang.StringBuilder]
+  val StringBuilderClass: Symbol = requiredClass[scala.collection.mutable.StringBuilder]
   val ThrowableClass: Symbol = requiredClass[java.lang.Throwable]
   val JavaCloneableClass: Symbol = requiredClass[java.lang.Cloneable]
   val NullPointerExceptionClass: Symbol  = requiredClass[java.lang.NullPointerException]

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/ScalacBackendInterface.scala b/src/compiler/scala/tools/nsc/backend/jvm/ScalacBackendInterface.scala
@@ -427,10 +427,9 @@ class ScalacBackendInterface[G <: Global](val global: G) extends BackendInterfac
   override def boxMethods = currentRun.runDefinitions.boxMethod
 
   // (class, method)
-  override def unboxMethods = currentRun.runDefinitions.boxMethod
+  override def unboxMethods = currentRun.runDefinitions.unboxMethod
 
   trait ScalacSymbolHelper extends SymbolHelper {
-
     def sym: Symbol
 
      // names
@@ -519,7 +518,9 @@ class ScalacBackendInterface[G <: Global](val global: G) extends BackendInterfac
     def outputDirectory: AbstractFile = settings.outputDirs outputDirFor enteringFlatten(sym.sourceFile)
 
 
-    def freshLocal(name: String, pos: Position, flags: Flags): Symbol = sym.freshLocal(name, pos, flags)
+    def freshLocal(cunit: CompilationUnit, name: String, pos: Position, flags: Flags): Symbol = {
+      sym.newVariable(cunit.freshTermName(name), pos, flags)
+    }
 
     def setter(clz: Symbol): Symbol = sym.setterIn(clz)