Use ArrayRef instead of raw pointers

Author: usx95

clang/include/clang/Basic/Attr.td

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

clang/lib/Sema/SemaDeclAttr.cpp

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