Quick-fix #2704, to get Olaf unblocked. #2762
Conversation
There was a problem hiding this comment.
Hello, and thank you for opening this PR! 🎉
All contributors have signed the CLA, thank you! ❤️
Commit Messages
We want to keep history, but for that to actually be useful we have
some rules on how to format our commit messages (relevant xkcd).
Please stick to these guidelines for commit messages:
- Separate subject from body with a blank line
- When fixing an issue, start your commit message with
Fix #<ISSUE-NBR>:- Limit the subject line to 72 characters
- Capitalize the subject line
- Do not end the subject line with a period
- Use the imperative mood in the subject line ("Added" instead of "Add")
- Wrap the body at 80 characters
- Use the body to explain what and why vs. how
adapted from https://chris.beams.io/posts/git-commit
Have an awesome day! ☀️
| @@ -224,7 +224,8 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma | |||
| def shouldEmitAnnotation(annot: Annotation): Boolean = { | |||
| annot.symbol.isJavaDefined && | |||
| retentionPolicyOf(annot) != AnnotationRetentionSourceAttr && | |||
| annot.args.isEmpty | |||
| annot.args.isEmpty && | |||
| !annot.tree.isInstanceOf[Block] // unblocking Olaf, needs a proper fix | |||
There was a problem hiding this comment.
Does this mean the @Fork annotation is not emitted to bytecode? I think the annotation is necessary for the jmh benchmarks to run.
It might also be good to reference the issue in the comment.
| @@ -527,10 +527,17 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma | |||
|
|
|||
| def assocsFromApply(tree: Tree) = { | |||
| tree match { | |||
| case Block(_, expr) => assocsFromApply(expr) | |||
There was a problem hiding this comment.
This produces compile-errors when I run dotty-compiler-bootstrapped/publishLocal
[error] /Users/ollie/dev/dotty/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala:530: recursive method assocsFromApply needs result type
[error] case Block(_, expr) => assocsFromApply(expr)
[error] ^Should I be running a different command?
|
@DarkDimius Can we get this in? |
|
I am unable to reproduce the scala/compiler-benchmark match error with this fix. Instead, a new assertion error appears in DottyBackendInterface, but that's a separate issue. |
|
@OlivierBlanvillain thanks for helping out. I think we should get this in: it fixes compilation crash. |
OlivierBlanvillain
force-pushed
the
unblock-olaf
branch
from
0f59275 to
7a23b29
Compare
Fix #2762: Make sure constrainResult does not change context when false
This is not a proper fix, it just fixes the crash.
We need to figure out why this happens and handle it correctly.