This is an archive of the discontinued LLVM Phabricator instance.

Differential D118245

[clang][DeclPrinter] Fix printing for noexcept expressions
ClosedPublic

Authored by kadircet on Jan 26 2022, 6:30 AM.

Details

Reviewers
kbobyrev
Commits
rGb777d354f670: [clang][DeclPrinter] Fix printing for noexcept expressions
Summary

We are already building into the final result, no need to append it
again.

Fixes https://github.com/clangd/vscode-clangd/issues/290.

Diff Detail

Event Timeline

kadircet created this revision.Jan 26 2022, 6:30 AM
Herald added a subscriber: usaxena95. · View Herald TranscriptJan 26 2022, 6:30 AM
kadircet requested review of this revision.Jan 26 2022, 6:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 26 2022, 6:30 AM
Herald added subscribers: cfe-commits, ilya-biryukov. · View Herald Transcript
kbobyrev accepted this revision.Jan 26 2022, 6:46 AM

LG, thanks!

This revision is now accepted and ready to land.Jan 26 2022, 6:46 AM
This revision was landed with ongoing or failed builds.Jan 26 2022, 7:04 AM
Closed by commit rGb777d354f670: [clang][DeclPrinter] Fix printing for noexcept expressions (authored by kadircet). · Explain Why
This revision was automatically updated to reflect the committed changes.
kadircet added a commit: rGb777d354f670: [clang][DeclPrinter] Fix printing for noexcept expressions.
Harbormaster completed remote builds in B145734: Diff 403243.Jan 27 2022, 1:55 AM

Revision Contents

PathSize
clang/
lib/
AST/
1 line
unittests/
AST/
9 lines

Diff 403243

clang/lib/AST/DeclPrinter.cpp

Show First 20 Lines • Show All 725 Lines • ▼ Show 20 Lines if (const FunctionType *AFT = Ty->getAs<FunctionType>()) {
} else if (FT && isNoexceptExceptionSpec(FT->getExceptionSpecType())) { } else if (FT && isNoexceptExceptionSpec(FT->getExceptionSpecType())) {
Proto += " noexcept"; Proto += " noexcept";
if (isComputedNoexcept(FT->getExceptionSpecType())) { if (isComputedNoexcept(FT->getExceptionSpecType())) {
Proto += "("; Proto += "(";
llvm::raw_string_ostream EOut(Proto); llvm::raw_string_ostream EOut(Proto);
FT->getNoexceptExpr()->printPretty(EOut, nullptr, SubPolicy, FT->getNoexceptExpr()->printPretty(EOut, nullptr, SubPolicy,
Indentation, "\n", &Context); Indentation, "\n", &Context);
EOut.flush(); EOut.flush();
Proto += EOut.str();
Proto += ")"; Proto += ")";
} }
} }
if (CDecl) { if (CDecl) {
if (!Policy.TerseOutput) if (!Policy.TerseOutput)
PrintConstructorInitializers(CDecl, Proto); PrintConstructorInitializers(CDecl, Proto);
} else if (!ConversionDecl && !isa<CXXDestructorDecl>(D)) { } else if (!ConversionDecl && !isa<CXXDestructorDecl>(D)) {
▲ Show 20 Lines • Show All 1,024 Lines • Show Last 20 Lines

clang/unittests/AST/DeclPrinterTest.cpp

Show First 20 Lines • Show All 898 Lines • ▼ Show 20 Lines ASSERT_TRUE(PrintedDeclCXX11Matches(
"struct Z {" "struct Z {"
" void A(int a) noexcept;" " void A(int a) noexcept;"
"};", "};",
"A", "A",
"void A(int a) noexcept")); "void A(int a) noexcept"));
} }
TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification5) { TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification5) {
ASSERT_TRUE(PrintedDeclCXX11Matches( ASSERT_TRUE(PrintedDeclCXX11Matches(
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void A(int a) noexcept(true);"
-    "};",
-    "A",
-    "void A(int a) noexcept(true)"));
+  ASSERT_TRUE(PrintedDeclCXX11Matches("struct Z {"
+                                      "  void A(int a) noexcept(true);"
+                                      "};",
+                                      "A", "void A(int a) noexcept(true)"));
Lint: Pre-merge checks: clang-format: please reformat the code ``` - ASSERT_TRUE(PrintedDeclCXX11Matches( - "struct…
"struct Z {" "struct Z {"
" void A(int a) noexcept(true);" " void A(int a) noexcept(true);"
"};", "};",
"A", "A",
"void A(int a) noexcept(trueA(int a) noexcept(true)")); "void A(int a) noexcept(true)"));
// WRONG; Should be: "void A(int a) noexcept(true);"
} }
TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification6) { TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification6) {
ASSERT_TRUE(PrintedDeclCXX11Matches( ASSERT_TRUE(PrintedDeclCXX11Matches(
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void A(int a) noexcept(1 < 2);"
-    "};",
-    "A",
-    "void A(int a) noexcept(1 < 2)"));
+  ASSERT_TRUE(PrintedDeclCXX11Matches("struct Z {"
+                                      "  void A(int a) noexcept(1 < 2);"
+                                      "};",
+                                      "A", "void A(int a) noexcept(1 < 2)"));
Lint: Pre-merge checks: clang-format: please reformat the code ``` - ASSERT_TRUE(PrintedDeclCXX11Matches( - "struct…
"struct Z {" "struct Z {"
" void A(int a) noexcept(1 < 2);" " void A(int a) noexcept(1 < 2);"
"};", "};",
"A", "A",
"void A(int a) noexcept(1 < 2A(int a) noexcept(1 < 2)")); "void A(int a) noexcept(1 < 2)"));
// WRONG; Should be: "void A(int a) noexcept(1 < 2);"
} }
TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification7) { TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification7) {
ASSERT_TRUE(PrintedDeclCXX11Matches( ASSERT_TRUE(PrintedDeclCXX11Matches(
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<int N>"
-    "struct Z {"
-    "  void A(int a) noexcept(N < 2);"
-    "};",
-    "A",
-    "void A(int a) noexcept(N < 2)"));
+  ASSERT_TRUE(PrintedDeclCXX11Matches("template<int N>"
+                                      "struct Z {"
+                                      "  void A(int a) noexcept(N < 2);"

2 diff lines are omitted. See full path.

Lint: Pre-merge checks: clang-format: please reformat the code ``` - ASSERT_TRUE(PrintedDeclCXX11Matches…
"template<int N>" "template<int N>"
"struct Z {" "struct Z {"
" void A(int a) noexcept(N < 2);" " void A(int a) noexcept(N < 2);"
"};", "};",
"A", "A",
"void A(int a) noexcept(N < 2A(int a) noexcept(N < 2)")); "void A(int a) noexcept(N < 2)"));
// WRONG; Should be: "void A(int a) noexcept(N < 2);"
} }
TEST(DeclPrinter, TestVarDecl1) { TEST(DeclPrinter, TestVarDecl1) {
ASSERT_TRUE(PrintedDeclCXX98Matches( ASSERT_TRUE(PrintedDeclCXX98Matches(
"char *const (*(*A)[5])(int);", "char *const (*(*A)[5])(int);",
"A", "A",
"char *const (*(*A)[5])(int)")); "char *const (*(*A)[5])(int)"));
// Should be: with semicolon // Should be: with semicolon
▲ Show 20 Lines • Show All 455 Lines • Show Last 20 Lines