use ArrayRef instead of MutableArrayRef

Author: usx95

clang/include/clang/Basic/Attr.td

@@ -1896,29 +1896,23 @@ def LifetimeCaptureBy : DeclOrTypeAttr {
   let Documentation = [LifetimeCaptureByDocs];
   let AdditionalMembers = [{
 private:
-  MutableArrayRef<IdentifierInfo*> ArgIdents;
-  MutableArrayRef<SourceLocation> ArgLocs;
+  ArrayRef<IdentifierInfo*> ArgIdents;
+  ArrayRef<SourceLocation> ArgLocs;
 
 public:
   static constexpr int THIS = 0;
   static constexpr int INVALID = -1;
   static constexpr int UNKNOWN = -2;
   static constexpr int GLOBAL = -3;
 
-  void CreateArgs(ASTContext &Ctx) {
-    ArgIdents =
-      MutableArrayRef<IdentifierInfo *>(new (Ctx) IdentifierInfo *[params_Size], params_Size);
-    ArgLocs =
-      MutableArrayRef<SourceLocation>(new (Ctx) SourceLocation[params_Size], params_Size);
-  }
-  auto getArgIdents() const { 
-    assert(ArgIdents.size() == params_Size);
-    return ArgIdents;
-  }
-  auto getArgLocs() const { 
-    assert(ArgLocs.size() == params_Size);
-    return ArgLocs;
+  void setArgs(  ArrayRef<IdentifierInfo*> Idents, ArrayRef<SourceLocation> Locs) {
+    assert(Idents.size() == params_Size);
+    assert(Locs.size() == params_Size);
+    ArgIdents = Idents;
+    ArgLocs = Locs;
   }
+  auto getArgIdents() const { return ArgIdents; }
+  auto getArgLocs() const { return ArgLocs; }
   void setParamIdx(size_t Idx, int Val) { 
     assert(Idx < params_Size);
     params_[Idx] = Val;

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3878,12 +3878,10 @@ LifetimeCaptureByAttr *Sema::ParseLifetimeCaptureByAttr(const ParsedAttr &AL,
     return nullptr;
   }
   unsigned N = AL.getNumArgs();
-  SmallVector<int> FakeParamIndices(N, LifetimeCaptureByAttr::INVALID);
-  auto *CapturedBy = ::new (Context)
-      LifetimeCaptureByAttr(Context, AL, FakeParamIndices.data(), N);
-  CapturedBy->CreateArgs(Context);
-  MutableArrayRef<SourceLocation> ParamLocs = CapturedBy->getArgLocs();
-  MutableArrayRef<IdentifierInfo *> ParamIdents = CapturedBy->getArgIdents();
+  auto ParamIdents =
+      MutableArrayRef<IdentifierInfo *>(new (Context) IdentifierInfo *[N], N);
+  auto ParamLocs =
+      MutableArrayRef<SourceLocation>(new (Context) SourceLocation[N], N);
   bool IsValid = true;
   for (unsigned I = 0; I < N; ++I) {
     if (AL.isArgExpr(I)) {
@@ -3903,7 +3901,13 @@ LifetimeCaptureByAttr *Sema::ParseLifetimeCaptureByAttr(const ParsedAttr &AL,
     ParamIdents[I] = IdLoc->Ident;
     ParamLocs[I] = IdLoc->Loc;
   }
-  return IsValid ? CapturedBy : nullptr;
+  if (!IsValid)
+    return nullptr;
+  SmallVector<int> FakeParamIndices(N, LifetimeCaptureByAttr::INVALID);
+  auto *CapturedBy =
+      LifetimeCaptureByAttr::Create(Context, FakeParamIndices.data(), N, AL);
+  CapturedBy->setArgs(ParamIdents, ParamLocs);
+  return CapturedBy;
 }
 
 static void handleLifetimeCaptureByAttr(Sema &S, Decl *D,