Author: Owen Pan Date: 2024-12-21T17:16:29-08:00 New Revision: 40acaa394fa235796c2d98de87380887c59d5448
URL: https://github.com/llvm/llvm-project/commit/40acaa394fa235796c2d98de87380887c59d5448 DIFF: https://github.com/llvm/llvm-project/commit/40acaa394fa235796c2d98de87380887c59d5448.diff LOG: [clang-format] Fix a crash in `QualifierAlignment: Right` (#120821) Fixes #120793. Added: Modified: clang/lib/Format/QualifierAlignmentFixer.cpp clang/unittests/Format/QualifierFixerTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index 593f8efff25aa9..530b2dd538cee0 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.cpp +++ b/clang/lib/Format/QualifierAlignmentFixer.cpp @@ -348,7 +348,7 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight( } } - if (Next->is(tok::kw_auto)) + if (Next && Next->is(tok::kw_auto)) TypeToken = Next; // Place the Qualifier at the end of the list of qualifiers. diff --git a/clang/unittests/Format/QualifierFixerTest.cpp b/clang/unittests/Format/QualifierFixerTest.cpp index f9255c6e4c7088..9ed567445eb07e 100644 --- a/clang/unittests/Format/QualifierFixerTest.cpp +++ b/clang/unittests/Format/QualifierFixerTest.cpp @@ -531,6 +531,11 @@ TEST_F(QualifierFixerTest, RightQualifier) { verifyFormat("float (C::*const p)(int);", Style); verifyFormat("float (C::*p)(int) const;", Style); verifyFormat("float const (C::*p)(int);", "const float (C::*p)(int);", Style); + + Style.BreakBeforeBraces = FormatStyle::BS_Custom; + Style.BraceWrapping.AfterFunction = true; + verifyFormat("auto foo() -> T const { return bar; }", + "auto foo() -> const T { return bar; }", Style); } TEST_F(QualifierFixerTest, LeftQualifier) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
