Skip to content

Make lazy vals and object native image friendly #14780

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
May 16, 2022
Merged

Make lazy vals and object native image friendly #14780

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
6ace38e
Make lazy vals and object native image friendly
romanowski Mar 25, 2022
3cd853a
Fix failing MiMa
May 12, 2022
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
9 changes: 7 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/LazyVals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
val thizClass = Literal(Constant(claz.info))
val helperModule = requiredModule("scala.runtime.LazyVals")
val getOffset = Select(ref(helperModule), lazyNme.RLazyVals.getOffset)
val getOffsetStatic = Select(ref(helperModule), lazyNme.RLazyVals.getOffsetStatic)
var offsetSymbol: TermSymbol | Null = null
var flag: Tree = EmptyTree
var ord = 0
Expand All @@ -406,7 +407,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
val flagName = LazyBitMapName.fresh(id.toString.toTermName)
val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this)
flag = ValDef(flagSymbol, Literal(Constant(0L)))
val offsetTree = ValDef(offsetSymbol.nn, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString))))
val fieldTree = thizClass.select(lazyNme.RLazyVals.getDeclaredField).appliedTo(Literal(Constant(flagName.toString)))
val offsetTree = ValDef(offsetSymbol.nn, getOffsetStatic.appliedTo(fieldTree))
info.defs = offsetTree :: info.defs
}

Expand All @@ -416,7 +418,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
val flagName = LazyBitMapName.fresh("0".toTermName)
val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this)
flag = ValDef(flagSymbol, Literal(Constant(0L)))
val offsetTree = ValDef(offsetSymbol.nn, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString))))
val fieldTree = thizClass.select(lazyNme.RLazyVals.getDeclaredField).appliedTo(Literal(Constant(flagName.toString)))
val offsetTree = ValDef(offsetSymbol.nn, getOffsetStatic.appliedTo(fieldTree))
appendOffsetDefs += (claz -> new OffsetInfo(List(offsetTree), ord))
}

Expand Down Expand Up @@ -453,6 +456,8 @@ object LazyVals {
val state: TermName = N.state.toTermName
val cas: TermName = N.cas.toTermName
val getOffset: TermName = N.getOffset.toTermName
val getOffsetStatic: TermName = "getOffsetStatic".toTermName
val getDeclaredField: TermName = "getDeclaredField".toTermName
}
val flag: TermName = "flag".toTermName
val state: TermName = "state".toTermName
Expand Down
10 changes: 10 additions & 0 deletions library/src/scala/runtime/LazyVals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package scala.runtime

import scala.annotation.since

/**
* Helper methods used in thread-safe lazy vals.
*/
Expand Down Expand Up @@ -106,6 +108,14 @@ object LazyVals {
r
}

@since("3.2")
def getOffsetStatic(field: java.lang.reflect.Field) =
val r = unsafe.objectFieldOffset(field)
if (debug)
println(s"getOffset(${field.getDeclaringClass}, ${field.getName}) = $r")
r


object Names {
final val state = "STATE"
final val cas = "CAS"
Expand Down