[clang][DeclPrinter] Fix missing semicolon in AST print for methods that are definitions without having a body

[strimo378]

Summary

DeclPrinter used FunctionDecl::isThisDeclarationADefinition to decide if the decl requires a semicolon at the end. However, there are several methods without body (that require a semicolon) that are definitions.

[strimo378]

https://github.com/llvm/llvm-project/issues/62996

[aaron.ballman]

LGTM! When you land, please be sure to add Fixes https://github.com/llvm/llvm-project/issues/62996 to the commit message so the issue is automatically closed (and it makes it easier for people doing code archeology later). Thanks!

[steven_wu]

This breaks Darwin bots: https://green.lab.llvm.org/green/job/clang-stage1-RA/35102/testReport/junit/Clang/AST/ast_print_method_decl_cpp/

[steven_wu]

error: aliases are not supported on darwin

Maybe create a different testcase that is not supported on Darwin?

[thakis]

This breaks tests on Mac: http://45.33.8.238/macm1/65934/step_7.txt

Please take a look and revert for now if it takes a while to fix.

[strimo378]

Sry for breaking builds. Can someone please revert it, I am currently not at work.

Am 28.07.2023 20:27 schrieb Nico Weber via Phabricator <[e-mail]>:
thakis added a comment.

This breaks tests on Mac: http://45.33.8.238/macm1/65934/step_7.txt

Please take a look and revert for now if it takes a while to fix.

Repository:

rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION

https://reviews.llvm.org/D156533/new/

https://reviews.llvm.org/D156533

[steven_wu]

Reverted in 4098e13a7146

clang/lib/AST/DeclPrinter.cpp

for (DeclContext::decl_iterator D = DC->decls_begin(), DEnd = DC->decls_end();
     const char *Terminator = nullptr;
     if (isa<OMPThreadPrivateDecl>(*D) || isa<OMPDeclareReductionDecl>(*D) ||
         isa<OMPDeclareMapperDecl>(*D) || isa<OMPRequiresDecl>(*D) ||
         isa<OMPAllocateDecl>(*D))
       Terminator = nullptr;
     else if (isa<ObjCMethodDecl>(*D) && cast<ObjCMethodDecl>(*D)->hasBody())
       Terminator = nullptr;
     else if (auto FD = dyn_cast<FunctionDecl>(*D)) {
-      if (FD->isThisDeclarationADefinition())
+      if (FD->doesThisDeclarationHaveABody() && !FD->isDefaulted())
         Terminator = nullptr;
       else
         Terminator = ";";
     } else if (auto TD = dyn_cast<FunctionTemplateDecl>(*D)) {
-      if (TD->getTemplatedDecl()->isThisDeclarationADefinition())
+      if (TD->getTemplatedDecl()->doesThisDeclarationHaveABody())
         Terminator = nullptr;
       else
         Terminator = ";";
     } else if (isa<NamespaceDecl, LinkageSpecDecl, ObjCImplementationDecl,
                    ObjCInterfaceDecl, ObjCProtocolDecl, ObjCCategoryImplDecl,
                    ObjCCategoryDecl, HLSLBufferDecl>(*D))
       Terminator = nullptr;
     else if (isa<EnumConstantDecl>(*D)) {

clang/test/AST/ast-print-method-decl.cpp

struct CurlyCtorInit {
   // FIXME: Implicit this should not be output
   // CHECK-NEXT: CurlyCtorInit(int ****) : a({.x = 0}), i(this->a.x) {
   CurlyCtorInit(int ****) : a({.x = 0}), i(a.x) {
   // CHECK-NEXT: }
   }
 
   // CHECK-NEXT: };
 };
+
+
+// CHECK: struct DefMethodsWithoutBody {
+struct DefMethodsWithoutBody {
+  // CHECK-NEXT: DefMethodsWithoutBody() = delete;
+  DefMethodsWithoutBody() = delete;
+
+  // CHECK-NEXT: DefMethodsWithoutBody() = default;
+  ~DefMethodsWithoutBody() = default;
+
+  // CHECK-NEXT: void m1() __attribute__((alias("X")));
+  void m1() __attribute__((alias("X")));
+
+  // CHECK-NEXT: };
+};