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

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

Author: zhaomaosu

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

@@ -785,8 +785,8 @@ bool ForLoopIndexUseVisitor::TraverseLambdaCapture(LambdaExpr *LE,
                                                    const LambdaCapture *C,
                                                    Expr *Init) {
   if (C->capturesVariable()) {
-    const ValueDecl *VDecl = C->getCapturedVar();
-    if (areSameVariable(IndexVar, VDecl)) {
+    const VarDecl *VDecl = C->getCapturedVar();
+    if (areSameVariable(IndexVar, cast<ValueDecl>(VDecl))) {
       // FIXME: if the index is captured, it will count as an usage and the
       // alias (if any) won't work, because it is only used in case of having
       // exactly one usage.

clang/docs/ReleaseNotes.rst

@@ -57,6 +57,9 @@ Bug Fixes
 - Improve compile-times with large dynamic array allocations with trivial
   constructors. This fixes
   `Issue 56774 <https://github.com/llvm/llvm-project/issues/56774>`_.
+- No longer assert/miscompile when trying to make a vectorized ``_BitInt`` type
+  using the ``ext_vector_type`` attribute (the ``vector_size`` attribute was
+  already properly diagnosing this case).
 
 Improvements to Clang's diagnostics
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -105,16 +108,6 @@ C++ Language Changes in Clang
 C++20 Feature Support
 ^^^^^^^^^^^^^^^^^^^^^
 
-- Support capturing structured bindings in lambdas
-  (`P1091R3 <https://wg21.link/p1091r3>`_ and `P1381R1 <https://wg21.link/P1381R1>`).
-  This fixes issues `GH52720 <https://github.com/llvm/llvm-project/issues/52720>`_,
-  `GH54300 <https://github.com/llvm/llvm-project/issues/54300>`_,
-  `GH54301 <https://github.com/llvm/llvm-project/issues/54301>`_,
-  and `GH49430 <https://github.com/llvm/llvm-project/issues/49430>`_.
-
-
-
-
 C++2b Feature Support
 ^^^^^^^^^^^^^^^^^^^^^
 

clang/include/clang/AST/Decl.h

@@ -690,11 +690,6 @@ class ValueDecl : public NamedDecl {
   ///        or declared with the weak or weak-ref attr.
   bool isWeak() const;
 
-  /// Whether this variable is the implicit variable for a lambda init-capture.
-  /// Only VarDecl can be init captures, but both VarDecl and BindingDecl
-  /// can be captured.
-  bool isInitCapture() const;
-
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { return classofKind(D->getKind()); }
   static bool classofKind(Kind K) { return K >= firstValue && K <= lastValue; }

clang/include/clang/AST/DeclCXX.h

@@ -1057,9 +1057,8 @@ class CXXRecordDecl : public RecordDecl {
   ///
   /// \note No entries will be added for init-captures, as they do not capture
   /// variables.
-  void
-  getCaptureFields(llvm::DenseMap<const ValueDecl *, FieldDecl *> &Captures,
-                   FieldDecl *&ThisCapture) const;
+  void getCaptureFields(llvm::DenseMap<const VarDecl *, FieldDecl *> &Captures,
+                        FieldDecl *&ThisCapture) const;
 
   using capture_const_iterator = const LambdaCapture *;
   using capture_const_range = llvm::iterator_range<capture_const_iterator>;

clang/include/clang/AST/LambdaCapture.h

@@ -71,7 +71,7 @@ class LambdaCapture {
   /// capture that is a pack expansion, or an invalid source
   /// location to indicate that this is not a pack expansion.
   LambdaCapture(SourceLocation Loc, bool Implicit, LambdaCaptureKind Kind,
-                ValueDecl *Var = nullptr,
+                VarDecl *Var = nullptr,
                 SourceLocation EllipsisLoc = SourceLocation());
 
   /// Determine the kind of capture.
@@ -86,7 +86,7 @@ class LambdaCapture {
 
   /// Determine whether this capture handles a variable.
   bool capturesVariable() const {
-    return isa_and_nonnull<ValueDecl>(DeclAndBits.getPointer());
+    return isa_and_nonnull<VarDecl>(DeclAndBits.getPointer());
   }
 
   /// Determine whether this captures a variable length array bound
@@ -101,9 +101,9 @@ class LambdaCapture {
   ///
   /// This operation is only valid if this capture is a variable capture
   /// (other than a capture of \c this).
-  ValueDecl *getCapturedVar() const {
+  VarDecl *getCapturedVar() const {
     assert(capturesVariable() && "No variable available for capture");
-    return static_cast<ValueDecl *>(DeclAndBits.getPointer());
+    return static_cast<VarDecl *>(DeclAndBits.getPointer());
   }
 
   /// Determine whether this was an implicit capture (not

clang/include/clang/AST/Stmt.h

@@ -59,7 +59,6 @@ class RecordDecl;
 class SourceManager;
 class StringLiteral;
 class Token;
-class ValueDecl;
 class VarDecl;
 
 //===----------------------------------------------------------------------===//

clang/include/clang/ASTMatchers/ASTMatchers.h

@@ -4722,7 +4722,7 @@ AST_MATCHER_P(LambdaExpr, hasAnyCapture, internal::Matcher<LambdaCapture>,
 /// In the matcher
 /// lambdaExpr(hasAnyCapture(lambdaCapture(capturesVar(hasName("x")))),
 /// capturesVar(hasName("x")) matches `x` and `x = 1`.
-AST_MATCHER_P(LambdaCapture, capturesVar, internal::Matcher<ValueDecl>,
+AST_MATCHER_P(LambdaCapture, capturesVar, internal::Matcher<VarDecl>,
               InnerMatcher) {
   auto *capturedVar = Node.getCapturedVar();
   return capturedVar && InnerMatcher.matches(*capturedVar, Finder, Builder);

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -9074,16 +9074,6 @@ def ext_ms_anonymous_record : ExtWarn<
 def err_reference_to_local_in_enclosing_context : Error<
   "reference to local %select{variable|binding}1 %0 declared in enclosing "
   "%select{%3|block literal|lambda expression|context}2">;
-def err_bitfield_capture_by_ref : Error<
-  "cannot capture a bit-field by reference">;
-def err_capture_binding_openmp : Error<
-  "capturing a structured binding is not yet supported in OpenMP">;
-def ext_capture_binding : ExtWarn<
-  "captured structured bindings are a C++20 extension">, InGroup<CXX20>;
-def warn_cxx17_compat_capture_binding : Warning<
-  "captured structured bindings are incompatible with "
-  "C++ standards before C++20">,
-  InGroup<CXXPre20Compat>, DefaultIgnore;
 
 def err_static_data_member_not_allowed_in_local_class : Error<
   "static data member %0 not allowed in local %sub{select_tag_type_kind}2 %1">;

clang/include/clang/Sema/ScopeInfo.h

@@ -553,7 +553,7 @@ class Capture {
     const VariableArrayType *CapturedVLA;
 
     /// Otherwise, the captured variable (if any).
-    ValueDecl *CapturedVar;
+    VarDecl *CapturedVar;
   };
 
   /// The source location at which the first capture occurred.
@@ -589,13 +589,12 @@ class Capture {
   unsigned Invalid : 1;
 
 public:
-  Capture(ValueDecl *Var, bool Block, bool ByRef, bool IsNested,
+  Capture(VarDecl *Var, bool Block, bool ByRef, bool IsNested,
           SourceLocation Loc, SourceLocation EllipsisLoc, QualType CaptureType,
           bool Invalid)
       : CapturedVar(Var), Loc(Loc), EllipsisLoc(EllipsisLoc),
-        CaptureType(CaptureType), Kind(Block   ? Cap_Block
-                                       : ByRef ? Cap_ByRef
-                                               : Cap_ByCopy),
+        CaptureType(CaptureType),
+        Kind(Block ? Cap_Block : ByRef ? Cap_ByRef : Cap_ByCopy),
         Nested(IsNested), CapturesThis(false), ODRUsed(false),
         NonODRUsed(false), Invalid(Invalid) {}
 
@@ -640,7 +639,7 @@ class Capture {
       NonODRUsed = true;
   }
 
-  ValueDecl *getVariable() const {
+  VarDecl *getVariable() const {
     assert(isVariableCapture());
     return CapturedVar;
   }
@@ -679,7 +678,7 @@ class CapturingScopeInfo : public FunctionScopeInfo {
       : FunctionScopeInfo(Diag), ImpCaptureStyle(Style) {}
 
   /// CaptureMap - A map of captured variables to (index+1) into Captures.
-  llvm::DenseMap<ValueDecl *, unsigned> CaptureMap;
+  llvm::DenseMap<VarDecl*, unsigned> CaptureMap;
 
   /// CXXThisCaptureIndex - The (index+1) of the capture of 'this';
   /// zero if 'this' is not captured.
@@ -696,7 +695,7 @@ class CapturingScopeInfo : public FunctionScopeInfo {
   /// or null if unknown.
   QualType ReturnType;
 
-  void addCapture(ValueDecl *Var, bool isBlock, bool isByref, bool isNested,
+  void addCapture(VarDecl *Var, bool isBlock, bool isByref, bool isNested,
                   SourceLocation Loc, SourceLocation EllipsisLoc,
                   QualType CaptureType, bool Invalid) {
     Captures.push_back(Capture(Var, isBlock, isByref, isNested, Loc,
@@ -723,21 +722,23 @@ class CapturingScopeInfo : public FunctionScopeInfo {
   }
 
   /// Determine whether the given variable has been captured.
-  bool isCaptured(ValueDecl *Var) const { return CaptureMap.count(Var); }
+  bool isCaptured(VarDecl *Var) const {
+    return CaptureMap.count(Var);
+  }
 
   /// Determine whether the given variable-array type has been captured.
   bool isVLATypeCaptured(const VariableArrayType *VAT) const;
 
   /// Retrieve the capture of the given variable, if it has been
   /// captured already.
-  Capture &getCapture(ValueDecl *Var) {
+  Capture &getCapture(VarDecl *Var) {
     assert(isCaptured(Var) && "Variable has not been captured");
     return Captures[CaptureMap[Var] - 1];
   }
 
-  const Capture &getCapture(ValueDecl *Var) const {
-    llvm::DenseMap<ValueDecl *, unsigned>::const_iterator Known =
-        CaptureMap.find(Var);
+  const Capture &getCapture(VarDecl *Var) const {
+    llvm::DenseMap<VarDecl*, unsigned>::const_iterator Known
+      = CaptureMap.find(Var);
     assert(Known != CaptureMap.end() && "Variable has not been captured");
     return Captures[Known->second - 1];
   }

clang/include/clang/Sema/Sema.h

@@ -5586,23 +5586,23 @@ class Sema final {
   ///
   /// \returns true if an error occurred (i.e., the variable cannot be
   /// captured) and false if the capture succeeded.
-  bool tryCaptureVariable(ValueDecl *Var, SourceLocation Loc,
-                          TryCaptureKind Kind, SourceLocation EllipsisLoc,
-                          bool BuildAndDiagnose, QualType &CaptureType,
+  bool tryCaptureVariable(VarDecl *Var, SourceLocation Loc, TryCaptureKind Kind,
+                          SourceLocation EllipsisLoc, bool BuildAndDiagnose,
+                          QualType &CaptureType,
                           QualType &DeclRefType,
                           const unsigned *const FunctionScopeIndexToStopAt);
 
   /// Try to capture the given variable.
-  bool tryCaptureVariable(ValueDecl *Var, SourceLocation Loc,
+  bool tryCaptureVariable(VarDecl *Var, SourceLocation Loc,
                           TryCaptureKind Kind = TryCapture_Implicit,
                           SourceLocation EllipsisLoc = SourceLocation());
 
   /// Checks if the variable must be captured.
-  bool NeedToCaptureVariable(ValueDecl *Var, SourceLocation Loc);
+  bool NeedToCaptureVariable(VarDecl *Var, SourceLocation Loc);
 
   /// Given a variable, determine the type that a reference to that
   /// variable will have in the given scope.
-  QualType getCapturedDeclRefType(ValueDecl *Var, SourceLocation Loc);
+  QualType getCapturedDeclRefType(VarDecl *Var, SourceLocation Loc);
 
   /// Mark all of the declarations referenced within a particular AST node as
   /// referenced. Used when template instantiation instantiates a non-dependent