diff options
| -rw-r--r-- | lib/AST/DeclBase.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp index 59d8a07bfd..a21d5db11a 100644 --- a/lib/AST/DeclBase.cpp +++ b/lib/AST/DeclBase.cpp @@ -513,7 +513,8 @@ void DeclContext::addDecl(ASTContext &Context, ScopedDecl *D, bool AllowLookup) /// transparent contexts nested within it). void DeclContext::buildLookup(ASTContext &Context, DeclContext *DCtx) { for (; DCtx; DCtx = DCtx->getNextContext()) { - for (decl_iterator D = DCtx->decls_begin(); D != DCtx->decls_end(); ++D) { + for (decl_iterator D = DCtx->decls_begin(), DEnd = DCtx->decls_end(); + D != DEnd; ++D) { // Insert this declaration into the lookup structure insertImpl(*D); diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index dce1e129a5..5a7d07b86f 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -3138,12 +3138,10 @@ void Sema::ActOnFields(Scope* S, } void Sema::ActOnEnumStartDefinition(Scope *S, DeclTy *EnumD) { - EnumDecl *Enum = cast_or_null<EnumDecl>((Decl *)EnumD); + EnumDecl *Enum = cast<EnumDecl>((Decl *)EnumD); - if (Enum) { - // Enter the enumeration context. - PushDeclContext(S, Enum); - } + // Enter the enumeration context. + PushDeclContext(S, Enum); } Sema::DeclTy *Sema::ActOnEnumConstant(Scope *S, DeclTy *theEnumDecl, |