simplify some casting

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68098 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index 855764fdbd31def9a2ada2413f07f426d98260dc..cd1b979dcb0c2e3319d80c55df2b0b8292e8b63b 100644 (file)
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -338,7 +338,7 @@ ObjCInterfaceDecl(DeclContext *DC, SourceLocation atLoc, IdentifierInfo *Id,
 }
 
 void ObjCInterfaceDecl::Destroy(ASTContext &C) {  
-  for (ivar_iterator I=ivar_begin(), E=ivar_end(); I!=E; ++I)
+  for (ivar_iterator I = ivar_begin(), E = ivar_end(); I != E; ++I)
     if (*I) (*I)->Destroy(C);
   
   IVars.Destroy(C);
@@ -371,13 +371,10 @@ FieldDecl *ObjCInterfaceDecl::lookupFieldDeclForIvar(ASTContext &Context,
                                                      const ObjCIvarDecl *IVar) {
   const RecordDecl *RecordForDecl = Context.addRecordToClass(this);
   assert(RecordForDecl && "lookupFieldDeclForIvar no storage for class");
-  DeclarationName Member = IVar->getDeclName();
-  DeclContext::lookup_result Lookup =
-    (const_cast< RecordDecl *>(RecordForDecl))->lookup(Member);
+  DeclContext::lookup_const_result Lookup =
+    RecordForDecl->lookup(IVar->getDeclName());
   assert((Lookup.first != Lookup.second) && "field decl not found");
-  FieldDecl *MemberDecl = dyn_cast<FieldDecl>(*Lookup.first);
-  assert(MemberDecl && "field decl not found");
-  return MemberDecl;
+  return cast<FieldDecl>(*Lookup.first);
 }
 
 //===----------------------------------------------------------------------===//