llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Alexander Kornienko (alexfh) <details> <summary>Changes</summary> This manifested as an assertion failure in Clang built against libc++ with hardening enabled (e.g. -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG): `libcxx/include/__memory/unique_ptr.h:596: assertion __checker_.__in_bounds(std::__to_address(__ptr_), __i) failed: unique_ptr<T[]>::operator[](index): index out of range` --- Full diff: https://github.com/llvm/llvm-project/pull/111581.diff 2 Files Affected: - (modified) clang/lib/Frontend/TextDiagnostic.cpp (+3-3) - (added) clang/test/Frontend/highlight-text.c (+27) ``````````diff diff --git a/clang/lib/Frontend/TextDiagnostic.cpp b/clang/lib/Frontend/TextDiagnostic.cpp index a264836a54398f..4119ce6048d45d 100644 --- a/clang/lib/Frontend/TextDiagnostic.cpp +++ b/clang/lib/Frontend/TextDiagnostic.cpp @@ -1252,10 +1252,10 @@ highlightLines(StringRef FileData, unsigned StartLineNumber, for (unsigned I = 0; I <= Spelling.size(); ++I) { // This line is done. if (I == Spelling.size() || isVerticalWhitespace(Spelling[I])) { - SmallVector<TextDiagnostic::StyleRange> &LineRanges = - SnippetRanges[L - StartLineNumber]; - if (L >= StartLineNumber) { + SmallVector<TextDiagnostic::StyleRange> &LineRanges = + SnippetRanges[L - StartLineNumber]; + if (L == TokenStartLine) // First line appendStyle(LineRanges, T, StartCol, LineLength); else if (L == TokenEndLine) // Last line diff --git a/clang/test/Frontend/highlight-text.c b/clang/test/Frontend/highlight-text.c new file mode 100644 index 00000000000000..a81d26caa4c24c --- /dev/null +++ b/clang/test/Frontend/highlight-text.c @@ -0,0 +1,27 @@ +// RUN: %clang_cc1 -fsyntax-only %s 2> %t +// RUN: FileCheck < %t %s +#define F (1 << 99) + +#define M \ +F | F + +int a = M; +// CHECK: :8:9: warning: shift count >= width of type [-Wshift-count-overflow] +// CHECK-NEXT: 8 | int a = M; +// CHECK-NEXT: | ^ +// CHECK-NEXT: :5:11: note: expanded from macro 'M' +// CHECK-NEXT: 5 | #define M \ +// CHECK-NEXT: | ^ +// CHECK-NEXT: :3:14: note: expanded from macro '\ +// CHECK-NEXT: F' +// CHECK-NEXT: 3 | #define F (1 << 99) +// CHECK-NEXT: | ^ ~~ +// CHECK-NEXT: :8:9: warning: shift count >= width of type [-Wshift-count-overflow] +// CHECK-NEXT: 8 | int a = M; +// CHECK-NEXT: | ^ +// CHECK-NEXT: :6:5: note: expanded from macro 'M' +// CHECK-NEXT: 6 | F | F +// CHECK-NEXT: | ^ +// CHECK-NEXT: :3:14: note: expanded from macro 'F' +// CHECK-NEXT: 3 | #define F (1 << 99) +// CHECK-NEXT: | ^ ~~ `````````` </details> https://github.com/llvm/llvm-project/pull/111581 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
