New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #1928: show file name for NIR version mismatch during linking #1929
Merged
WojciechMazur
merged 5 commits into
scala-native:master
from
jokade:fix-nir-version-assertion
Jan 7, 2021
Merged
Fix #1928: show file name for NIR version mismatch during linking #1929
WojciechMazur
merged 5 commits into
scala-native:master
from
jokade:fix-nir-version-assertion
Jan 7, 2021
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
… linking - pass a `bufferName` to `BinarySerializer and use it to identify the file from which the NIR buffer was loaded - add property `uri` to `VirtualDirectory` and use it to derive an absolute `bufferName` for each NIR buffer read - print this `bufferName` when there is a NIR version mismatch in `Prelude.readFrom`
sjrd
reviewed
Oct 8, 2020
@@ -46,18 +46,24 @@ object ClassPath { | |||
def contains(name: Global) = | |||
files.contains(name.top) | |||
|
|||
private def makeBufferName(directory: VirtualDirectory, file: Path) = | |||
directory.uri.toString + file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Concatenating the string representation of a URI with the string representation of a Path does not seem right. Can we make that more semantic?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
sjrd
approved these changes
Oct 8, 2020
- correct `ClassPath.makeBufferName` (previous version printed all file names relative to cwd) - print expected and discovered NIR versions if there's a mismatch
ekrich
pushed a commit
to ekrich/scala-native
that referenced
this pull request
May 21, 2021
… linking (scala-native#1929) This PR fixes issue scala-native#1928, by showing file name for NIR version mismatch during linking. Changes include: - passing a `bufferName` to `BinarySerializer and use it to identify the file from which the NIR buffer was loaded - adding property `uri` to `VirtualDirectory` and use it to derive an absolute `bufferName` for each NIR buffer read - showing error message using `bufferName` when there is a NIR version mismatch in `Prelude.readFrom`
WojciechMazur
pushed a commit
to WojciechMazur/scala-native
that referenced
this pull request
Aug 25, 2021
… linking (scala-native#1929) This PR fixes issue scala-native#1928, by showing file name for NIR version mismatch during linking. Changes include: - passing a `bufferName` to `BinarySerializer and use it to identify the file from which the NIR buffer was loaded - adding property `uri` to `VirtualDirectory` and use it to derive an absolute `bufferName` for each NIR buffer read - showing error message using `bufferName` when there is a NIR version mismatch in `Prelude.readFrom`
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.
bufferName
toBinarySerializer
and use it to identify the file from which the NIR buffer was loadeduri
toVirtualDirectory
and use it to derive an absolutebufferName
for each NIR buffer readbufferName
when there is a NIR version mismatch inPrelude.readFrom