Fix backtrace line numbers following macros #30011
Merged
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
The `CodeInfo` block has a field `codelocs` that indexes into an array with full `LineInfoNode` objects. This data model allows de-duplication, and in practice it does (only) `uniq`-style deduplication, i.e. only consecutive equal objects are deduplicated by this scheme. The lambda `compact-ir` generates this structure. This commit fixes a bug where it mixes monotonously increasing the indices (for `codeloc`) with push/pop operations. This is wrong because the latest `LineInfoNode` object is always at the end of the current size of the array; not one position after the current `LineInfoNode`.
vtjnash
approved these changes
Nov 12, 2018
|
CI issues look unrelated; they seem related to type inference and only appear on the non-x86 architecture, which also take to be indicative of "unrelated to this PR". I think this PR is probably ready to go into master and into 1.0.x. |
fredrikekre
added
bugfix
|
Yes, that error is #29923, which is a real pain and not really "intermittent" anymore. |
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.
This is an attempt at fixing #28618 .
The
CodeInfoblock has a fieldcodelocsthat indexes into an array with fullLineInfoNodeobjects. This data model allows de-duplication, and in practice it does (only)uniq-style deduplication, i.e. only consecutive equal objects are deduplicated by this scheme.The lambda
compact-irgenerates this structure. This commit fixes a bug where it mixes monotonously increasing the indices (forcodeloc) with push/pop operations. This is wrong because the latestLineInfoNodeobject is always at the end of the current size of the array; not one position after the currentLineInfoNode.I have only tested my small test case as described in that bug report; I haven't run the full test suite and I also have only tested this patch on top of
release-1.0; not on top ofmaster. Just sending this out there hoping that others can spot any issues with my code asap.