Merge from 'main' to 'sycl-web' (35 commits)

  CONFLICT (content): Merge conflict in clang/lib/Sema/SemaDeclAttr.cpp

Author: Pavel V Chupin

clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp

@@ -92,6 +92,11 @@ static bool isIntegralConstant(const Token &Token) {
       Begin, End, [](char C) { return C == '.' || std::toupper(C) == 'E'; });
 }
 
+static StringRef getTokenName(const Token &Tok) {
+  return Tok.is(tok::raw_identifier) ? Tok.getRawIdentifier()
+                                     : Tok.getIdentifierInfo()->getName();
+}
+
 namespace {
 
 struct EnumMacro {
@@ -279,19 +284,11 @@ void MacroToEnumCallbacks::checkCondition(SourceRange Range) {
 }
 
 void MacroToEnumCallbacks::checkName(const Token &MacroNameTok) {
-  std::string Id;
-  if (MacroNameTok.is(tok::raw_identifier))
-    Id = MacroNameTok.getRawIdentifier().str();
-  else if (MacroNameTok.is(tok::identifier))
-    Id = MacroNameTok.getIdentifierInfo()->getName().str();
-  else {
-    assert(false && "Expected either an identifier or raw identifier token");
-    return;
-  }
+  StringRef Id = getTokenName(MacroNameTok);
 
   llvm::erase_if(Enums, [&Id](const MacroList &MacroList) {
     return llvm::any_of(MacroList, [&Id](const EnumMacro &Macro) {
-      return Macro.Name.getIdentifierInfo()->getName().str() == Id;
+      return getTokenName(Macro.Name) == Id;
     });
   });
 }
@@ -355,8 +352,7 @@ void MacroToEnumCallbacks::MacroUndefined(const Token &MacroNameTok,
                                           const MacroDefinition &MD,
                                           const MacroDirective *Undef) {
   auto MatchesToken = [&MacroNameTok](const EnumMacro &Macro) {
-    return Macro.Name.getIdentifierInfo()->getName() ==
-           MacroNameTok.getIdentifierInfo()->getName();
+    return getTokenName(Macro.Name) == getTokenName(MacroNameTok);
   };
 
   auto It = llvm::find_if(Enums, [MatchesToken](const MacroList &MacroList) {
@@ -432,8 +428,8 @@ void MacroToEnumCallbacks::EndOfMainFile() {
 
 void MacroToEnumCallbacks::warnMacroEnum(const EnumMacro &Macro) const {
   Check->diag(Macro.Directive->getLocation(),
-              "macro %0 defines an integral constant; prefer an enum instead")
-      << Macro.Name.getIdentifierInfo();
+              "macro '%0' defines an integral constant; prefer an enum instead")
+      << getTokenName(Macro.Name);
 }
 
 void MacroToEnumCallbacks::fixEnumMacro(const MacroList &MacroList) const {

clang-tools-extra/test/clang-tidy/checkers/modernize-macro-to-enum.cpp

@@ -208,6 +208,10 @@ inline void used_ifndef() {}
 #define IFNDEF3 3
 #endif
 
+// Sometimes an argument to ifdef can be classified as a keyword token.
+#ifdef __restrict
+#endif
+
 // These macros do not expand to integral constants.
 #define HELLO "Hello, "
 #define WORLD "World"

clang/docs/ReleaseNotes.rst

@@ -54,20 +54,6 @@ Major New Features
   There is an analogous ``zero_call_used_regs`` attribute to allow for finer
   control of this feature.
 
-- Clang now supports randomizing structure layout in C. This feature is a
-  compile-time hardening technique, making it more difficult for an attacker to
-  retrieve data from structures. Specify randomization with the
-  ``randomize_layout`` attribute. The corresponding ``no_randomize_layout``
-  attribute can be used to turn the feature off.
-
-  A seed value is required to enable randomization, and is deterministic based
-  on a seed value. Use the ``-frandomize-layout-seed=`` or
-  ``-frandomize-layout-seed-file=`` flags.
-
-  .. note::
-
-      Randomizing structure layout is a C-only feature.
-
 Bug Fixes
 ------------------
 - ``CXXNewExpr::getArraySize()`` previously returned a ``llvm::Optional``
@@ -129,6 +115,15 @@ Improvements to Clang's diagnostics
 - ``-Wunused-variable`` no longer warn for references extending the lifetime
   of temporaries with side effects. This fixes `Issue 54489
   <https://github.com/llvm/llvm-project/issues/54489>`_.
+- Modified the behavior of ``-Wstrict-prototypes`` and added a new, related
+  diagnostic ``-Wdeprecated-non-prototype``. The strict prototypes warning will
+  now only diagnose deprecated declarations and definitions of functions
+  without a prototype where the behavior in C2x will remain correct. This
+  diagnostic remains off by default but is now enabled via ``-pedantic`` due to
+  it being a deprecation warning. ``-Wdeprecated-non-prototype`` will diagnose
+  cases where the deprecated declarations or definitions of a function without
+  a prototype will change behavior in C2x. This diagnostic is grouped under the
+  ``-Wstrict-prototypes`` warning group, but is enabled by default.
 
 Non-comprehensive list of changes in this release
 -------------------------------------------------

clang/include/clang/AST/Decl.h

@@ -4052,12 +4052,6 @@ class RecordDecl : public TagDecl {
     RecordDeclBits.ParamDestroyedInCallee = V;
   }
 
-  bool isRandomized() const { return RecordDeclBits.IsRandomized; }
-
-  void setIsRandomized(bool V) { RecordDeclBits.IsRandomized = V; }
-
-  void reorderFields(const SmallVectorImpl<Decl *> &Fields);
-
   /// Determines whether this declaration represents the
   /// injected class name.
   ///

clang/include/clang/AST/DeclBase.h

@@ -313,7 +313,6 @@ class alignas(8) Decl {
   friend class ASTReader;
   friend class CXXClassMemberWrapper;
   friend class LinkageComputer;
-  friend class RecordDecl;
   template<typename decl_type> friend class Redeclarable;
 
   /// Access - Used by C++ decls for the access specifier.
@@ -1541,13 +1540,10 @@ class DeclContext {
 
     /// Represents the way this type is passed to a function.
     uint64_t ArgPassingRestrictions : 2;
-
-    /// Indicates whether this struct has had its field layout randomized.
-    uint64_t IsRandomized : 1;
   };
 
   /// Number of non-inherited bits in RecordDeclBitfields.
-  enum { NumRecordDeclBits = 15 };
+  enum { NumRecordDeclBits = 14 };
 
   /// Stores the bits used by OMPDeclareReductionDecl.
   /// If modified NumOMPDeclareReductionDeclBits and the accessor

clang/include/clang/AST/Randstruct.h

@@ -4859,18 +4859,3 @@ def HLSLNumThreads: InheritableAttr {
   let LangOpts = [HLSL];
   let Documentation = [NumThreadsDocs];
 }
-
-def RandomizeLayout : InheritableAttr {
-  let Spellings = [GCC<"randomize_layout">];
-  let Subjects = SubjectList<[Record]>;
-  let Documentation = [ClangRandomizeLayoutDocs];
-  let LangOpts = [COnly];
-}
-
-def NoRandomizeLayout : InheritableAttr {
-  let Spellings = [GCC<"no_randomize_layout">];
-  let Subjects = SubjectList<[Record]>;
-  let Documentation = [ClangRandomizeLayoutDocs];
-  let LangOpts = [COnly];
-}
-def : MutualExclusions<[RandomizeLayout, NoRandomizeLayout]>;

clang/include/clang/Basic/Attr.td

@@ -7957,35 +7957,3 @@ dictate the thread id. Total number of threads executed is ``X * Y * Z``.
 The full documentation is available here: https://docs.microsoft.com/en-us/windows/win32/direct3dhlsl/sm5-attributes-numthreads
   }];
 }
-
-def ClangRandomizeLayoutDocs : Documentation {
-  let Category = DocCatDecl;
-  let Heading = "randomize_layout, no_randomize_layout";
-  let Content = [{
-The attribute ``randomize_layout``, when attached to a C structure, selects it
-for structure layout field randomization; a compile-time hardening technique. A
-"seed" value, is specified via the ``-frandomize-layout-seed=`` command line flag.
-For example:
-
-.. code-block:: bash
-
-  SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'`
-  make ... CFLAGS="-frandomize-layout-seed=$SEED" ...
-
-You can also supply the seed in a file with ``-frandomize-layout-seed-file=``.
-For example:
-
-.. code-block:: bash
-
-  od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n' > /tmp/seed_file.txt
-  make ... CFLAGS="-frandomize-layout-seed-file=/tmp/seed_file.txt" ...
-
-The randomization is deterministic based for a given seed, so the entire
-program should be compiled with the same seed, but keep the seed safe
-otherwise.
-
-The attribute ``no_randomize_layout``, when attached to a C structure,
-instructs the compiler that this structure should not have its field layout
-randomized.
-  }];
-}

clang/include/clang/Basic/AttrDocs.td

@@ -180,8 +180,6 @@ def err_drv_amdgpu_ieee_without_no_honor_nans : Error<
   "invalid argument '-mno-amdgpu-ieee' only allowed with relaxed NaN handling">;
 def err_drv_argument_not_allowed_with : Error<
   "invalid argument '%0' not allowed with '%1'">;
-def err_drv_cannot_open_randomize_layout_seed_file : Error<
-  "cannot read randomize layout seed file '%0'">;
 def err_drv_invalid_version_number : Error<
   "invalid version number in '%0'">;
 def err_drv_no_linker_llvm_support : Error<

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -447,6 +447,8 @@ def InlineNamespaceReopenedNoninline
 def InvalidNoreturn : DiagGroup<"invalid-noreturn">;
 def InvalidSourceEncoding : DiagGroup<"invalid-source-encoding">;
 def KNRPromotedParameter : DiagGroup<"knr-promoted-parameter">;
+def DeprecatedNonPrototype : DiagGroup<"deprecated-non-prototype">;
+def StrictPrototypes : DiagGroup<"strict-prototypes", [DeprecatedNonPrototype]>;
 def : DiagGroup<"init-self">;
 def : DiagGroup<"inline">;
 def : DiagGroup<"invalid-pch">;