[PATCH] D158363: [clang-format] Fix segmentation fault when formatting nested namespaces
Arkadiy Yudintsev via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Aug 24 05:41:02 PDT 2023
d0nc1h0t updated this revision to Diff 553085.
d0nc1h0t added a comment.
Added missing const + clang-format.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D158363/new/
https://reviews.llvm.org/D158363
Files:
clang/lib/Format/UnwrappedLineFormatter.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -4223,6 +4223,16 @@
"void foo() {}\n"
"} // namespace ns\n",
Style);
+
+ FormatStyle LLVMWithCompactInnerNamespace = getLLVMStyle();
+ LLVMWithCompactInnerNamespace.CompactNamespaces = true;
+ LLVMWithCompactInnerNamespace.NamespaceIndentation = FormatStyle::NI_Inner;
+ verifyFormat("namespace ns1 { namespace ns2 { namespace ns3 {\n"
+ "// block for debug mode\n"
+ "#ifndef NDEBUG\n"
+ "#endif\n"
+ "}}} // namespace ns1::ns2::ns3",
+ LLVMWithCompactInnerNamespace);
}
TEST_F(FormatTest, NamespaceMacros) {
Index: clang/lib/Format/UnwrappedLineFormatter.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineFormatter.cpp
+++ clang/lib/Format/UnwrappedLineFormatter.cpp
@@ -386,11 +386,14 @@
// Reduce indent level for bodies of namespaces which were compacted,
// but only if their content was indented in the first place.
auto *ClosingLine = AnnotatedLines.begin() + ClosingLineIndex + 1;
- auto OutdentBy = I[J]->Level - TheLine->Level;
+ const int OutdentBy = I[J]->Level - TheLine->Level;
+ assert(OutdentBy >= 0);
for (auto *CompactedLine = I + J; CompactedLine <= ClosingLine;
++CompactedLine) {
- if (!(*CompactedLine)->InPPDirective)
- (*CompactedLine)->Level -= OutdentBy;
+ if (!(*CompactedLine)->InPPDirective) {
+ const int Level = (*CompactedLine)->Level;
+ (*CompactedLine)->Level = std::max(Level - OutdentBy, 0);
+ }
}
}
return J - 1;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D158363.553085.patch
Type: text/x-patch
Size: 1921 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230824/7cc75fb9/attachment.bin>
More information about the cfe-commits
mailing list