Fix SI-4581. #1201
Merged
Fix SI-4581. #1201
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Specifically, the final flag on the generated static field is no longer ommitted. Fix 2 failing test-cases.
|
Started jenkins job pr-rangepos at https://scala-webapps.epfl.ch/jenkins/job/pr-rangepos/289/ |
|
Started jenkins job pr-scala-testsuite-linux-opt at https://scala-webapps.epfl.ch/jenkins/job/pr-scala-testsuite-linux-opt/998/ |
|
jenkins job pr-rangepos: Success - https://scala-webapps.epfl.ch/jenkins/job/pr-rangepos/289/ |
|
jenkins job pr-scala-testsuite-linux-opt: Success - https://scala-webapps.epfl.ch/jenkins/job/pr-scala-testsuite-linux-opt/998/ |
|
Ping @paulp |
| @@ -768,7 +773,8 @@ abstract class CleanUp extends Transform with ast.TreeDSL { | |||
| staticSym <- clazz.info.decls | |||
| if staticSym.hasStaticAnnotation | |||
| } staticSym match { | |||
| case stfieldSym if stfieldSym.isVariable => | |||
| case stfieldSym if (stfieldSym.isValue && !stfieldSym.isMethod) || stfieldSym.isVariable => | |||
There was a problem hiding this comment.
I think there are (very recently) methods such that this logic could be if x.isVal || x.isVar.
|
Looks OK to me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Specifically, the final flag on the generated static field
is no longer ommitted.
Fix 2 failing test-cases.
Empty check file
t4581.checkis there until we fix https://issues.scala-lang.org/browse/SI-6289.Review by @paulp.