Fix #4409: Do not emit abstract methods in non-native JS classes. #4425
Conversation
This file contains hidden or 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
gzm0
requested changes
Feb 11, 2021
| s.tpe.params.tail.zip(sym.tpe.params).forall { | ||
| case (sParam, symParam) => | ||
| sParam.tpe =:= symParam.tpe | ||
| if (isNonNativeJSClass(currentClassSym)) { |
There was a problem hiding this comment.
Could we avoid the nesting? (maybe by checking isAbstractMethod twice or putting it into a lazy val)?
| } else { | ||
| memberDefs0 | ||
| } | ||
|
|
There was a problem hiding this comment.
Do this inside readMemberDefs?
| case m @ MethodDef(_, name, _, _, _, None) => | ||
| if (!hacks.use14) { | ||
| throw new InvalidIRException(m, | ||
| "Invalid abstract method in non-native JS class") |
There was a problem hiding this comment.
Add a comment referencing #4388 that this should be there but currently can't?
ba11103 to
1cb55c8
Compare
|
Updated. In addition to addressing the comments, I had to rearrange the way the hack is done not to cause the Scala 2.11 compiler to crash. The upside is that it is easier to see exactly what will disappear when we can move the check to a ClassDefChecker. |
gzm0
approved these changes
Feb 11, 2021
| def readMemberDefs(owner: ClassName, ownerKind: ClassKind): List[MemberDef] = | ||
| List.fill(readInt())(readMemberDef(owner, ownerKind)) | ||
| def readMemberDefs(owner: ClassName, ownerKind: ClassKind): List[MemberDef] = { | ||
| val memberDefs0 = List.fill(readInt())(readMemberDef(owner, ownerKind)) |
There was a problem hiding this comment.
Not sure the 0 is still necessary. But up to you.
The deser hack is first always enabled, to test backward binary compatibility.
…ses. We condition the deser hack to reading IR with version < 1.5.0. When that hack is not enab 8A14 led and we find an abstract method in a non-native JS class, we immediately throw an exception, since the IR checker would not catch it as an issue.
1cb55c8 to
294efab
Compare
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.
@gzm0 Is this an appropriate way to fix this in 1.5? Throwing the exception would be moved to the
ClassDefCheckerin the future.