address comments

Author: Chen Zheng

clang/include/clang/Basic/DiagnosticCommonKinds.td

@@ -367,6 +367,15 @@ def warn_target_unrecognized_env : Warning<
 def err_target_unsupported_abi_with_fpu : Error<
   "'%0' ABI is not supported with FPU">;
 
+def err_ppc_impossible_musttail: Error<
+  "'musttail' attribute for this call is impossible because %select{"
+  "long calls can not be tail called on PPC|"
+  "indirect calls can not be tail called on PPC|"
+  "external calls can not be tail called on PPC}0"
+  >;
+def err_aix_musttail_unsupported: Error<
+  "'musttail' attribute is not supported on AIX">;
+
 // Source manager
 def err_cannot_open_file : Error<"cannot open file '%0': %1">, DefaultFatal;
 def err_file_modified : Error<

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -3864,14 +3864,6 @@ def note_cannot_use_trivial_abi_reason : Note<
   "it is polymorphic|"
   "it has a base of a non-trivial class type|it has a virtual base|"
   "it has a __weak field|it has a field of a non-trivial class type}1">;
-def err_ppc_impossible_musttail: Error<
-  "'musttail' attribute for this call is impossible because %select{"
-  "long calls can not be tail called|"
-  "indirect calls can not be tail called|"
-  "external calls can not be tail called}0"
-  >;
-def err_aix_musttail_unsupported: Error<
-  "'musttail' attribute is not supported on AIX">;
 
 // Availability attribute
 def warn_availability_unknown_platform : Warning<

clang/lib/CodeGen/CGCall.cpp

@@ -5751,8 +5751,29 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   if (llvm::CallInst *Call = dyn_cast<llvm::CallInst>(CI)) {
     if (TargetDecl && TargetDecl->hasAttr<NotTailCalledAttr>())
       Call->setTailCallKind(llvm::CallInst::TCK_NoTail);
-    else if (IsMustTail)
+    else if (IsMustTail) {
+      if (getTarget().getTriple().isPPC()) {
+        if (getTarget().getTriple().isOSAIX())
+          CGM.getDiags().Report(Loc, diag::err_aix_musttail_unsupported);
+        else if (!getTarget().hasFeature("pcrelative-memops")) {
+          if (getTarget().hasFeature("longcall"))
+            CGM.getDiags().Report(Loc, diag::err_ppc_impossible_musttail) << 0;
+          else if (Call->isIndirectCall())
+            CGM.getDiags().Report(Loc, diag::err_ppc_impossible_musttail) << 1;
+          else if (isa_and_nonnull<FunctionDecl>(TargetDecl) &&
+                   cast<FunctionDecl>(TargetDecl)->isWeak())
+            CGM.getDiags().Report(Loc, diag::err_ppc_impossible_musttail) << 2;
+          else if (isa_and_nonnull<FunctionDecl>(TargetDecl) &&
+                   !cast<FunctionDecl>(TargetDecl)->isDefined())
+            // The undefined callee may be a forward declaration. Without
+            // knowning all symbols in the module, we won't know the symbol is
+            // defined or not. Collect all these symbols for later diagnosing.
+            CGM.addUndefinedGlobalForTailCall(
+                {cast<FunctionDecl>(TargetDecl), Loc});
+        }
+      }
       Call->setTailCallKind(llvm::CallInst::TCK_MustTail);
+    }
   }
 
   // Add metadata for calls to MSAllocator functions

clang/lib/CodeGen/CodeGenModule.cpp

@@ -1394,6 +1394,14 @@ void CodeGenModule::Release() {
   // that might affect the DLL storage class or the visibility, and
   // before anything that might act on these.
   setVisibilityFromDLLStorageClass(LangOpts, getModule());
+
+  // Check the tail call symbols are truly undefined.
+  if (getTriple().isPPC() && !MustTailCallUndefinedGlobals.empty()) {
+    for (auto &I : MustTailCallUndefinedGlobals) {
+      if (!I.first->isDefined())
+        getDiags().Report(I.second, diag::err_ppc_impossible_musttail) << 2;
+    }
+  }
 }
 
 void CodeGenModule::EmitOpenCLMetadata() {

clang/lib/CodeGen/CodeGenModule.h

@@ -485,6 +485,14 @@ class CodeGenModule : public CodeGenTypeCache {
   typedef std::pair<OrderGlobalInitsOrStermFinalizers, llvm::Function *>
       GlobalInitData;
 
+  // When a tail call is performed on an "undefined" symbol, on PPC without pc
+  // relative feature, the tail call is not allowed. In "EmitCall" for such
+  // tail calls, the "undefined" symbols may be forward declarations, their
+  // definitions are provided in the module but after the callsites. For such
+  // tail calls, diagnose message should be not emitted.
+  llvm::SmallSetVector<std::pair<const FunctionDecl *, SourceLocation>, 4>
+      MustTailCallUndefinedGlobals;
+
   struct GlobalInitPriorityCmp {
     bool operator()(const GlobalInitData &LHS,
                     const GlobalInitData &RHS) const {
@@ -1647,6 +1655,11 @@ class CodeGenModule : public CodeGenTypeCache {
     return getTriple().isSPIRVLogical();
   }
 
+  void addUndefinedGlobalForTailCall(
+      std::pair<const FunctionDecl *, SourceLocation> Global) {
+    MustTailCallUndefinedGlobals.insert(Global);
+  }
+
 private:
   bool shouldDropDLLAttribute(const Decl *D, const llvm::GlobalValue *GV) const;
 

clang/lib/Sema/SemaStmt.cpp

@@ -743,20 +743,6 @@ bool Sema::checkMustTailAttr(const Stmt *St, const Attr &MTA) {
     CallerType.Func = CallerDecl->getType()->getAs<FunctionProtoType>();
   }
 
-  if (Context.getTargetInfo().getTriple().isPPC()) {
-    if (Context.getTargetInfo().getTriple().isOSAIX())
-      return Diag(St->getBeginLoc(), diag::err_aix_musttail_unsupported);
-    else if (!Context.getTargetInfo().hasFeature("pcrelative-memops")) {
-      if (Context.getTargetInfo().hasFeature("longcall"))
-        return Diag(St->getBeginLoc(), diag::err_ppc_impossible_musttail) << 0;
-      else if (!CE->getDirectCallee())
-        return Diag(St->getBeginLoc(), diag::err_ppc_impossible_musttail) << 1;
-      else if (isa_and_nonnull<FunctionDecl>(CE->getCalleeDecl()) &&
-               !cast<FunctionDecl>(CE->getCalleeDecl())->isDefined())
-        return Diag(St->getBeginLoc(), diag::err_ppc_impossible_musttail) << 2;
-    }
-  }
-
   const Expr *CalleeExpr = CE->getCallee()->IgnoreParens();
   const auto *CalleeBinOp = dyn_cast<BinaryOperator>(CalleeExpr);
   SourceLocation CalleeLoc = CE->getCalleeDecl()

clang/test/CodeGen/PowerPC/musttail-forward-declaration.c

@@ -0,0 +1,11 @@
+// RUN: %clang_cc1 %s -triple powerpc64le-unknown-linux-gnu -o /dev/null -emit-llvm -verify=good
+// RUN: %clang_cc1 %s -triple powerpc64-unknown-linux-gnu -o /dev/null -emit-llvm -verify=good
+
+int func2(int i);
+int external_call2(int i) {
+  // good-no-diagnostics
+  [[clang::musttail]] return func2(i);
+}
+int func2(int i) {
+  return 0;
+}

clang/test/CodeGen/PowerPC/musttail-indirect.cpp

@@ -0,0 +1,8 @@
+// RUN: %clang_cc1 %s -triple powerpc64-unknown-linux-gnu -o /dev/null -emit-llvm -verify
+// RUN: %clang_cc1 %s -triple powerpc-unknown-linux-gnu -o /dev/null -emit-llvm -verify
+
+void name(int *params) {
+  auto fn = (void (*)(int *))1;
+  // expected-error@+1 {{'musttail' attribute for this call is impossible because indirect calls can not be tail called on PPC}}
+  [[clang::musttail]] return fn(params);
+}

clang/test/CodeGen/PowerPC/musttail-undefined.c

@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 %s -triple powerpc64-unknown-linux-gnu -o /dev/null -emit-llvm -verify
+// RUN: %clang_cc1 %s -triple powerpc64le-unknown-linux-gnu -o /dev/null -emit-llvm -verify
+
+int foo(int x);
+
+int bar(int x)
+{
+  // expected-error@+1 {{'musttail' attribute for this call is impossible because external calls can not be tail called on PPC}}
+  [[clang::musttail]] return foo(x);
+}

clang/test/CodeGen/PowerPC/musttail-weak.c

@@ -0,0 +1,13 @@
+// RUN: %clang_cc1 %s -triple powerpc64-ibm-aix-xcoff -o /dev/null -emit-llvm -verify=aix
+// RUN: %clang_cc1 %s -triple powerpc-ibm-aix-xcoff -o /dev/null -emit-llvm -verify=aix
+// RUN: %clang_cc1 %s -triple powerpc64-unknown-linux-gnu -o /dev/null -emit-llvm -verify=linux
+// RUN: %clang_cc1 %s -triple powerpc64le-unknown-linux-gnu -o /dev/null -emit-llvm -verify=linux
+
+__attribute__((weak)) int func2(int i) {
+  return 0;
+}
+int external_call2(int i) {
+  // linux-error@+2 {{'musttail' attribute for this call is impossible because external calls can not be tail called on PPC}}
+  // aix-error@+1 {{'musttail' attribute is not supported on AIX}}
+  [[clang::musttail]] return func2(i);
+}

clang/test/CodeGen/PowerPC/musttail.c

@@ -0,0 +1,20 @@
+// RUN: %clang_cc1 %s -triple powerpc64-ibm-aix-xcoff -o /dev/null -emit-llvm -verify=aix
+// RUN: %clang_cc1 %s -triple powerpc-ibm-aix-xcoff -o /dev/null -emit-llvm -verify=aix
+// RUN: %clang_cc1 %s -triple powerpc64-unknown-linux-gnu -o /dev/null -emit-llvm -verify=good
+// RUN: %clang_cc1 %s -triple powerpc-unknown-linux-gnu -o /dev/null -emit-llvm -verify=good
+// RUN: %clang_cc1 %s -triple powerpc64le-unknown-linux-gnu -o /dev/null -emit-llvm -verify=good
+// RUN: %clang_cc1 %s -triple powerpc64le-unknown-linux-gnu -target-feature +pcrelative-memops -o /dev/null -emit-llvm -verify=good
+// RUN: %clang_cc1 %s -triple powerpc64le-unknown-linux-gnu -target-feature +longcall -o /dev/null -emit-llvm -verify=longcall
+// RUN: %clang_cc1 %s -triple powerpc64le-unknown-linux-gnu -target-feature +pcrelative-memops -target-feature +longcall -o /dev/null -emit-llvm -verify=good
+
+int foo(int x) {
+  return x;
+}
+
+int bar(int x)
+{
+  // good-no-diagnostics
+  // longcall-error@+2 {{'musttail' attribute for this call is impossible because long calls can not be tail called on PPC}}
+  // aix-error@+1 {{'musttail' attribute is not supported on AIX}}
+ [[clang::musttail]] return foo(1);
+}