Merged
Conversation
* Support #line in rebuild This adds proper support for handling `#line` and `#ExternalSource` directives during rebuild scenarios. There are actually two different problems that need to be solved here. The first is handling of the paths in the `NormalizePath` operation. The names used in these directives can be relative paths. That means during initial compilation they are normalized in the context of the containing file name. That always succeeds because in initial compilation the containing file name is a legal file path. During rebuild though the containing file name may not be a legal path; it could be running a rebuild where `/pathmap` was used to create non-legal paths on the current operating system. Hence if nothing is done then normalization will return the literal name in the source file. That causes conflicts because the same name can be used in different files in different directories. Hence we need to provide a `SourceReferenceResolver` that gives unique paths for every `#line` pairing. The second is that we need to add back in the non-source file documents into the PDB after the source files are written. That requires extra data being passed down to the emit phase
This parameter was tied to the `rebuildData` parameter. Don't think the added flexibility is worth it here particularly since there are no plans to ever take advantage of it. Keying that behavior off of `rebuildData` now.
This pull request was closed.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This is an automatically generated pull request from release/dev16.11 into main.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout merges/release/dev16.11-to-main git reset --hard upstream/main git merge upstream/release/dev16.11 # Fix merge conflicts git commit git push upstream merges/release/dev16.11-to-main --force