Skip to content

add capture-checked scala.concurrent standard library classes #23089

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

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

add capture-checked scala.concurrent standard library classes #23089

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2679232
Copy over concurrency classes
05st Feb 4, 2025
0b5aa89
Port concurrency classes to use capture checking
05st Mar 20, 2025
bc42db7
Merge commit 'c9eaa14115c2654db4f54294b0571bc28a6051a4' into concurre…
05st Apr 4, 2025
51d3fd2
Finish porting concurrency classes without separation checking
05st Apr 9, 2025
295229f
Merge branch 'scala:main' into concurrency-cc
05st Apr 9, 2025
94dd70b
Transformation class + some separation checking fixes
05st Apr 24, 2025
7a55f7b
Brute force patches to make separation checker happy
natsukagami May 5, 2025
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
2 changes: 1 addition & 1 deletion scala2-library-cc/src/scala/concurrent/ExecutionContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,5 +294,5 @@ object ExecutionContext {
*
* @return the function for error reporting
*/
final val defaultReporter: Throwable => Unit = _.printStackTrace()
final val defaultReporter: Throwable -> Unit = _.printStackTrace()
}
10 changes: 5 additions & 5 deletions scala2-library-cc/src/scala/concurrent/impl/Promise.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ private[concurrent] object Promise {
/**
* Compresses this chain and returns the currently known root of this chain of Links.
**/
final def promise(owner: DefaultPromise[T]^): DefaultPromise[T]^{cap.rd, this, to, owner} = {
final def promise(owner: DefaultPromise[T]^): DefaultPromise[T]^{to, owner} = {
val c = get()
compressed(current = c, target = c, owner = owner)
}

/**
* The combination of traversing and possibly unlinking of a given `target` DefaultPromise.
**/
@inline @tailrec private[this] final def compressed(current: DefaultPromise[T]^{cap.rd, this}, target: DefaultPromise[T]^, owner: DefaultPromise[T]^): DefaultPromise[T]^{this, current, target, owner} = {
@inline @tailrec private[this] final def compressed(current: DefaultPromise[T]^{this, to}, target: DefaultPromise[T]^{cap, this, current}, owner: DefaultPromise[T]^): DefaultPromise[T]^{to, target, owner} = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should look into this more, I tried simplifying this signature but it seems separation checker is not trying to shorten paths

val value = target.get()
if (value.isInstanceOf[Callbacks[_]]) {
if (compareAndSet(current, target)) target // Link
Expand Down Expand Up @@ -151,7 +151,7 @@ private[concurrent] object Promise {
val buffer = new AtomicReference[Success[Any]]()
val zipped = new DefaultPromise[R]()

val thisF: Try[T] => Unit = {
val thisF: Try[T] ->{f} Unit = {
case left: Success[_] =>
val right = buffer.getAndSet(left).asInstanceOf[Success[U]]
if (right ne null)
Expand All @@ -160,7 +160,7 @@ private[concurrent] object Promise {
zipped.tryComplete(f.asInstanceOf[Failure[R]])
}

val thatF: Try[U] => Unit = {
val thatF: Try[U] ->{f} Unit = {
case right: Success[_] =>
val left = buffer.getAndSet(right).asInstanceOf[Success[T]]
if (left ne null)
Expand Down Expand Up @@ -349,7 +349,7 @@ private[concurrent] object Promise {

/** Link this promise to the root of another promise.
*/
@tailrec private[concurrent] final def linkRootOf(target: DefaultPromise[T]^, link: Link[T]^): Unit =
@tailrec private[concurrent] final def linkRootOf(target: DefaultPromise[T]^, link: Link[T]^{cap, target}): Unit =
if (this ne target) {
val state = get()
if (state.isInstanceOf[Try[_]]) {
Expand Down
Loading