[FIX] Remove pointer in attribute to eliminate leaks (see D71830)
diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
index 60b8149..9798d45 100644
--- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp
+++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp
@@ -11075,11 +11075,11 @@
SmallVector<Expr *, 8> VariantExprs;
SmallVector<VariantMatchInfo, 8> VMIs;
for (const auto *A : FD->specific_attrs<OMPDeclareVariantAttr>()) {
- const OMPTraitInfo *TI = A->getTraitInfos();
- if (!TI)
- continue;
+ A->printPretty(llvm::dbgs(), PrintingPolicy(LangOptions()));
+ const OMPTraitInfo &TI = A->getTraitInfos();
+ TI.print(llvm::dbgs(), PrintingPolicy(LangOptions()));
VMIs.push_back(VariantMatchInfo());
- TI->getAsVariantMatchInfo(CGM.getContext(), VMIs.back());
+ TI.getAsVariantMatchInfo(CGM.getContext(), VMIs.back());
VariantExprs.push_back(A->getVariantFuncRef());
}
diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp
index e1bcbdb..8c822ec 100644
--- a/clang/lib/Parse/ParseOpenMP.cpp
+++ b/clang/lib/Parse/ParseOpenMP.cpp
@@ -1365,26 +1365,24 @@
}
// Parse inner context selectors.
- OMPTraitInfo *TI = new OMPTraitInfo();
- parseOMPContextSelectors(Loc, *TI);
+ OMPTraitInfo TI;
+ parseOMPContextSelectors(Loc, TI);
// Parse ')'
(void)T.consumeClose();
Optional<std::pair<FunctionDecl *, Expr *>> DeclVarData =
Actions.checkOpenMPDeclareVariantFunction(
- Ptr, AssociatedFunction.get(), *TI,
+ Ptr, AssociatedFunction.get(), TI,
SourceRange(Loc, Tok.getLocation()));
// Skip last tokens.
while (Tok.isNot(tok::annot_pragma_openmp_end))
ConsumeAnyToken();
- if (DeclVarData.hasValue() && !TI->Sets.empty())
+ if (DeclVarData.hasValue() && !TI.Sets.empty())
Actions.ActOnOpenMPDeclareVariantDirective(
DeclVarData.getValue().first, DeclVarData.getValue().second, TI,
SourceRange(Loc, Tok.getLocation()));
- else
- delete TI;
// Skip the last annot_pragma_openmp_end.
(void)ConsumeAnnotationToken();
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index a828e85..ea10110 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -5632,7 +5632,7 @@
void Sema::ActOnOpenMPDeclareVariantDirective(FunctionDecl *FD,
Expr *VariantRef,
- OMPTraitInfo *TI,
+ OMPTraitInfo &TI,
SourceRange SR) {
auto *NewAttr =
OMPDeclareVariantAttr::CreateImplicit(Context, VariantRef, TI, SR);
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 6571c82..2ac899a 100755
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -395,8 +395,7 @@
// Copy the template version of the OMPTraitInfo and run substitute on all
// score and condition expressiosn.
- OMPTraitInfo *TI = new OMPTraitInfo();
- *TI = *Attr.getTraitInfos();
+ OMPTraitInfo TI = Attr.getTraitInfos();
// Try to substitute template parameters in score and condition expressions.
auto SubstScoreOrConditionExpr = [&S, Subst](Expr *&E, bool) {
@@ -411,21 +410,17 @@
}
return false;
};
- if (TI->anyScoreOrCondition(SubstScoreOrConditionExpr)) {
- delete TI;
+ if (TI.anyScoreOrCondition(SubstScoreOrConditionExpr))
return;
- }
// Check function/variant ref.
Optional<std::pair<FunctionDecl *, Expr *>> DeclVarData =
S.checkOpenMPDeclareVariantFunction(S.ConvertDeclToDeclGroup(New),
- VariantFuncRef.get(), *TI,
+ VariantFuncRef.get(), TI,
Attr.getRange());
- if (!DeclVarData) {
- delete TI;
+ if (!DeclVarData)
return;
- }
S.ActOnOpenMPDeclareVariantDirective(DeclVarData.getValue().first,
DeclVarData.getValue().second, TI,
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index fa5b43d..29abb9c 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -12612,10 +12612,10 @@
C->setKindKwLoc(Record.readSourceLocation());
}
-OMPTraitInfo *ASTRecordReader::readOMPTraitInfo() {
- OMPTraitInfo *TI = new OMPTraitInfo();
- TI->Sets.resize(readUInt32());
- for (auto &Set : TI->Sets) {
+OMPTraitInfo ASTRecordReader::readOMPTraitInfo() {
+ OMPTraitInfo TI;
+ TI.Sets.resize(readUInt32());
+ for (auto &Set : TI.Sets) {
Set.Kind = readEnum<llvm::omp::TraitSet>();
Set.Selectors.resize(readUInt32());
for (auto &Selector : Set.Selectors) {
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp
index 45c10be..091bf56 100644
--- a/clang/lib/Serialization/ASTReaderDecl.cpp
+++ b/clang/lib/Serialization/ASTReaderDecl.cpp
@@ -2756,7 +2756,7 @@
return Reader.readVersionTuple();
}
- OMPTraitInfo *readOMPTraitInfo() { return Reader.readOMPTraitInfo(); }
+ OMPTraitInfo readOMPTraitInfo() { return Reader.readOMPTraitInfo(); }
template <typename T> T *GetLocalDeclAs(uint32_t LocalID) {
return Reader.GetLocalDeclAs<T>(LocalID);
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index 4ee59f7..159ebe1 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -6578,9 +6578,9 @@
Record.AddSourceLocation(C->getKindKwLoc());
}
-void ASTRecordWriter::writeOMPTraitInfo(OMPTraitInfo *TI) {
- writeUInt32(TI->Sets.size());
- for (const auto &Set : TI->Sets) {
+void ASTRecordWriter::writeOMPTraitInfo(const OMPTraitInfo &TI) {
+ writeUInt32(TI.Sets.size());
+ for (const auto &Set : TI.Sets) {
writeEnum(Set.Kind);
writeUInt32(Set.Selectors.size());
for (const auto &Selector : Set.Selectors) {