Skip to content

Fix REPL interrupt instrumentation conditional#24837

Merged
WojciechMazur merged 1 commit intoscala:mainfrom
lihaoyi:fix-instrument
Dec 27, 2025
Merged

Fix REPL interrupt instrumentation conditional#24837
WojciechMazur merged 1 commit intoscala:mainfrom
lihaoyi:fix-instrument

Conversation

@lihaoyi
Copy link
Copy Markdown
Contributor

@lihaoyi lihaoyi commented Dec 27, 2025 •
edited
Loading

Fixes a regression in #24514, which occurred in 3.8.0-RC3. We mixed up the double-negative when porting the conditional from a string-equality-check to the setting.is-check

Reproducted the problem and tested the fix manually via

sbt --client scala3-compiler-bootstrapped-new/publishLocalBin &&
sbt --client scala-library-bootstrapped/publishLocalBin &&
sbt --client scala3-library-bootstrapped-new/publishLocalBin &&
sbt --client tasty-core-bootstrapped-new/publishLocalBin &&
sbt --client scala3-repl/publishLocalBin &&
java -cp $(cs fetch -p org.scala-lang:scala3-repl_3:3.8.1-RC1-bin-SNAPSHOT) dotty.tools.repl.Main -cp $(cs fetch -p org.scala-lang:scala3-repl_3:3.8.1-RC1-bin-SNAPSHOT)
scala> while(true)()
^C
Attempting to interrupt running thread with `Thread.interrupt`
java.lang.ThreadDeath
  at dotty.tools.repl.StopRepl.throwIfReplStopped(StopRepl.scala:17)
  ... 30 elided

CC @WojciechMazur since you're the author of the original PR, would be nice to get this into 3.8.0-RC5

@lihaoyi lihaoyi mentioned this pull request Dec 27, 2025
Closed
@lihaoyi
Copy link
Copy Markdown
Contributor Author

lihaoyi commented Dec 27, 2025

failure is a flake

@WojciechMazur WojciechMazur added the backport:nominated If we agree to backport this PR, replace this tag with "backport:accepted", otherwise delete it. label Dec 27, 2025
@WojciechMazur WojciechMazur added this to the 3.8.0 milestone Dec 27, 2025
@WojciechMazur WojciechMazur merged commit e73ff2c into scala:main Dec 27, 2025
95 of 96 checks passed
@lihaoyi lihaoyi mentioned this pull request Dec 28, 2025
Closed
WojciechMazur pushed a commit that referenced this pull request Dec 30, 2025
@lihaoyi @WojciechMazur
Fix REPL interrupt instrumentation conditional (#24837)
b969b26 
Fixes a regression in #24514, which occurred in 3.8.0-RC3. We mixed up
the double-negative when porting the conditional from a
string-equality-check to the `setting.is`-check

[Cherry-picked e73ff2c]
@WojciechMazur WojciechMazur mentioned this pull request Dec 30, 2025
Merged
@WojciechMazur WojciechMazur added backport:accepted This PR needs to be backported, once it's been backported replace this tag by "backport:done" and removed backport:nominated If we agree to backport this PR, replace this tag with "backport:accepted", otherwise delete it. labels Dec 30, 2025
WojciechMazur pushed a commit that referenced this pull request Dec 30, 2025
@lihaoyi @WojciechMazur
Fix REPL interrupt instrumentation conditional (#24837)
5e94c2c 
Fixes a regression in #24514, which occurred in 3.8.0-RC3. We mixed up
the double-negative when porting the conditional from a
string-equality-check to the `setting.is`-check

[Cherry-picked e73ff2c]
WojciechMazur added a commit that referenced this pull request Dec 31, 2025
@WojciechMazur
Backport "Fix REPL interrupt instrumentation conditional" to 3.8.0 (#…
78918d9 
…24865)

Backports #24837 to the 3.8.0-RC5.

PR submitted by the release tooling.
[skip ci]
@WojciechMazur WojciechMazur added backport:done This PR was successfully backported. and removed backport:accepted This PR needs to be backported, once it's been backported replace this tag by "backport:done" labels Dec 31, 2025
WojciechMazur pushed a commit that referenced this pull request Jan 13, 2026
@lihaoyi @WojciechMazur
Fix REPL interrupt instrumentation conditional (#24837)
c6ee73e 
Fixes a regression in #24514, which occurred in 3.8.0-RC3. We mixed up
the double-negative when porting the conditional from a
string-equality-check to the `setting.is`-check

[Cherry-picked e73ff2c]
@WojciechMazur WojciechMazur mentioned this pull request Jan 13, 2026
Merged
WojciechMazur added a commit that referenced this pull request Jan 13, 2026
@WojciechMazur
Backport "Fix REPL interrupt instrumentation conditional" to 3.8.1 (#…
ed304a9 
…24956)

Backports #24837 to the 3.8.1-RC1.

PR submitted by the release tooling.
[skip ci]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@WojciechMazur WojciechMazur WojciechMazur approved these changes

Assignees

No one assigned

Labels

backport:done This PR was successfully backported.

Projects

None yet

Milestone

3.8.0

Development

Successfully merging this pull request may close these issues.

4 participants

@lihaoyi @WojciechMazur @tgodzik @Kordyjan