Skip to content

Avoid recomputations of definitions #9620

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 3 commits into from
Aug 25, 2020
Merged

Avoid recomputations of definitions #9620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
daa5f79
Cache all required classes in Definitions
odersky Jul 29, 2020
5851da3
Move required... calls from Space to Definitions
odersky Jul 29, 2020
dcb339e
Update compiler/src/dotty/tools/dotc/core/Denotations.scala
odersky Aug 24, 2020
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
11 changes: 7 additions & 4 deletions compiler/src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,10 +390,10 @@ class Definitions {
@tu lazy val Predef_identity : Symbol = ScalaPredefModule.requiredMethod(nme.identity)
@tu lazy val Predef_undefined: Symbol = ScalaPredefModule.requiredMethod(nme.???)

def SubTypeClass(using Context): ClassSymbol = requiredClass("scala.<:<")
@tu lazy val SubTypeClass: ClassSymbol = requiredClass("scala.<:<")
@tu lazy val SubType_refl: Symbol = SubTypeClass.companionModule.requiredMethod(nme.refl)

def DummyImplicitClass(using Context): ClassSymbol = requiredClass("scala.DummyImplicit")
@tu lazy val DummyImplicitClass: ClassSymbol = requiredClass("scala.DummyImplicit")

@tu lazy val ScalaRuntimeModule: Symbol = requiredModule("scala.runtime.ScalaRunTime")
def runtimeMethodRef(name: PreName): TermRef = ScalaRuntimeModule.requiredMethodRef(name)
Expand Down Expand Up @@ -431,8 +431,11 @@ class Definitions {
methodNames.map(getWrapVarargsArrayModule.requiredMethod(_))
})

@tu lazy val ListModule: Symbol = requiredModule("scala.collection.immutable.List")
@tu lazy val NilModule: Symbol = requiredModule("scala.collection.immutable.Nil")
@tu lazy val ListClass: Symbol = requiredClass("scala.collection.immutable.List")
@tu lazy val ListModule: Symbol = requiredModule("scala.collection.immutable.List")
@tu lazy val NilModule: Symbol = requiredModule("scala.collection.immutable.Nil")
@tu lazy val ConsClass: Symbol = requiredClass("scala.collection.immutable.::")
@tu lazy val SeqFactoryClass: Symbol = requiredClass("scala.collection.SeqFactory")

@tu lazy val SingletonClass: ClassSymbol =
// needed as a synthetic class because Scala 2.x refers to it in classfiles
Expand Down
1 change: 1 addition & 0 deletions compiler/src/dotty/tools/dotc/core/Denotations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,7 @@ object Denotations {
recur(path)
}


/** If we are looking for a non-existing term name in a package,
* assume it is a package for which we do not have a directory and
* enter it.
Expand Down
8 changes: 4 additions & 4 deletions compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ class SpaceEngine(using Context) extends SpaceLogic {
import tpd._
import SpaceEngine._

private val scalaSeqFactoryClass = requiredClass("scala.collection.SeqFactory")
private val scalaListType = requiredClassRef("scala.collection.immutable.List")
private val scalaNilType = requiredModuleRef("scala.collection.immutable.Nil")
private val scalaConsType = requiredClassRef("scala.collection.immutable.::")
private val scalaSeqFactoryClass = defn.SeqFactoryClass
private val scalaListType = defn.ListClass.typeRef
private val scalaNilType = defn.NilModule.termRef
private val scalaConsType = defn.ConsClass.typeRef

private val constantNullType = ConstantType(Constant(null))
private val constantNullSpace = Typ(constantNullType)
Expand Down