diff options
4 files changed, 24 insertions, 18 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 1852e670e4..5f079a428b 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1562,6 +1562,9 @@ class Global(var currentSettings: Settings, var reporter: Reporter) } } + /** Caching member symbols that are def-s in Defintions because they might change from Run to Run. */ + val runDefinitions: definitions.RunDefinitions = new definitions.RunDefinitions + /** Compile list of source files, * unless there is a problem already, * such as a plugin was passed a bad option. diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 8a3bba7d0f..dc60631421 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -337,6 +337,9 @@ trait Implicits { val undetParams = if (isView) Nil else context.outer.undetparams val wildPt = approximate(pt) + private val runDefintions = currentRun.runDefinitions + import runDefintions.{ TagMaterializers, TagSymbols, Predef_conforms, PartialManifestClass, ManifestSymbols } + def undet_s = if (undetParams.isEmpty) "" else undetParams.mkString(" inferring ", ", ", "") def tree_s = typeDebug ptTree tree def ctx_s = fullSiteString(context) @@ -806,7 +809,7 @@ trait Implicits { private def isIneligible(info: ImplicitInfo) = ( info.isCyclicOrErroneous - || isView && isPredefMemberNamed(info.sym, nme.conforms) + || isView && (info.sym eq Predef_conforms) || shadower.isShadowed(info.name) || (!context.macrosEnabled && info.sym.isTermMacro) ) @@ -1105,13 +1108,6 @@ trait Implicits { } } - private def TagSymbols = TagMaterializers.keySet - private val TagMaterializers = Map[Symbol, Symbol]( - ClassTagClass -> materializeClassTag, - WeakTypeTagClass -> materializeWeakTypeTag, - TypeTagClass -> materializeTypeTag - ) - /** Creates a tree will produce a tag of the requested flavor. * An EmptyTree is returned if materialization fails. */ @@ -1173,8 +1169,6 @@ trait Implicits { else SearchFailure } - private val ManifestSymbols = Set[Symbol](PartialManifestClass, FullManifestClass, OptManifestClass) - /** Creates a tree that calls the relevant factory method in object * scala.reflect.Manifest for type 'tp'. An EmptyTree is returned if * no manifest is found. todo: make this instantiate take type params as well? diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index ea680867da..9a382649d9 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -363,11 +363,7 @@ trait Definitions extends api.StandardDefinitions { def Predef_??? = getMemberMethod(PredefModule, nme.???) def Predef_implicitly = getMemberMethod(PredefModule, nme.implicitly) - /** Is `sym` a member of Predef with the given name? - * Note: DON't replace this by sym == Predef_conforms/etc, as Predef_conforms is a `def` - * which does a member lookup (it can't be a lazy val because we might reload Predef - * during resident compilations). - */ + @deprecated("use sym = currentRun.runDefinitions.Predef_xxx", "2.11.0") def isPredefMemberNamed(sym: Symbol, name: Name) = ( (sym.name == name) && (sym.owner == PredefModule.moduleClass) ) @@ -500,7 +496,6 @@ trait Definitions extends api.StandardDefinitions { def ReflectRuntimeUniverse = ReflectRuntimePackage.map(sym => getMemberValue(sym, nme.universe)) def ReflectRuntimeCurrentMirror = ReflectRuntimePackage.map(sym => getMemberMethod(sym, nme.currentMirror)) - lazy val PartialManifestClass = getTypeMember(ReflectPackage, tpnme.ClassManifest) lazy val PartialManifestModule = requiredModule[scala.reflect.ClassManifestFactory.type] lazy val FullManifestClass = requiredClass[scala.reflect.Manifest[_]] lazy val FullManifestModule = requiredModule[scala.reflect.ManifestFactory.type] @@ -1417,5 +1412,20 @@ trait Definitions extends api.StandardDefinitions { def universeMemberType(name: TypeName) = universe.tpe.memberType(getTypeMember(universe.symbol, name)) } + + /** Efficient access to member symbols which must be looked up each run. Access via `currentRun.runRefinitions` */ + final class RunDefinitions { + lazy val TagMaterializers = Map[Symbol, Symbol]( + ClassTagClass -> materializeClassTag, + WeakTypeTagClass -> materializeWeakTypeTag, + TypeTagClass -> materializeTypeTag + ) + lazy val TagSymbols = TagMaterializers.keySet + lazy val Predef_conforms = getMemberMethod(PredefModule, nme.conforms) + lazy val Predef_classOf = DefinitionsClass.this.Predef_classOf + + lazy val PartialManifestClass = getTypeMember(ReflectPackage, tpnme.ClassManifest) + lazy val ManifestSymbols = Set[Symbol](PartialManifestClass, FullManifestClass, OptManifestClass) + } } } diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala index 8fd58c42be..1f1f07c09a 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala @@ -304,7 +304,6 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => definitions.ReflectPackage definitions.ReflectApiPackage definitions.ReflectRuntimePackage - definitions.PartialManifestClass definitions.PartialManifestModule definitions.FullManifestClass definitions.FullManifestModule @@ -493,4 +492,4 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => erasure.verifiedJavaErasure erasure.boxingErasure } -}
\ No newline at end of file +} |