[BoundsSafety] Fix diagnostics test failures #10528
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
In fceb9ce upstream changed the diagnostic engine to always wrap expressions in single quotes. We already had manual wrapping for most of those, so the manual single quotes needed to be removed. In other placed the test cases needed to be updated to reflect the new output. rdar://149359009
hnrklssn
added
the
clang:bounds-safety
Member
Author
|
@swift-ci please test llvm |
delcypher
approved these changes
Apr 23, 2025
delcypher
left a comment
delcypher
left a comment
There was a problem hiding this comment.
I think the double single quotes looks a little weird but I think we should land the test fixes first and debate this separately. These tests being broken is blocking me so I'd rather we just landed this.
| def err_bounds_safety_terminated_by_terminator_mismatch : Error< | ||
| "array '%0' with '__terminated_by' attribute is initialized with an " | ||
| "incorrect terminator (expected: %1; got %2)">; | ||
| "incorrect terminator (expected: %quoted1; got %quoted2)">; |
There was a problem hiding this comment.
This seems new. Looking at the implementation it looks like this just adds single quotes around the argument. Presumably this is related to llvm#134769 (comment) and now we have double single quotes in the outputted diagnostics?
| // expected-error@+5{{array 'qux2.foo.a' with '__terminated_by' attribute is initialized with an incorrect terminator (expected: '0'; got '1')}} | ||
| // expected-error@+4{{array 'qux2.foo.b' with '__terminated_by' attribute is initialized with an incorrect terminator (expected: '42'; got '2')}} | ||
| // expected-error@+3{{array 'qux2.bar.a' with '__terminated_by' attribute is initialized with an incorrect terminator (expected: '0'; got '3')}} | ||
| // expected-error@+2{{array 'qux2.baz.a' with '__terminated_by' attribute is initialized with an incorrect terminator (expected: ''X''; got '0')}} |
There was a problem hiding this comment.
Ok so the character literal is double single quoted, and the integer literal is single quoted. It looks a little weird but I guess this is consistent with what upstream currently has.
|
For macOS @hnrklssn Are these failures unrelated? |
Upstream now folds (gep inbounds null, X) -> null. This updates our O2 tests to reflect the new output. Caused by 5a99355 (llvm#130742).
Member
Author
These seem unrelated, the others should be fixed now. Merging to unblock. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
In fceb9ce (llvm#134769) upstream changed the diagnostic engine to always wrap expressions in single quotes. We already had manual wrapping for most of those, so the manual single quotes needed to be removed. In other placed the test cases needed to be updated to reflect the new output.
rdar://149359009