Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add LinkedClass.hasDirectInstances. #4960

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 2 commits into from
Mar 16, 2024
Merged

Add LinkedClass.hasDirectInstances. #4960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af924f4
Add LinkedClass.hasDirectInstances.
sjrd Mar 15, 2024
f05baed
Only set `$c_C.prototype.$classData` if `C` has *direct* instances.
sjrd Mar 15, 2024
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
4 changes: 2 additions & 2 deletions linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/ClassEmitter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {

def genTypeData(className: ClassName, kind: ClassKind,
superClass: Option[ClassIdent], ancestors: List[ClassName],
jsNativeLoadSpec: Option[JSNativeLoadSpec], hasInstances: Boolean)(
jsNativeLoadSpec: Option[JSNativeLoadSpec], hasDirectInstances: Boolean)(
implicit moduleContext: ModuleContext,
globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[List[js.Tree]] = {
import TreeDSL._
Expand All @@ -847,7 +847,7 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {
val kindOrCtorParam = {
if (isJSType) js.IntLiteral(2)
else if (kind == ClassKind.Interface) js.IntLiteral(1)
else if (kind.isClass && hasInstances) globalVar(VarField.c, className)
else if (kind.isClass && hasDirectInstances) globalVar(VarField.c, className)
else js.IntLiteral(0)
}

Expand Down
4 changes: 2 additions & 2 deletions linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,14 +716,14 @@ final class Emitter[E >: Null <: js.Tree](

if (linkedClass.hasRuntimeTypeInfo) {
main ++= extractWithGlobals(classTreeCache.typeData.getOrElseUpdate(
linkedClass.hasInstances,
linkedClass.hasDirectInstances,
classEmitter.genTypeData(
className, // invalidated by overall class cache (part of ancestors)
kind, // invalidated by class version
linkedClass.superClass, // invalidated by class version
linkedClass.ancestors, // invalidated by overall class cache (identity)
linkedClass.jsNativeLoadSpec, // invalidated by class version
linkedClass.hasInstances // invalidated directly (it is the input to `getOrElseUpdate`)
linkedClass.hasDirectInstances // invalidated directly (it is the input to `getOrElseUpdate`)
)(moduleContext, classCache, linkedClass.pos).map(postTransform(_, 0))))
}
}
Expand Down
1 change: 1 addition & 0 deletions linker/shared/src/main/scala/org/scalajs/linker/frontend/BaseLinker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ private[frontend] object BaseLinker {
classDef.pos,
ancestors.toList,
hasInstances = classInfo.isAnySubclassInstantiated,
hasDirectInstances = classInfo.isInstantiated,
hasInstanceTests = classInfo.areInstanceTestsUsed,
hasRuntimeTypeInfo = classInfo.isDataAccessed,
fieldsRead = classInfo.fieldsRead.toSet,
Expand Down
1 change: 1 addition & 0 deletions linker/shared/src/main/scala/org/scalajs/linker/standard/LinkedClass.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ final class LinkedClass(
// Actual Linking info
val ancestors: List[ClassName],
val hasInstances: Boolean,
val hasDirectInstances: Boolean,
val hasInstanceTests: Boolean,
val hasRuntimeTypeInfo: Boolean,
val fieldsRead: Set[FieldName],
Expand Down
3 changes: 3 additions & 0 deletions project/BinaryIncompatibilities.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ object BinaryIncompatibilities {
)

val Linker = Seq(
// !!! Breaking, OK in minor release
ProblemFilters.exclude[DirectMissingMethodProblem]("org.scalajs.linker.standard.LinkedClass.this"),

// private, not an issue
ProblemFilters.exclude[DirectMissingMethodProblem]("org.scalajs.linker.standard.CommonPhaseConfig.this"),
)
Expand Down