merge main into amd-staging (llvm#4219)

Author: z1-cciauto

clang/bindings/python/clang/cindex.py

@@ -1435,13 +1435,13 @@ def is_unexposed(self):
     OMP_SCOPE_DIRECTIVE = 306
 
     # OpenMP reverse directive.
-    OMPReverseDirective = 307
+    OMP_REVERSE_DIRECTIVE = 307
 
     # OpenMP interchange directive.
-    OMPInterchangeDirective = 308
+    OMP_INTERCHANGE_DIRECTIVE = 308
 
     # OpenMP assume directive.
-    OMPAssumeDirective = 309
+    OMP_ASSUME_DIRECTIVE = 309
 
     # OpenMP stripe directive.
     OMP_STRIPE_DIRECTIVE = 310
@@ -1450,43 +1450,43 @@ def is_unexposed(self):
     OPEN_ACC_COMPUTE_DIRECTIVE = 320
 
     # OpenACC Loop Construct.
-    OpenACCLoopConstruct = 321
+    OPEN_ACC_LOOP_CONSTRUCT = 321
 
     # OpenACC Combined Constructs.
-    OpenACCCombinedConstruct = 322
+    OPEN_ACC_COMBINED_CONSTRUCT = 322
 
     # OpenACC data Construct.
-    OpenACCDataConstruct = 323
+    OPEN_ACC_DATA_CONSTRUCT = 323
 
     # OpenACC enter data Construct.
-    OpenACCEnterDataConstruct = 324
+    OPEN_ACC_ENTER_DATA_CONSTRUCT = 324
 
     # OpenACC exit data Construct.
-    OpenACCExitDataConstruct = 325
+    OPEN_ACC_EXIT_DATA_CONSTRUCT = 325
 
     # OpenACC host_data Construct.
-    OpenACCHostDataConstruct = 326
+    OPEN_ACC_HOST_DATA_CONSTRUCT = 326
 
     # OpenACC wait Construct.
-    OpenACCWaitConstruct = 327
+    OPEN_ACC_WAIT_CONSTRUCT = 327
 
     # OpenACC init Construct.
-    OpenACCInitConstruct = 328
+    OPEN_ACC_INIT_CONSTRUCT = 328
 
     # OpenACC shutdown Construct.
-    OpenACCShutdownConstruct = 329
+    OPEN_ACC_SHUTDOWN_CONSTRUCT = 329
 
     # OpenACC set Construct.
-    OpenACCSetConstruct = 330
+    OPEN_ACC_SET_CONSTRUCT = 330
 
     # OpenACC update Construct.
-    OpenACCUpdateConstruct = 331
+    OPEN_ACC_UPDATE_CONSTRUCT = 331
 
     # OpenACC atomic Construct.
-    OpenACCAtomicConstruct = 332
+    OPEN_ACC_ATOMIC_CONSTRUCT = 332
 
     # OpenACC cache Construct.
-    OpenACCCacheConstruct = 333
+    OPEN_ACC_CACHE_CONSTRUCT = 333
 
     ###
     # Other Kinds

clang/docs/ReleaseNotes.rst

@@ -834,7 +834,9 @@ Sanitizers
 
 Python Binding Changes
 ----------------------
-- Exposed `clang_getCursorLanguage` via `Cursor.language`.
+- Exposed ``clang_getCursorLanguage`` via ``Cursor.language``.
+- Add all missing ``CursorKind``s, ``TypeKind``s and
+  ``ExceptionSpecificationKind``s from ``Index.h``
 
 OpenMP Support
 --------------

clang/include/clang/Basic/Builtins.def

@@ -67,7 +67,8 @@
 
 // The third value provided to the macro specifies information about attributes
 // of the function.  These must be kept in sync with the predicates in the
-// Builtin::Context class.  Currently we have:
+// Builtin::Context class.  Note: In the descriptions below, {num} is a
+// placeholder for an integer.  Currently we have:
 //  n -> nothrow
 //  r -> noreturn
 //  U -> pure
@@ -83,23 +84,23 @@
 //  h -> this function requires a specific header or an explicit declaration.
 //  i -> this is a runtime library implemented function without the
 //       '__builtin_' prefix. It will be implemented in compiler-rt or libgcc.
-//  p:N: -> this is a printf-like function whose Nth argument is the format
-//          string.
-//  P:N: -> similar to the p:N: attribute, but the function is like vprintf
-//          in that it accepts its arguments as a va_list rather than
-//          through an ellipsis
-//  s:N: -> this is a scanf-like function whose Nth argument is the format
-//          string.
-//  S:N: -> similar to the s:N: attribute, but the function is like vscanf
-//          in that it accepts its arguments as a va_list rather than
-//          through an ellipsis
+//  p:{num}: -> this is a printf-like function whose {num}th argument is the
+//              format string.
+//  P:{num}: -> similar to the p:{num}: attribute, but the function is like
+//              vprintf in that it accepts its arguments as a va_list rather than
+//              through an ellipsis
+//  s:{num}: -> this is a scanf-like function whose {num}th argument is the
+//              format string.
+//  S:{num}: -> similar to the s:{num}: attribute, but the function is like
+//              vscanf in that it accepts its arguments as a va_list rather than
+//              through an ellipsis
 //  e -> const, but only when -fno-math-errno and FP exceptions are ignored
 //  g -> const when FP exceptions are ignored
 //  j -> returns_twice (like setjmp)
 //  u -> arguments are not evaluated for their side-effects
-//  V:N: -> requires vectors of at least N bits to be legal
-//  C<N,M_0,...,M_k> -> callback behavior: argument N is called with argument
-//                      M_0, ..., M_k as payload
+//  V:{num}: -> requires vectors of at least {num} bits to be legal
+//  C<{num},M_0,...,M_k> -> callback behavior: argument {num} is called with
+//                          argument M_0, ..., M_k as payload
 //  z -> this is a function in (possibly-versioned) namespace std
 //  E -> this function can be constant evaluated by Clang frontend
 //  G -> this is a C++20 consteval function

clang/lib/Driver/ToolChains/AMDGPU.cpp

@@ -916,6 +916,16 @@ void AMDGPUToolChain::addClangWarningOptions(ArgStringList &CC1Args) const {
   CC1Args.push_back("-Werror=atomic-alignment");
 }
 
+void AMDGPUToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+                                                ArgStringList &CC1Args) const {
+  if (DriverArgs.hasArg(options::OPT_nostdinc) ||
+      DriverArgs.hasArg(options::OPT_nostdlibinc))
+    return;
+
+  if (std::optional<std::string> Path = getStdlibIncludePath())
+    addSystemInclude(DriverArgs, CC1Args, *Path);
+}
+
 StringRef
 AMDGPUToolChain::getGPUArch(const llvm::opt::ArgList &DriverArgs) const {
   return getProcessorFromTargetID(

clang/lib/Driver/ToolChains/AMDGPU.h

@@ -122,6 +122,9 @@ class LLVM_LIBRARY_VISIBILITY AMDGPUToolChain : public Generic_ELF {
   void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
                              llvm::opt::ArgStringList &CC1Args,
                              Action::OffloadKind DeviceOffloadKind) const override;
+  void
+  AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+                            llvm::opt::ArgStringList &CC1Args) const override;
 
   /// Return whether denormals should be flushed, and treated as 0 by default
   /// for the subtarget.

clang/lib/Driver/ToolChains/Clang.cpp

@@ -1148,26 +1148,15 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
   if (!Args.hasArg(options::OPT_nostdinc) &&
       Args.hasFlag(options::OPT_offload_inc, options::OPT_no_offload_inc,
                    true) &&
-      !Args.hasArg(options::OPT_nobuiltininc)) {
-    // Without an offloading language we will include these headers directly.
-    // Offloading languages will instead only use the declarations stored in
-    // the resource directory at clang/lib/Headers/llvm_libc_wrappers.
-    if (getToolChain().getTriple().isGPU() &&
-        C.getActiveOffloadKinds() == Action::OFK_None) {
-      SmallString<128> P(llvm::sys::path::parent_path(D.Dir));
-      llvm::sys::path::append(P, "include");
-      llvm::sys::path::append(P, getToolChain().getTripleString());
-      CmdArgs.push_back("-internal-isystem");
-      CmdArgs.push_back(Args.MakeArgString(P));
-    } else if (C.getActiveOffloadKinds() == Action::OFK_OpenMP) {
-      // TODO: CUDA / HIP include their own headers for some common functions
-      // implemented here. We'll need to clean those up so they do not conflict.
-      SmallString<128> P(D.ResourceDir);
-      llvm::sys::path::append(P, "include");
-      llvm::sys::path::append(P, "llvm_libc_wrappers");
-      CmdArgs.push_back("-internal-isystem");
-      CmdArgs.push_back(Args.MakeArgString(P));
-    }
+      !Args.hasArg(options::OPT_nobuiltininc) &&
+      (C.getActiveOffloadKinds() == Action::OFK_OpenMP)) {
+    // TODO: CUDA / HIP include their own headers for some common functions
+    // implemented here. We'll need to clean those up so they do not conflict.
+    SmallString<128> P(D.ResourceDir);
+    llvm::sys::path::append(P, "include");
+    llvm::sys::path::append(P, "llvm_libc_wrappers");
+    CmdArgs.push_back("-internal-isystem");
+    CmdArgs.push_back(Args.MakeArgString(P));
   }
 
   // Add system include arguments for all targets but IAMCU.

clang/lib/Driver/ToolChains/Cuda.cpp

@@ -786,6 +786,16 @@ void NVPTXToolChain::addClangTargetOptions(
     const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args,
     Action::OffloadKind DeviceOffloadingKind) const {}
 
+void NVPTXToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
+                                               ArgStringList &CC1Args) const {
+  if (DriverArgs.hasArg(options::OPT_nostdinc) ||
+      DriverArgs.hasArg(options::OPT_nostdlibinc))
+    return;
+
+  if (std::optional<std::string> Path = getStdlibIncludePath())
+    addSystemInclude(DriverArgs, CC1Args, *Path);
+}
+
 bool NVPTXToolChain::supportsDebugInfoOption(const llvm::opt::Arg *A) const {
   const Option &O = A->getOption();
   return (O.matches(options::OPT_gN_Group) &&

clang/lib/Driver/ToolChains/Cuda.h

@@ -87,6 +87,9 @@ class LLVM_LIBRARY_VISIBILITY NVPTXToolChain : public ToolChain {
   addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
                         llvm::opt::ArgStringList &CC1Args,
                         Action::OffloadKind DeviceOffloadKind) const override;
+  void
+  AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+                            llvm::opt::ArgStringList &CC1Args) const override;
 
   // Never try to use the integrated assembler with CUDA; always fork out to
   // ptxas.