fix #2166: unpickling of shared CaseDef #2187
Merged
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
|
Missing test case? |
|
The pickling tests pass, but the bootstrap pickling failed. Need to investigate further. |
smarter
reviewed
Apr 4, 2017
| @@ -1062,7 +1062,13 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle | |||
| } | |||
|
|
|||
| def readCases(end: Addr)(implicit ctx: Context): List[CaseDef] = | |||
| collectWhile(nextByte == CASEDEF && currentAddr != end) { readCase()(ctx.fresh.setNewScope) } | |||
| collectWhile(nextByte == CASEDEF | nextByte == SHARED && currentAddr != end) { | |||
There was a problem hiding this comment.
And you also need to put parens in the correct place because && has higher precedence:
(nextByte == CASEDEF || nextByte == SHARED) && currentAddr != endThere was a problem hiding this comment.
Thanks a lot @smarter , I owe you a beer 👍 I will no longer claim I can write Scala in my CV :)
odersky
requested changes
Apr 6, 2017
| @@ -1062,7 +1062,13 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table, posUnpickle | |||
| } | |||
|
|
|||
| def readCases(end: Addr)(implicit ctx: Context): List[CaseDef] = | |||
| collectWhile(nextByte == CASEDEF && currentAddr != end) { readCase()(ctx.fresh.setNewScope) } | |||
| collectWhile((nextByte == CASEDEF || nextByte == SHARED) && currentAddr != end) { | |||
There was a problem hiding this comment.
You can simply use nextUnsharedTag for this.
collectWhile(nextUnsharedTag == CASEDEF && currentAddr != end) { readCase()(ctx.fresh.setNewScope) }
|
Sorry, that was a wrong comment. In fact your original version is the correct one. |
odersky
approved these changes
Apr 6, 2017
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.
Fix #2166: the unpickling of CaseDef should take care of SHARED trees.