Skip to content
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
merged 5 commits into from Jan 7, 2021

Conversation

jokade
Copy link
Contributor

@jokade jokade commented Oct 8, 2020

  • 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

… 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`
@@ -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
Copy link
Collaborator

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

sjrd
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
@WojciechMazur WojciechMazur merged commit 78c8427 into scala-native:master Jan 7, 2021
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants