Skip to content
Snippets Groups Projects
Commit cc11f453 authored by Alexander Musman's avatar Alexander Musman
Browse files

C++11 - Use nullptr in lib/Sema/SemaOpenMP.cpp and some reformatting (no functional changes). 


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@208879 91177308-0d34-0410-b5e6-96231b3b80d8
parent e1a39ac4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 42 additions and 40 deletions
lib/Sema/SemaOpenMP.cpp
+ 42
− 40
View file @ cc11f453
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
OpenMPDirectiveKind DKind; OpenMPDirectiveKind DKind;
OpenMPClauseKind CKind; OpenMPClauseKind CKind;
DeclRefExpr *RefExpr; DeclRefExpr *RefExpr;
DSAVarData() : DKind(OMPD_unknown), CKind(OMPC_unknown), RefExpr(0) { } DSAVarData() : DKind(OMPD_unknown), CKind(OMPC_unknown), RefExpr(nullptr) {}
}; };
private: private:
struct DSAInfo { struct DSAInfo {
...@@ -63,15 +63,13 @@ private: ...@@ -63,15 +63,13 @@ private:
OpenMPDirectiveKind Directive; OpenMPDirectiveKind Directive;
DeclarationNameInfo DirectiveName; DeclarationNameInfo DirectiveName;
Scope *CurScope; Scope *CurScope;
SharingMapTy(OpenMPDirectiveKind DKind, SharingMapTy(OpenMPDirectiveKind DKind, const DeclarationNameInfo &Name,
const DeclarationNameInfo &Name,
Scope *CurScope) Scope *CurScope)
: SharingMap(), DefaultAttr(DSA_unspecified), Directive(DKind), : SharingMap(), DefaultAttr(DSA_unspecified), Directive(DKind),
DirectiveName(Name), CurScope(CurScope) { } DirectiveName(Name), CurScope(CurScope) {}
SharingMapTy() SharingMapTy()
: SharingMap(), DefaultAttr(DSA_unspecified), : SharingMap(), DefaultAttr(DSA_unspecified), Directive(OMPD_unknown),
Directive(OMPD_unknown), DirectiveName(), DirectiveName(), CurScope(nullptr) {}
CurScope(0) { }
}; };
typedef SmallVector<SharingMapTy, 64> StackTy; typedef SmallVector<SharingMapTy, 64> StackTy;
...@@ -220,7 +218,7 @@ DSAStackTy::DSAVarData DSAStackTy::getDSA(StackTy::reverse_iterator Iter, ...@@ -220,7 +218,7 @@ DSAStackTy::DSAVarData DSAStackTy::getDSA(StackTy::reverse_iterator Iter,
// firstprivate. // firstprivate.
DVarTemp = getDSA(I, D); DVarTemp = getDSA(I, D);
if (DVarTemp.CKind != OMPC_shared) { if (DVarTemp.CKind != OMPC_shared) {
DVar.RefExpr = 0; DVar.RefExpr = nullptr;
DVar.DKind = OMPD_task; DVar.DKind = OMPD_task;
DVar.CKind = OMPC_firstprivate; DVar.CKind = OMPC_firstprivate;
return DVar; return DVar;
...@@ -256,12 +254,12 @@ bool ...@@ -256,12 +254,12 @@ bool
DSAStackTy::isOpenMPLocal(VarDecl *D, StackTy::reverse_iterator Iter) { DSAStackTy::isOpenMPLocal(VarDecl *D, StackTy::reverse_iterator Iter) {
if (Stack.size() > 2) { if (Stack.size() > 2) {
reverse_iterator I = Iter, E = Stack.rend() - 1; reverse_iterator I = Iter, E = Stack.rend() - 1;
Scope *TopScope = 0; Scope *TopScope = nullptr;
while (I != E && I->Directive != OMPD_parallel) { while (I != E && I->Directive != OMPD_parallel) {
++I; ++I;
} }
if (I == E) return false; if (I == E) return false;
TopScope = I->CurScope ? I->CurScope->getParent() : 0; TopScope = I->CurScope ? I->CurScope->getParent() : nullptr;
Scope *CurScope = getCurScope(); Scope *CurScope = getCurScope();
while (CurScope != TopScope && !CurScope->isDeclScope(D)) { while (CurScope != TopScope && !CurScope->isDeclScope(D)) {
CurScope = CurScope->getParent(); CurScope = CurScope->getParent();
...@@ -325,8 +323,8 @@ DSAStackTy::DSAVarData DSAStackTy::getTopDSA(VarDecl *D) { ...@@ -325,8 +323,8 @@ DSAStackTy::DSAVarData DSAStackTy::getTopDSA(VarDecl *D) {
// in a Construct, C/C++, predetermined, p.6] // in a Construct, C/C++, predetermined, p.6]
// Variables with const qualified type having no mutable member are // Variables with const qualified type having no mutable member are
// shared. // shared.
CXXRecordDecl *RD = Actions.getLangOpts().CPlusPlus ? CXXRecordDecl *RD =
Type->getAsCXXRecordDecl() : 0; Actions.getLangOpts().CPlusPlus ? Type->getAsCXXRecordDecl() : nullptr;
if (IsConstant && if (IsConstant &&
!(Actions.getLangOpts().CPlusPlus && RD && RD->hasMutableFields())) { !(Actions.getLangOpts().CPlusPlus && RD && RD->hasMutableFields())) {
// Variables with const-qualified type having no mutable member may be // Variables with const-qualified type having no mutable member may be
...@@ -429,12 +427,14 @@ ExprResult Sema::ActOnOpenMPIdExpression(Scope *CurScope, ...@@ -429,12 +427,14 @@ ExprResult Sema::ActOnOpenMPIdExpression(Scope *CurScope,
VarDecl *VD; VarDecl *VD;
if (!Lookup.isSingleResult()) { if (!Lookup.isSingleResult()) {
VarDeclFilterCCC Validator(*this); VarDeclFilterCCC Validator(*this);
if (TypoCorrection Corrected = CorrectTypo(Id, LookupOrdinaryName, CurScope, if (TypoCorrection Corrected =
0, Validator, CTK_ErrorRecovery)) { CorrectTypo(Id, LookupOrdinaryName, CurScope, nullptr, Validator,
CTK_ErrorRecovery)) {
diagnoseTypo(Corrected, diagnoseTypo(Corrected,
PDiag(Lookup.empty()? diag::err_undeclared_var_use_suggest PDiag(Lookup.empty()
: diag::err_omp_expected_var_arg_suggest) ? diag::err_undeclared_var_use_suggest
<< Id.getName()); : diag::err_omp_expected_var_arg_suggest)
<< Id.getName());
VD = Corrected.getCorrectionDeclAs<VarDecl>(); VD = Corrected.getCorrectionDeclAs<VarDecl>();
} else { } else {
Diag(Id.getLoc(), Lookup.empty() ? diag::err_undeclared_var_use Diag(Id.getLoc(), Lookup.empty() ? diag::err_undeclared_var_use
...@@ -591,7 +591,7 @@ OMPThreadPrivateDecl *Sema::CheckOMPThreadPrivateDecl( ...@@ -591,7 +591,7 @@ OMPThreadPrivateDecl *Sema::CheckOMPThreadPrivateDecl(
Vars.push_back(*I); Vars.push_back(*I);
DSAStack->addDSA(VD, DE, OMPC_threadprivate); DSAStack->addDSA(VD, DE, OMPC_threadprivate);
} }
OMPThreadPrivateDecl *D = 0; OMPThreadPrivateDecl *D = nullptr;
if (!Vars.empty()) { if (!Vars.empty()) {
D = OMPThreadPrivateDecl::Create(Context, getCurLexicalContext(), Loc, D = OMPThreadPrivateDecl::Create(Context, getCurLexicalContext(), Loc,
Vars); Vars);
...@@ -798,7 +798,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, ...@@ -798,7 +798,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind,
SourceLocation StartLoc, SourceLocation StartLoc,
SourceLocation LParenLoc, SourceLocation LParenLoc,
SourceLocation EndLoc) { SourceLocation EndLoc) {
OMPClause *Res = 0; OMPClause *Res = nullptr;
switch (Kind) { switch (Kind) {
case OMPC_if: case OMPC_if:
Res = ActOnOpenMPIfClause(Expr, StartLoc, LParenLoc, EndLoc); Res = ActOnOpenMPIfClause(Expr, StartLoc, LParenLoc, EndLoc);
...@@ -835,7 +835,7 @@ OMPClause *Sema::ActOnOpenMPIfClause(Expr *Condition, ...@@ -835,7 +835,7 @@ OMPClause *Sema::ActOnOpenMPIfClause(Expr *Condition,
Condition->getExprLoc(), Condition->getExprLoc(),
Condition); Condition);
if (Val.isInvalid()) if (Val.isInvalid())
return 0; return nullptr;
ValExpr = Val.take(); ValExpr = Val.take();
} }
...@@ -899,7 +899,7 @@ OMPClause *Sema::ActOnOpenMPNumThreadsClause(Expr *NumThreads, ...@@ -899,7 +899,7 @@ OMPClause *Sema::ActOnOpenMPNumThreadsClause(Expr *NumThreads,
ExprResult Val = ExprResult Val =
PerformImplicitIntegerConversion(NumThreadsLoc, NumThreads); PerformImplicitIntegerConversion(NumThreadsLoc, NumThreads);
if (Val.isInvalid()) if (Val.isInvalid())
return 0; return nullptr;
ValExpr = Val.take(); ValExpr = Val.take();
...@@ -910,7 +910,7 @@ OMPClause *Sema::ActOnOpenMPNumThreadsClause(Expr *NumThreads, ...@@ -910,7 +910,7 @@ OMPClause *Sema::ActOnOpenMPNumThreadsClause(Expr *NumThreads,
Result.isSigned() && !Result.isStrictlyPositive()) { Result.isSigned() && !Result.isStrictlyPositive()) {
Diag(NumThreadsLoc, diag::err_omp_negative_expression_in_clause) Diag(NumThreadsLoc, diag::err_omp_negative_expression_in_clause)
<< "num_threads" << NumThreads->getSourceRange(); << "num_threads" << NumThreads->getSourceRange();
return 0; return nullptr;
} }
} }
...@@ -945,7 +945,7 @@ OMPClause *Sema::ActOnOpenMPSafelenClause(Expr *Len, SourceLocation StartLoc, ...@@ -945,7 +945,7 @@ OMPClause *Sema::ActOnOpenMPSafelenClause(Expr *Len, SourceLocation StartLoc,
// positive integer expression. // positive integer expression.
ExprResult Safelen = VerifyPositiveIntegerConstantInClause(Len, OMPC_safelen); ExprResult Safelen = VerifyPositiveIntegerConstantInClause(Len, OMPC_safelen);
if (Safelen.isInvalid()) if (Safelen.isInvalid())
return 0; return nullptr;
return new (Context) return new (Context)
OMPSafelenClause(Safelen.take(), StartLoc, LParenLoc, EndLoc); OMPSafelenClause(Safelen.take(), StartLoc, LParenLoc, EndLoc);
} }
...@@ -956,7 +956,7 @@ OMPClause *Sema::ActOnOpenMPSimpleClause(OpenMPClauseKind Kind, ...@@ -956,7 +956,7 @@ OMPClause *Sema::ActOnOpenMPSimpleClause(OpenMPClauseKind Kind,
SourceLocation StartLoc, SourceLocation StartLoc,
SourceLocation LParenLoc, SourceLocation LParenLoc,
SourceLocation EndLoc) { SourceLocation EndLoc) {
OMPClause *Res = 0; OMPClause *Res = nullptr;
switch (Kind) { switch (Kind) {
case OMPC_default: case OMPC_default:
Res = Res =
...@@ -1010,7 +1010,7 @@ OMPClause *Sema::ActOnOpenMPDefaultClause(OpenMPDefaultClauseKind Kind, ...@@ -1010,7 +1010,7 @@ OMPClause *Sema::ActOnOpenMPDefaultClause(OpenMPDefaultClauseKind Kind,
} }
Diag(KindKwLoc, diag::err_omp_unexpected_clause_value) Diag(KindKwLoc, diag::err_omp_unexpected_clause_value)
<< Values << getOpenMPClauseName(OMPC_default); << Values << getOpenMPClauseName(OMPC_default);
return 0; return nullptr;
} }
switch (Kind) { switch (Kind) {
case OMPC_DEFAULT_none: case OMPC_DEFAULT_none:
...@@ -1052,7 +1052,7 @@ OMPClause *Sema::ActOnOpenMPProcBindClause(OpenMPProcBindClauseKind Kind, ...@@ -1052,7 +1052,7 @@ OMPClause *Sema::ActOnOpenMPProcBindClause(OpenMPProcBindClauseKind Kind,
} }
Diag(KindKwLoc, diag::err_omp_unexpected_clause_value) Diag(KindKwLoc, diag::err_omp_unexpected_clause_value)
<< Values << getOpenMPClauseName(OMPC_proc_bind); << Values << getOpenMPClauseName(OMPC_proc_bind);
return 0; return nullptr;
} }
return new (Context) OMPProcBindClause(Kind, KindKwLoc, StartLoc, LParenLoc, return new (Context) OMPProcBindClause(Kind, KindKwLoc, StartLoc, LParenLoc,
EndLoc); EndLoc);
...@@ -1065,7 +1065,7 @@ OMPClause *Sema::ActOnOpenMPVarListClause(OpenMPClauseKind Kind, ...@@ -1065,7 +1065,7 @@ OMPClause *Sema::ActOnOpenMPVarListClause(OpenMPClauseKind Kind,
SourceLocation LParenLoc, SourceLocation LParenLoc,
SourceLocation ColonLoc, SourceLocation ColonLoc,
SourceLocation EndLoc) { SourceLocation EndLoc) {
OMPClause *Res = 0; OMPClause *Res = nullptr;
switch (Kind) { switch (Kind) {
case OMPC_private: case OMPC_private:
Res = ActOnOpenMPPrivateClause(VarList, StartLoc, LParenLoc, EndLoc); Res = ActOnOpenMPPrivateClause(VarList, StartLoc, LParenLoc, EndLoc);
...@@ -1156,8 +1156,9 @@ OMPClause *Sema::ActOnOpenMPPrivateClause(ArrayRef<Expr *> VarList, ...@@ -1156,8 +1156,9 @@ OMPClause *Sema::ActOnOpenMPPrivateClause(ArrayRef<Expr *> VarList,
Type = cast<ArrayType>( Type = cast<ArrayType>(
Type.getNonReferenceType().getTypePtr())->getElementType(); Type.getNonReferenceType().getTypePtr())->getElementType();
} }
CXXRecordDecl *RD = getLangOpts().CPlusPlus ? CXXRecordDecl *RD = getLangOpts().CPlusPlus
Type.getNonReferenceType()->getAsCXXRecordDecl() : 0; ? Type.getNonReferenceType()->getAsCXXRecordDecl()
: nullptr;
if (RD) { if (RD) {
CXXConstructorDecl *CD = LookupDefaultConstructor(RD); CXXConstructorDecl *CD = LookupDefaultConstructor(RD);
PartialDiagnostic PD = PartialDiagnostic PD =
...@@ -1223,7 +1224,7 @@ OMPClause *Sema::ActOnOpenMPPrivateClause(ArrayRef<Expr *> VarList, ...@@ -1223,7 +1224,7 @@ OMPClause *Sema::ActOnOpenMPPrivateClause(ArrayRef<Expr *> VarList,
Vars.push_back(DE); Vars.push_back(DE);
} }
if (Vars.empty()) return 0; if (Vars.empty()) return nullptr;
return OMPPrivateClause::Create(Context, StartLoc, LParenLoc, EndLoc, Vars); return OMPPrivateClause::Create(Context, StartLoc, LParenLoc, EndLoc, Vars);
} }
...@@ -1286,8 +1287,9 @@ OMPClause *Sema::ActOnOpenMPFirstprivateClause(ArrayRef<Expr *> VarList, ...@@ -1286,8 +1287,9 @@ OMPClause *Sema::ActOnOpenMPFirstprivateClause(ArrayRef<Expr *> VarList,
// clause requires an accesible, unambiguous copy constructor for the // clause requires an accesible, unambiguous copy constructor for the
// class type. // class type.
Type = Context.getBaseElementType(Type); Type = Context.getBaseElementType(Type);
CXXRecordDecl *RD = getLangOpts().CPlusPlus ? CXXRecordDecl *RD = getLangOpts().CPlusPlus
Type.getNonReferenceType()->getAsCXXRecordDecl() : 0; ? Type.getNonReferenceType()->getAsCXXRecordDecl()
: nullptr;
if (RD) { if (RD) {
CXXConstructorDecl *CD = LookupCopyingConstructor(RD, 0); CXXConstructorDecl *CD = LookupCopyingConstructor(RD, 0);
PartialDiagnostic PD = PartialDiagnostic PD =
...@@ -1393,7 +1395,7 @@ OMPClause *Sema::ActOnOpenMPFirstprivateClause(ArrayRef<Expr *> VarList, ...@@ -1393,7 +1395,7 @@ OMPClause *Sema::ActOnOpenMPFirstprivateClause(ArrayRef<Expr *> VarList,
Vars.push_back(DE); Vars.push_back(DE);
} }
if (Vars.empty()) return 0; if (Vars.empty()) return nullptr;
return OMPFirstprivateClause::Create(Context, StartLoc, LParenLoc, EndLoc, return OMPFirstprivateClause::Create(Context, StartLoc, LParenLoc, EndLoc,
Vars); Vars);
...@@ -1457,7 +1459,7 @@ OMPClause *Sema::ActOnOpenMPSharedClause(ArrayRef<Expr *> VarList, ...@@ -1457,7 +1459,7 @@ OMPClause *Sema::ActOnOpenMPSharedClause(ArrayRef<Expr *> VarList,
Vars.push_back(DE); Vars.push_back(DE);
} }
if (Vars.empty()) return 0; if (Vars.empty()) return nullptr;
return OMPSharedClause::Create(Context, StartLoc, LParenLoc, EndLoc, Vars); return OMPSharedClause::Create(Context, StartLoc, LParenLoc, EndLoc, Vars);
} }
...@@ -1566,7 +1568,7 @@ OMPClause *Sema::ActOnOpenMPLinearClause(ArrayRef<Expr *> VarList, Expr *Step, ...@@ -1566,7 +1568,7 @@ OMPClause *Sema::ActOnOpenMPLinearClause(ArrayRef<Expr *> VarList, Expr *Step,
} }
if (Vars.empty()) if (Vars.empty())
return 0; return nullptr;
Expr *StepExpr = Step; Expr *StepExpr = Step;
if (Step && !Step->isValueDependent() && !Step->isTypeDependent() && if (Step && !Step->isValueDependent() && !Step->isTypeDependent() &&
...@@ -1575,7 +1577,7 @@ OMPClause *Sema::ActOnOpenMPLinearClause(ArrayRef<Expr *> VarList, Expr *Step, ...@@ -1575,7 +1577,7 @@ OMPClause *Sema::ActOnOpenMPLinearClause(ArrayRef<Expr *> VarList, Expr *Step,
SourceLocation StepLoc = Step->getLocStart(); SourceLocation StepLoc = Step->getLocStart();
ExprResult Val = PerformImplicitIntegerConversion(StepLoc, Step); ExprResult Val = PerformImplicitIntegerConversion(StepLoc, Step);
if (Val.isInvalid()) if (Val.isInvalid())
return 0; return nullptr;
StepExpr = Val.take(); StepExpr = Val.take();
// Warn about zero linear step (it would be probably better specified as // Warn about zero linear step (it would be probably better specified as
...@@ -1641,8 +1643,8 @@ OMPClause *Sema::ActOnOpenMPCopyinClause(ArrayRef<Expr *> VarList, ...@@ -1641,8 +1643,8 @@ OMPClause *Sema::ActOnOpenMPCopyinClause(ArrayRef<Expr *> VarList,
// copyin clause requires an accesible, unambiguous copy assignment // copyin clause requires an accesible, unambiguous copy assignment
// operator for the class type. // operator for the class type.
Type = Context.getBaseElementType(Type); Type = Context.getBaseElementType(Type);
CXXRecordDecl *RD = getLangOpts().CPlusPlus ? CXXRecordDecl *RD =
Type->getAsCXXRecordDecl() : 0; getLangOpts().CPlusPlus ? Type->getAsCXXRecordDecl() : nullptr;
if (RD) { if (RD) {
CXXMethodDecl *MD = LookupCopyingAssignment(RD, 0, false, 0); CXXMethodDecl *MD = LookupCopyingAssignment(RD, 0, false, 0);
DeclAccessPair FoundDecl = DeclAccessPair::make(MD, MD->getAccess()); DeclAccessPair FoundDecl = DeclAccessPair::make(MD, MD->getAccess());
...@@ -1666,7 +1668,7 @@ OMPClause *Sema::ActOnOpenMPCopyinClause(ArrayRef<Expr *> VarList, ...@@ -1666,7 +1668,7 @@ OMPClause *Sema::ActOnOpenMPCopyinClause(ArrayRef<Expr *> VarList,
Vars.push_back(DE); Vars.push_back(DE);
} }
if (Vars.empty()) return 0; if (Vars.empty()) return nullptr;
return OMPCopyinClause::Create(Context, StartLoc, LParenLoc, EndLoc, Vars); return OMPCopyinClause::Create(Context, StartLoc, LParenLoc, EndLoc, Vars);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment