r208516 - [OPENMP] Removed unnecessary enums from OpenMP constructs
Alexey Bataev
a.bataev at hotmail.com
Sun May 11 21:23:46 PDT 2014
Author: abataev
Date: Sun May 11 23:23:46 2014
New Revision: 208516
URL: http://llvm.org/viewvc/llvm-project?rev=208516&view=rev
Log:
[OPENMP] Removed unnecessary enums from OpenMP constructs
Modified:
cfe/trunk/include/clang/Basic/OpenMPKinds.h
cfe/trunk/lib/Basic/OpenMPKinds.cpp
cfe/trunk/lib/Parse/ParseOpenMP.cpp
cfe/trunk/lib/Sema/SemaOpenMP.cpp
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.h?rev=208516&r1=208515&r2=208516&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/OpenMPKinds.h (original)
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.h Sun May 11 23:23:46 2014
@@ -21,30 +21,27 @@ namespace clang {
/// \brief OpenMP directives.
enum OpenMPDirectiveKind {
- OMPD_unknown = 0,
#define OPENMP_DIRECTIVE(Name) \
OMPD_##Name,
#include "clang/Basic/OpenMPKinds.def"
- NUM_OPENMP_DIRECTIVES
+ OMPD_unknown
};
/// \brief OpenMP clauses.
enum OpenMPClauseKind {
- OMPC_unknown = 0,
#define OPENMP_CLAUSE(Name, Class) \
OMPC_##Name,
#include "clang/Basic/OpenMPKinds.def"
OMPC_threadprivate,
- NUM_OPENMP_CLAUSES
+ OMPC_unknown
};
/// \brief OpenMP attributes for 'default' clause.
enum OpenMPDefaultClauseKind {
- OMPC_DEFAULT_unknown = 0,
#define OPENMP_DEFAULT_KIND(Name) \
OMPC_DEFAULT_##Name,
#include "clang/Basic/OpenMPKinds.def"
- NUM_OPENMP_DEFAULT_KINDS
+ OMPC_DEFAULT_unknown
};
/// \brief OpenMP attributes for 'proc_bind' clause.
Modified: cfe/trunk/lib/Basic/OpenMPKinds.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=208516&r1=208515&r2=208516&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)
+++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Sun May 11 23:23:46 2014
@@ -29,14 +29,13 @@ OpenMPDirectiveKind clang::getOpenMPDire
}
const char *clang::getOpenMPDirectiveName(OpenMPDirectiveKind Kind) {
- assert(Kind < NUM_OPENMP_DIRECTIVES);
+ assert(Kind <= OMPD_unknown);
switch (Kind) {
case OMPD_unknown:
return "unknown";
#define OPENMP_DIRECTIVE(Name) \
case OMPD_##Name : return #Name;
#include "clang/Basic/OpenMPKinds.def"
- case NUM_OPENMP_DIRECTIVES:
break;
}
llvm_unreachable("Invalid OpenMP directive kind");
@@ -51,7 +50,7 @@ OpenMPClauseKind clang::getOpenMPClauseK
}
const char *clang::getOpenMPClauseName(OpenMPClauseKind Kind) {
- assert(Kind < NUM_OPENMP_CLAUSES);
+ assert(Kind <= OMPC_unknown);
switch (Kind) {
case OMPC_unknown:
return "unknown";
@@ -60,8 +59,6 @@ const char *clang::getOpenMPClauseName(O
#include "clang/Basic/OpenMPKinds.def"
case OMPC_threadprivate:
return "threadprivate or thread local";
- case NUM_OPENMP_CLAUSES:
- break;
}
llvm_unreachable("Invalid OpenMP clause kind");
}
@@ -91,7 +88,6 @@ unsigned clang::getOpenMPSimpleClauseTyp
case OMPC_shared:
case OMPC_linear:
case OMPC_copyin:
- case NUM_OPENMP_CLAUSES:
break;
}
llvm_unreachable("Invalid OpenMP simple clause kind");
@@ -128,7 +124,6 @@ const char *clang::getOpenMPSimpleClause
case OMPC_shared:
case OMPC_linear:
case OMPC_copyin:
- case NUM_OPENMP_CLAUSES:
break;
}
llvm_unreachable("Invalid OpenMP simple clause kind");
@@ -136,8 +131,8 @@ const char *clang::getOpenMPSimpleClause
bool clang::isAllowedClauseForDirective(OpenMPDirectiveKind DKind,
OpenMPClauseKind CKind) {
- assert(DKind < NUM_OPENMP_DIRECTIVES);
- assert(CKind < NUM_OPENMP_CLAUSES);
+ assert(DKind <= OMPD_unknown);
+ assert(CKind <= OMPC_unknown);
switch (DKind) {
case OMPD_parallel:
switch (CKind) {
@@ -160,7 +155,6 @@ bool clang::isAllowedClauseForDirective(
case OMPD_unknown:
case OMPD_threadprivate:
case OMPD_task:
- case NUM_OPENMP_DIRECTIVES:
break;
}
return false;
Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=208516&r1=208515&r2=208516&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)
+++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Sun May 11 23:23:46 2014
@@ -63,7 +63,6 @@ Parser::DeclGroupPtrTy Parser::ParseOpen
case OMPD_parallel:
case OMPD_simd:
case OMPD_task:
- case NUM_OPENMP_DIRECTIVES:
Diag(Tok, diag::err_omp_unexpected_directive)
<< getOpenMPDirectiveName(DKind);
break;
@@ -86,8 +85,8 @@ StmtResult Parser::ParseOpenMPDeclarativ
ParenBraceBracketBalancer BalancerRAIIObj(*this);
SmallVector<Expr *, 5> Identifiers;
SmallVector<OMPClause *, 5> Clauses;
- SmallVector<llvm::PointerIntPair<OMPClause *, 1, bool>, NUM_OPENMP_CLAUSES>
- FirstClauses(NUM_OPENMP_CLAUSES);
+ SmallVector<llvm::PointerIntPair<OMPClause *, 1, bool>, OMPC_unknown + 1>
+ FirstClauses(OMPC_unknown + 1);
const unsigned ScopeFlags = Scope::FnScope | Scope::DeclScope |
Scope::OpenMPDirectiveScope;
SourceLocation Loc = ConsumeToken(), EndLoc;
@@ -177,7 +176,6 @@ StmtResult Parser::ParseOpenMPDeclarativ
SkipUntil(tok::annot_pragma_openmp_end);
break;
case OMPD_task:
- case NUM_OPENMP_DIRECTIVES:
Diag(Tok, diag::err_omp_unexpected_directive)
<< getOpenMPDirectiveName(DKind);
SkipUntil(tok::annot_pragma_openmp_end);
@@ -315,7 +313,6 @@ OMPClause *Parser::ParseOpenMPClause(Ope
SkipUntil(tok::annot_pragma_openmp_end, StopBeforeMatch);
break;
case OMPC_threadprivate:
- case NUM_OPENMP_CLAUSES:
Diag(Tok, diag::err_omp_unexpected_clause)
<< getOpenMPClauseName(CKind) << getOpenMPDirectiveName(DKind);
SkipUntil(tok::comma, tok::annot_pragma_openmp_end, StopBeforeMatch);
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=208516&r1=208515&r2=208516&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Sun May 11 23:23:46 2014
@@ -696,7 +696,6 @@ void Sema::ActOnOpenMPRegionStart(OpenMP
case OMPD_task:
llvm_unreachable("OpenMP Directive is not allowed");
case OMPD_unknown:
- case NUM_OPENMP_DIRECTIVES:
llvm_unreachable("Unknown OpenMP directive");
}
}
@@ -745,7 +744,6 @@ StmtResult Sema::ActOnOpenMPExecutableDi
case OMPD_task:
llvm_unreachable("OpenMP Directive is not allowed");
case OMPD_unknown:
- case NUM_OPENMP_DIRECTIVES:
llvm_unreachable("Unknown OpenMP directive");
}
@@ -820,7 +818,6 @@ OMPClause *Sema::ActOnOpenMPSingleExprCl
case OMPC_copyin:
case OMPC_threadprivate:
case OMPC_unknown:
- case NUM_OPENMP_CLAUSES:
llvm_unreachable("Clause is not allowed.");
}
return Res;
@@ -883,7 +880,7 @@ ExprResult Sema::PerformImplicitIntegerC
<< ConvTy->isEnumeralType() << ConvTy;
}
SemaDiagnosticBuilder diagnoseConversion(
- Sema &S, SourceLocation Loc, QualType T, QualType ConvTy) override {
+ Sema &, SourceLocation, QualType, QualType) override {
llvm_unreachable("conversion functions are permitted");
}
} ConvertDiagnoser;
@@ -981,7 +978,6 @@ OMPClause *Sema::ActOnOpenMPSimpleClause
case OMPC_copyin:
case OMPC_threadprivate:
case OMPC_unknown:
- case NUM_OPENMP_CLAUSES:
llvm_unreachable("Clause is not allowed.");
}
return Res;
@@ -994,19 +990,18 @@ OMPClause *Sema::ActOnOpenMPDefaultClaus
SourceLocation EndLoc) {
if (Kind == OMPC_DEFAULT_unknown) {
std::string Values;
- static_assert(NUM_OPENMP_DEFAULT_KINDS > 1,
- "NUM_OPENMP_DEFAULT_KINDS not greater than 1");
+ static_assert(OMPC_DEFAULT_unknown > 0,
+ "OMPC_DEFAULT_unknown not greater than 0");
std::string Sep(", ");
- for (unsigned i = OMPC_DEFAULT_unknown + 1;
- i < NUM_OPENMP_DEFAULT_KINDS; ++i) {
+ for (unsigned i = 0; i < OMPC_DEFAULT_unknown; ++i) {
Values += "'";
Values += getOpenMPSimpleClauseTypeName(OMPC_default, i);
Values += "'";
switch (i) {
- case NUM_OPENMP_DEFAULT_KINDS - 2:
+ case OMPC_DEFAULT_unknown - 2:
Values += " or ";
break;
- case NUM_OPENMP_DEFAULT_KINDS - 1:
+ case OMPC_DEFAULT_unknown - 1:
break;
default:
Values += Sep;
@@ -1025,7 +1020,6 @@ OMPClause *Sema::ActOnOpenMPDefaultClaus
DSAStack->setDefaultDSAShared();
break;
case OMPC_DEFAULT_unknown:
- case NUM_OPENMP_DEFAULT_KINDS:
llvm_unreachable("Clause kind is not allowed.");
break;
}
@@ -1096,7 +1090,6 @@ OMPClause *Sema::ActOnOpenMPVarListClaus
case OMPC_proc_bind:
case OMPC_threadprivate:
case OMPC_unknown:
- case NUM_OPENMP_CLAUSES:
llvm_unreachable("Clause is not allowed.");
}
return Res;
More information about the cfe-commits
mailing list