Formatting fixes (trailing whitespace, 80-cols, indentation).

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

1 files changed, 1088 insertions, 1081 deletions

diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index bd7c536fba..cc1a4392ce 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -36,7 +36,7 @@ using namespace CodeGen;
 // don't belong in CGObjCRuntime either so we will live with it for
 // now.
 
-/// FindIvarInterface - Find the interface containing the ivar. 
+/// FindIvarInterface - Find the interface containing the ivar.
 ///
 /// FIXME: We shouldn't need to do this, the containing context should
 /// be fixed.
@@ -55,11 +55,11 @@ static const ObjCInterfaceDecl *FindIvarInterface(ASTContext &Context,
       return OID;
     ++Index;
   }
-  
+
   // Otherwise check in the super class.
   if (const ObjCInterfaceDecl *Super = OID->getSuperClass())
     return FindIvarInterface(Context, Super, OIVD, Index);
-    
+
   return 0;
 }
 
@@ -68,13 +68,13 @@ static uint64_t LookupFieldBitOffset(CodeGen::CodeGenModule &CGM,
                                      const ObjCImplementationDecl *ID,
                                      const ObjCIvarDecl *Ivar) {
   unsigned Index;
-  const ObjCInterfaceDecl *Container = 
+  const ObjCInterfaceDecl *Container =
     FindIvarInterface(CGM.getContext(), OID, Ivar, Index);
   assert(Container && "Unable to find ivar container");
 
   // If we know have an implementation (and the ivar is in it) then
   // look up in the implementation layout.
-  const ASTRecordLayout *RL;  
+  const ASTRecordLayout *RL;
   if (ID && ID->getClassInterface() == Container)
     RL = &CGM.getContext().getASTObjCImplementationLayout(ID);
   else
@@ -107,7 +107,7 @@ LValue CGObjCRuntime::EmitValueForIvarAtOffset(CodeGen::CodeGenFunction &CGF,
   llvm::Value *V = CGF.Builder.CreateBitCast(BaseValue, I8Ptr);
   V = CGF.Builder.CreateGEP(V, Offset, "add.ptr");
   V = CGF.Builder.CreateBitCast(V, llvm::PointerType::getUnqual(LTy));
-  
+
   if (Ivar->isBitField()) {
     // We need to compute the bit offset for the bit-field, the offset
     // is to the byte. Note, there is a subtle invariant here: we can
@@ -133,15 +133,15 @@ LValue CGObjCRuntime::EmitValueForIvarAtOffset(CodeGen::CodeGenFunction &CGF,
 
 namespace {
 
-  typedef std::vector<llvm::Constant*> ConstantVector;
+typedef std::vector<llvm::Constant*> ConstantVector;
 
-  // FIXME: We should find a nicer way to make the labels for metadata, string
-  // concatenation is lame.
+// FIXME: We should find a nicer way to make the labels for metadata, string
+// concatenation is lame.
 
 class ObjCCommonTypesHelper {
 protected:
   llvm::LLVMContext &VMContext;
-  
+
 private:
   llvm::Constant *getMessageSendFn() const {
     // id objc_msgSend (id, SEL, ...)
@@ -149,23 +149,23 @@ private:
     Params.push_back(ObjectPtrTy);
     Params.push_back(SelectorPtrTy);
     return
-    CGM.CreateRuntimeFunction(llvm::FunctionType::get(ObjectPtrTy,
-                                                      Params, true),
-                              "objc_msgSend");
+      CGM.CreateRuntimeFunction(llvm::FunctionType::get(ObjectPtrTy,
+                                                        Params, true),
+                                "objc_msgSend");
   }
-  
+
   llvm::Constant *getMessageSendStretFn() const {
     // id objc_msgSend_stret (id, SEL, ...)
     std::vector<const llvm::Type*> Params;
     Params.push_back(ObjectPtrTy);
     Params.push_back(SelectorPtrTy);
     return
-    CGM.CreateRuntimeFunction(llvm::FunctionType::get(llvm::Type::VoidTy,
-                                                      Params, true),
-                              "objc_msgSend_stret");
-    
+      CGM.CreateRuntimeFunction(llvm::FunctionType::get(llvm::Type::VoidTy,
+                                                        Params, true),
+                                "objc_msgSend_stret");
+
   }
-  
+
   llvm::Constant *getMessageSendFpretFn() const {
     // FIXME: This should be long double on x86_64?
     // [double | long double] objc_msgSend_fpret(id self, SEL op, ...)
@@ -173,13 +173,13 @@ private:
     Params.push_back(ObjectPtrTy);
     Params.push_back(SelectorPtrTy);
     return
-    CGM.CreateRuntimeFunction(llvm::FunctionType::get(llvm::Type::DoubleTy,
-                                                      Params,
-                                                      true),
-                              "objc_msgSend_fpret");
-    
+      CGM.CreateRuntimeFunction(llvm::FunctionType::get(llvm::Type::DoubleTy,
+                                                        Params,
+                                                        true),
+                                "objc_msgSend_fpret");
+
   }
-  
+
   llvm::Constant *getMessageSendSuperFn() const {
     // id objc_msgSendSuper(struct objc_super *super, SEL op, ...)
     const char *SuperName = "objc_msgSendSuper";
@@ -190,7 +190,7 @@ private:
                                                              Params, true),
                                      SuperName);
   }
-  
+
   llvm::Constant *getMessageSendSuperFn2() const {
     // id objc_msgSendSuper2(struct objc_super *super, SEL op, ...)
     const char *SuperName = "objc_msgSendSuper2";
@@ -201,7 +201,7 @@ private:
                                                              Params, true),
                                      SuperName);
   }
-  
+
   llvm::Constant *getMessageSendSuperStretFn() const {
     // void objc_msgSendSuper_stret(void * stretAddr, struct objc_super *super,
     //                              SEL op, ...)
@@ -210,11 +210,11 @@ private:
     Params.push_back(SuperPtrTy);
     Params.push_back(SelectorPtrTy);
     return CGM.CreateRuntimeFunction(
-                                  llvm::FunctionType::get(llvm::Type::VoidTy,
-                                                             Params, true),
-                                     "objc_msgSendSuper_stret");
+      llvm::FunctionType::get(llvm::Type::VoidTy,
+                              Params, true),
+      "objc_msgSendSuper_stret");
   }
-  
+
   llvm::Constant *getMessageSendSuperStretFn2() const {
     // void objc_msgSendSuper2_stret(void * stretAddr, struct objc_super *super,
     //                               SEL op, ...)
@@ -223,68 +223,68 @@ private:
     Params.push_back(SuperPtrTy);
     Params.push_back(SelectorPtrTy);
     return CGM.CreateRuntimeFunction(
-                                   llvm::FunctionType::get(llvm::Type::VoidTy,
-                                                             Params, true),
-                                     "objc_msgSendSuper2_stret");
+      llvm::FunctionType::get(llvm::Type::VoidTy,
+                              Params, true),
+      "objc_msgSendSuper2_stret");
   }
-  
+
   llvm::Constant *getMessageSendSuperFpretFn() const {
     // There is no objc_msgSendSuper_fpret? How can that work?
     return getMessageSendSuperFn();
   }
-  
+
   llvm::Constant *getMessageSendSuperFpretFn2() const {
     // There is no objc_msgSendSuper_fpret? How can that work?
     return getMessageSendSuperFn2();
   }
-  
+
 protected:
   CodeGen::CodeGenModule &CGM;
-  
+
 public:
   const llvm::Type *ShortTy, *IntTy, *LongTy, *LongLongTy;
   const llvm::Type *Int8PtrTy;
-  
+
   /// ObjectPtrTy - LLVM type for object handles (typeof(id))
   const llvm::Type *ObjectPtrTy;
-  
+
   /// PtrObjectPtrTy - LLVM type for id *
   const llvm::Type *PtrObjectPtrTy;
-  
+
   /// SelectorPtrTy - LLVM type for selector handles (typeof(SEL))
   const llvm::Type *SelectorPtrTy;
   /// ProtocolPtrTy - LLVM type for external protocol handles
   /// (typeof(Protocol))
   const llvm::Type *ExternalProtocolPtrTy;
-  
+
   // SuperCTy - clang type for struct objc_super.
   QualType SuperCTy;
   // SuperPtrCTy - clang type for struct objc_super *.
   QualType SuperPtrCTy;
-  
+
   /// SuperTy - LLVM type for struct objc_super.
   const llvm::StructType *SuperTy;
   /// SuperPtrTy - LLVM type for struct objc_super *.
   const llvm::Type *SuperPtrTy;
-  
+
   /// PropertyTy - LLVM type for struct objc_property (struct _prop_t
   /// in GCC parlance).
   const llvm::StructType *PropertyTy;
-  
+
   /// PropertyListTy - LLVM type for struct objc_property_list
   /// (_prop_list_t in GCC parlance).
   const llvm::StructType *PropertyListTy;
   /// PropertyListPtrTy - LLVM type for struct objc_property_list*.
   const llvm::Type *PropertyListPtrTy;
-  
+
   // MethodTy - LLVM type for struct objc_method.
   const llvm::StructType *MethodTy;
-  
+
   /// CacheTy - LLVM type for struct objc_cache.
   const llvm::Type *CacheTy;
   /// CachePtrTy - LLVM type for struct objc_cache *.
   const llvm::Type *CachePtrTy;
-  
+
   llvm::Constant *getGetPropertyFn() {
     CodeGen::CodeGenTypes &Types = CGM.getTypes();
     ASTContext &Ctx = CGM.getContext();
@@ -300,7 +300,7 @@ public:
       Types.GetFunctionType(Types.getFunctionInfo(IdType, Params), false);
     return CGM.CreateRuntimeFunction(FTy, "objc_getProperty");
   }
-  
+
   llvm::Constant *getSetPropertyFn() {
     CodeGen::CodeGenTypes &Types = CGM.getTypes();
     ASTContext &Ctx = CGM.getContext();
@@ -318,7 +318,7 @@ public:
       Types.GetFunctionType(Types.getFunctionInfo(Ctx.VoidTy, Params), false);
     return CGM.CreateRuntimeFunction(FTy, "objc_setProperty");
   }
-  
+
   llvm::Constant *getEnumerationMutationFn() {
     CodeGen::CodeGenTypes &Types = CGM.getTypes();
     ASTContext &Ctx = CGM.getContext();
@@ -329,17 +329,17 @@ public:
       Types.GetFunctionType(Types.getFunctionInfo(Ctx.VoidTy, Params), false);
     return CGM.CreateRuntimeFunction(FTy, "objc_enumerationMutation");
   }
-  
+
   /// GcReadWeakFn -- LLVM objc_read_weak (id *src) function.
   llvm::Constant *getGcReadWeakFn() {
     // id objc_read_weak (id *)
     std::vector<const llvm::Type*> Args;
     Args.push_back(ObjectPtrTy->getPointerTo());
-    llvm::FunctionType *FTy = 
+    llvm::FunctionType *FTy =
       llvm::FunctionType::get(ObjectPtrTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_read_weak");
-  }    
-  
+  }
+
   /// GcAssignWeakFn -- LLVM objc_assign_weak function.
   llvm::Constant *getGcAssignWeakFn() {
     // id objc_assign_weak (id, id *)
@@ -349,7 +349,7 @@ public:
       llvm::FunctionType::get(ObjectPtrTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_assign_weak");
   }
-  
+
   /// GcAssignGlobalFn -- LLVM objc_assign_global function.
   llvm::Constant *getGcAssignGlobalFn() {
     // id objc_assign_global(id, id *)
@@ -359,7 +359,7 @@ public:
       llvm::FunctionType::get(ObjectPtrTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_assign_global");
   }
-  
+
   /// GcAssignIvarFn -- LLVM objc_assign_ivar function.
   llvm::Constant *getGcAssignIvarFn() {
     // id objc_assign_ivar(id, id *)
@@ -369,7 +369,7 @@ public:
       llvm::FunctionType::get(ObjectPtrTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_assign_ivar");
   }
-  
+
   /// GcMemmoveCollectableFn -- LLVM objc_memmove_collectable function.
   llvm::Constant *GcMemmoveCollectableFn() {
     // void *objc_memmove_collectable(void *dst, const void *src, size_t size)
@@ -379,7 +379,7 @@ public:
     llvm::FunctionType *FTy = llvm::FunctionType::get(Int8PtrTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_memmove_collectable");
   }
-  
+
   /// GcAssignStrongCastFn -- LLVM objc_assign_strongCast function.
   llvm::Constant *getGcAssignStrongCastFn() {
     // id objc_assign_global(id, id *)
@@ -398,7 +398,7 @@ public:
       llvm::FunctionType::get(llvm::Type::VoidTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_exception_throw");
   }
-  
+
   /// SyncEnterFn - LLVM object_sync_enter function.
   llvm::Constant *getSyncEnterFn() {
     // void objc_sync_enter (id)
@@ -407,7 +407,7 @@ public:
       llvm::FunctionType::get(llvm::Type::VoidTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_sync_enter");
   }
-  
+
   /// SyncExitFn - LLVM object_sync_exit function.
   llvm::Constant *getSyncExitFn() {
     // void objc_sync_exit (id)
@@ -416,31 +416,31 @@ public:
       llvm::FunctionType::get(llvm::Type::VoidTy, Args, false);
     return CGM.CreateRuntimeFunction(FTy, "objc_sync_exit");
   }
-  
+
   llvm::Constant *getSendFn(bool IsSuper) const {
     return IsSuper ? getMessageSendSuperFn() : getMessageSendFn();
   }
-  
+
   llvm::Constant *getSendFn2(bool IsSuper) const {
     return IsSuper ? getMessageSendSuperFn2() : getMessageSendFn();
   }
-  
+
   llvm::Constant *getSendStretFn(bool IsSuper) const {
     return IsSuper ? getMessageSendSuperStretFn() : getMessageSendStretFn();
   }
-  
+
   llvm::Constant *getSendStretFn2(bool IsSuper) const {
     return IsSuper ? getMessageSendSuperStretFn2() : getMessageSendStretFn();
   }
-  
+
   llvm::Constant *getSendFpretFn(bool IsSuper) const {
     return IsSuper ? getMessageSendSuperFpretFn() : getMessageSendFpretFn();
   }
-  
+
   llvm::Constant *getSendFpretFn2(bool IsSuper) const {
     return IsSuper ? getMessageSendSuperFpretFn2() : getMessageSendFpretFn();
   }
-  
+
   ObjCCommonTypesHelper(CodeGen::CodeGenModule &cgm);
   ~ObjCCommonTypesHelper(){}
 };
@@ -499,18 +499,18 @@ public:
   const llvm::Type *MethodListTy;
   /// MethodListPtrTy - LLVM type for struct objc_method_list *.
   const llvm::Type *MethodListPtrTy;
-  
+
   /// ExceptionDataTy - LLVM type for struct _objc_exception_data.
   const llvm::Type *ExceptionDataTy;
-  
+
   /// ExceptionTryEnterFn - LLVM objc_exception_try_enter function.
   llvm::Constant *getExceptionTryEnterFn() {
     std::vector<const llvm::Type*> Params;
     Params.push_back(llvm::PointerType::getUnqual(ExceptionDataTy));
     return CGM.CreateRuntimeFunction(
-                                   llvm::FunctionType::get(llvm::Type::VoidTy,
-                                                             Params, false),
-                                     "objc_exception_try_enter");
+      llvm::FunctionType::get(llvm::Type::VoidTy,
+                              Params, false),
+      "objc_exception_try_enter");
   }
 
   /// ExceptionTryExitFn - LLVM objc_exception_try_exit function.
@@ -518,9 +518,9 @@ public:
     std::vector<const llvm::Type*> Params;
     Params.push_back(llvm::PointerType::getUnqual(ExceptionDataTy));
     return CGM.CreateRuntimeFunction(
-                                   llvm::FunctionType::get(llvm::Type::VoidTy,
-                                                             Params, false),
-                                     "objc_exception_try_exit");
+      llvm::FunctionType::get(llvm::Type::VoidTy,
+                              Params, false),
+      "objc_exception_try_exit");
   }
 
   /// ExceptionExtractFn - LLVM objc_exception_extract function.
@@ -530,21 +530,21 @@ public:
     return CGM.CreateRuntimeFunction(llvm::FunctionType::get(ObjectPtrTy,
                                                              Params, false),
                                      "objc_exception_extract");
-    
+
   }
-  
+
   /// ExceptionMatchFn - LLVM objc_exception_match function.
   llvm::Constant *getExceptionMatchFn() {
     std::vector<const llvm::Type*> Params;
     Params.push_back(ClassPtrTy);
     Params.push_back(ObjectPtrTy);
-   return CGM.CreateRuntimeFunction(
-                                  llvm::FunctionType::get(llvm::Type::Int32Ty,
-                                                            Params, false),
-                                    "objc_exception_match");
-    
+    return CGM.CreateRuntimeFunction(
+      llvm::FunctionType::get(llvm::Type::Int32Ty,
+                              Params, false),
+      "objc_exception_match");
+
   }
-  
+
   /// SetJmpFn - LLVM _setjmp function.
   llvm::Constant *getSetJmpFn() {
     std::vector<const llvm::Type*> Params;
@@ -553,9 +553,9 @@ public:
       CGM.CreateRuntimeFunction(llvm::FunctionType::get(llvm::Type::Int32Ty,
                                                         Params, false),
                                 "_setjmp");
-    
+
   }
-  
+
 public:
   ObjCTypesHelper(CodeGen::CodeGenModule &cgm);
   ~ObjCTypesHelper() {}
@@ -565,51 +565,51 @@ public:
 /// modern abi
 class ObjCNonFragileABITypesHelper : public ObjCCommonTypesHelper {
 public:
-          
+
   // MethodListnfABITy - LLVM for struct _method_list_t
   const llvm::StructType *MethodListnfABITy;
-  
+
   // MethodListnfABIPtrTy - LLVM for struct _method_list_t*
   const llvm::Type *MethodListnfABIPtrTy;
-  
+
   // ProtocolnfABITy = LLVM for struct _protocol_t
   const llvm::StructType *ProtocolnfABITy;
-  
+
   // ProtocolnfABIPtrTy = LLVM for struct _protocol_t*
   const llvm::Type *ProtocolnfABIPtrTy;
 
   // ProtocolListnfABITy - LLVM for struct _objc_protocol_list
   const llvm::StructType *ProtocolListnfABITy;
-  
+
   // ProtocolListnfABIPtrTy - LLVM for struct _objc_protocol_list*
   const llvm::Type *ProtocolListnfABIPtrTy;
-  
+
   // ClassnfABITy - LLVM for struct _class_t
   const llvm::StructType *ClassnfABITy;
-  
+
   // ClassnfABIPtrTy - LLVM for struct _class_t*
   const llvm::Type *ClassnfABIPtrTy;
-  
+
   // IvarnfABITy - LLVM for struct _ivar_t
   const llvm::StructType *IvarnfABITy;
-  
+
   // IvarListnfABITy - LLVM for struct _ivar_list_t
   const llvm::StructType *IvarListnfABITy;
-  
+
   // IvarListnfABIPtrTy = LLVM for struct _ivar_list_t*
   const llvm::Type *IvarListnfABIPtrTy;
-  
+
   // ClassRonfABITy - LLVM for struct _class_ro_t
   const llvm::StructType *ClassRonfABITy;
-  
+
   // ImpnfABITy - LLVM for id (*)(id, SEL, ...)
   const llvm::Type *ImpnfABITy;
-  
+
   // CategorynfABITy - LLVM for struct _category_t
   const llvm::StructType *CategorynfABITy;
-  
+
   // New types for nonfragile abi messaging.
-  
+
   // MessageRefTy - LLVM for:
   // struct _message_ref_t {
   //   IMP messenger;
@@ -618,22 +618,22 @@ public:
   const llvm::StructType *MessageRefTy;
   // MessageRefCTy - clang type for struct _message_ref_t
   QualType MessageRefCTy;
-  
+
   // MessageRefPtrTy - LLVM for struct _message_ref_t*
   const llvm::Type *MessageRefPtrTy;
   // MessageRefCPtrTy - clang type for struct _message_ref_t*
   QualType MessageRefCPtrTy;
-  
+
   // MessengerTy - Type of the messenger (shown as IMP above)
   const llvm::FunctionType *MessengerTy;
-  
+
   // SuperMessageRefTy - LLVM for:
   // struct _super_message_ref_t {
   //   SUPER_IMP messenger;
   //   SEL name;
   // };
   const llvm::StructType *SuperMessageRefTy;
-  
+
   // SuperMessageRefPtrTy - LLVM for struct _super_message_ref_t*
   const llvm::Type *SuperMessageRefPtrTy;
 
@@ -646,7 +646,7 @@ public:
                                                              Params, true),
                                      "objc_msgSend_fixup");
   }
-  
+
   llvm::Constant *getMessageSendFpretFixupFn() {
     // id objc_msgSend_fpret_fixup(id, struct message_ref_t*, ...)
     std::vector<const llvm::Type*> Params;
@@ -656,7 +656,7 @@ public:
                                                              Params, true),
                                      "objc_msgSend_fpret_fixup");
   }
-  
+
   llvm::Constant *getMessageSendStretFixupFn() {
     // id objc_msgSend_stret_fixup(id, struct message_ref_t*, ...)
     std::vector<const llvm::Type*> Params;
@@ -666,7 +666,7 @@ public:
                                                              Params, true),
                                      "objc_msgSend_stret_fixup");
   }
-  
+
   llvm::Constant *getMessageSendIdFixupFn() {
     // id objc_msgSendId_fixup(id, struct message_ref_t*, ...)
     std::vector<const llvm::Type*> Params;
@@ -676,7 +676,7 @@ public:
                                                              Params, true),
                                      "objc_msgSendId_fixup");
   }
-  
+
   llvm::Constant *getMessageSendIdStretFixupFn() {
     // id objc_msgSendId_stret_fixup(id, struct message_ref_t*, ...)
     std::vector<const llvm::Type*> Params;
@@ -687,7 +687,7 @@ public:
                                      "objc_msgSendId_stret_fixup");
   }
   llvm::Constant *getMessageSendSuper2FixupFn() {
-    // id objc_msgSendSuper2_fixup (struct objc_super *, 
+    // id objc_msgSendSuper2_fixup (struct objc_super *,
     //                              struct _super_message_ref_t*, ...)
     std::vector<const llvm::Type*> Params;
     Params.push_back(SuperPtrTy);
@@ -696,9 +696,9 @@ public:
                                                               Params, true),
                                       "objc_msgSendSuper2_fixup");
   }
-  
+
   llvm::Constant *getMessageSendSuper2StretFixupFn() {
-    // id objc_msgSendSuper2_stret_fixup(struct objc_super *, 
+    // id objc_msgSendSuper2_stret_fixup(struct objc_super *,
     //                                   struct _super_message_ref_t*, ...)
     std::vector<const llvm::Type*> Params;
     Params.push_back(SuperPtrTy);
@@ -707,16 +707,16 @@ public:
                                                               Params, true),
                                       "objc_msgSendSuper2_stret_fixup");
   }
-  
-  
-  
+
+
+
   /// EHPersonalityPtr - LLVM value for an i8* to the Objective-C
   /// exception personality function.
   llvm::Value *getEHPersonalityPtr() {
-    llvm::Constant *Personality = 
+    llvm::Constant *Personality =
       CGM.CreateRuntimeFunction(llvm::FunctionType::get(llvm::Type::Int32Ty,
                                                         true),
-                              "__objc_personality_v0");
+                                "__objc_personality_v0");
     return llvm::ConstantExpr::getBitCast(Personality, Int8PtrTy);
   }
 
@@ -724,18 +724,18 @@ public:
     std::vector<const llvm::Type*> Params;
     Params.push_back(Int8PtrTy);
     return CGM.CreateRuntimeFunction(
-                                   llvm::FunctionType::get(llvm::Type::VoidTy,
-                                                             Params, false),
-                                     "_Unwind_Resume_or_Rethrow");
+      llvm::FunctionType::get(llvm::Type::VoidTy,
+                              Params, false),
+      "_Unwind_Resume_or_Rethrow");
   }
-  
+
   llvm::Constant *getObjCEndCatchFn() {
     return CGM.CreateRuntimeFunction(llvm::FunctionType::get(llvm::Type::VoidTy,
                                                              false),
                                      "objc_end_catch");
-    
+
   }
-  
+
   llvm::Constant *getObjCBeginCatchFn() {
     std::vector<const llvm::Type*> Params;
     Params.push_back(Int8PtrTy);
@@ -750,7 +750,7 @@ public:
   ObjCNonFragileABITypesHelper(CodeGen::CodeGenModule &cgm);
   ~ObjCNonFragileABITypesHelper(){}
 };
-  
+
 class CGObjCCommonMac : public CodeGen::CGObjCRuntime {
 public:
   // FIXME - accessibility
@@ -759,126 +759,126 @@ public:
     unsigned ivar_bytepos;
     unsigned ivar_size;
     GC_IVAR(unsigned bytepos = 0, unsigned size = 0)
-       : ivar_bytepos(bytepos), ivar_size(size) {}
+      : ivar_bytepos(bytepos), ivar_size(size) {}
 
     // Allow sorting based on byte pos.
     bool operator<(const GC_IVAR &b) const {
       return ivar_bytepos < b.ivar_bytepos;
     }
   };
-  
+
   class SKIP_SCAN {
   public:
     unsigned skip;
     unsigned scan;
-    SKIP_SCAN(unsigned _skip = 0, unsigned _scan = 0) 
+    SKIP_SCAN(unsigned _skip = 0, unsigned _scan = 0)
       : skip(_skip), scan(_scan) {}
   };
-  
+
 protected:
   CodeGen::CodeGenModule &CGM;
   llvm::LLVMContext &VMContext;
   // FIXME! May not be needing this after all.
   unsigned ObjCABI;
-  
+
   // gc ivar layout bitmap calculation helper caches.
   llvm::SmallVector<GC_IVAR, 16> SkipIvars;
   llvm::SmallVector<GC_IVAR, 16> IvarsInfo;
-  
+
   /// LazySymbols - Symbols to generate a lazy reference for. See
   /// DefinedSymbols and FinishModule().
   std::set<IdentifierInfo*> LazySymbols;
-  
+
   /// DefinedSymbols - External symbols which are defined by this
   /// module. The symbols in this list and LazySymbols are used to add
   /// special linker symbols which ensure that Objective-C modules are
   /// linked properly.
   std::set<IdentifierInfo*> DefinedSymbols;
-  
+
   /// ClassNames - uniqued class names.
   llvm::DenseMap<IdentifierInfo*, llvm::GlobalVariable*> ClassNames;
-  
+
   /// MethodVarNames - uniqued method variable names.
   llvm::DenseMap<Selector, llvm::GlobalVariable*> MethodVarNames;
-  
+
   /// MethodVarTypes - uniqued method type signatures. We have to use
   /// a StringMap here because have no other unique reference.
   llvm::StringMap<llvm::GlobalVariable*> MethodVarTypes;
-  
+
   /// MethodDefinitions - map of methods which have been defined in
   /// this translation unit.
   llvm::DenseMap<const ObjCMethodDecl*, llvm::Function*> MethodDefinitions;
-  
+
   /// PropertyNames - uniqued method variable names.
   llvm::DenseMap<IdentifierInfo*, llvm::GlobalVariable*> PropertyNames;
-  
+
   /// ClassReferences - uniqued class references.
   llvm::DenseMap<IdentifierInfo*, llvm::GlobalVariable*> ClassReferences;
-  
+
   /// SelectorReferences - uniqued selector references.
   llvm::DenseMap<Selector, llvm::GlobalVariable*> SelectorReferences;
-  
+
   /// Protocols - Protocols for which an objc_protocol structure has
   /// been emitted. Forward declarations are handled by creating an
   /// empty structure whose initializer is filled in when/if defined.
   llvm::DenseMap<IdentifierInfo*, llvm::GlobalVariable*> Protocols;
-  
+
   /// DefinedProtocols - Protocols which have actually been
   /// defined. We should not need this, see FIXME in GenerateProtocol.
   llvm::DenseSet<IdentifierInfo*> DefinedProtocols;
-  
+
   /// DefinedClasses - List of defined classes.
   std::vector<llvm::GlobalValue*> DefinedClasses;
 
   /// DefinedNonLazyClasses - List of defined "non-lazy" classes.
   std::vector<llvm::GlobalValue*> DefinedNonLazyClasses;
-  
+
   /// DefinedCategories - List of defined categories.
   std::vector<llvm::GlobalValue*> DefinedCategories;
-  
+
   /// DefinedNonLazyCategories - List of defined "non-lazy" categories.
   std::vector<llvm::GlobalValue*> DefinedNonLazyCategories;
-  
+
   /// GetNameForMethod - Return a name for the given method.
   /// \param[out] NameOut - The return value.
   void GetNameForMethod(const ObjCMethodDecl *OMD,
                         const ObjCContainerDecl *CD,
                         std::string &NameOut);
-  
+
   /// GetMethodVarName - Return a unique constant for the given
   /// selector's name. The return value has type char *.
   llvm::Constant *GetMethodVarName(Selector Sel);
   llvm::Constant *GetMethodVarName(IdentifierInfo *Ident);
   llvm::Constant *GetMethodVarName(const std::string &Name);
-  
+
   /// GetMethodVarType - Return a unique constant for the given
   /// selector's name. The return value has type char *.
-  
+
   // FIXME: This is a horrible name.
   llvm::Constant *GetMethodVarType(const ObjCMethodDecl *D);
   llvm::Constant *GetMethodVarType(const FieldDecl *D);
-  
+
   /// GetPropertyName - Return a unique constant for the given
   /// name. The return value has type char *.
   llvm::Constant *GetPropertyName(IdentifierInfo *Ident);
-  
+
   // FIXME: This can be dropped once string functions are unified.
   llvm::Constant *GetPropertyTypeString(const ObjCPropertyDecl *PD,
                                         const Decl *Container);
-  
+
   /// GetClassName - Return a unique constant for the given selector's
   /// name. The return value has type char *.
   llvm::Constant *GetClassName(IdentifierInfo *Ident);
-  
+
   /// BuildIvarLayout - Builds ivar layout bitmap for the class
   /// implementation for the __strong or __weak case.
   ///
   llvm::Constant *BuildIvarLayout(const ObjCImplementationDecl *OI,
                                   bool ForStrongLayout);
-  
+
   void BuildAggrIvarRecordLayout(const RecordType *RT,
-                           unsigned int BytePos, bool ForStrongLayout,
-                           bool &HasUnion);
+                                 unsigned int BytePos, bool ForStrongLayout,
+                                 bool &HasUnion);
   void BuildAggrIvarLayout(const ObjCImplementationDecl *OI,
                            const llvm::StructLayout *Layout,
                            const RecordDecl *RD,
@@ -890,14 +890,14 @@ protected:
   /// ivar layout bitmap.
   llvm::Constant *GetIvarLayoutName(IdentifierInfo *Ident,
                                     const ObjCCommonTypesHelper &ObjCTypes);
-  
+
   /// EmitPropertyList - Emit the given property list. The return
   /// value has type PropertyListPtrTy.
   llvm::Constant *EmitPropertyList(const std::string &Name,
-                                   const Decl *Container, 
+                                   const Decl *Container,
                                    const ObjCContainerDecl *OCD,
                                    const ObjCCommonTypesHelper &ObjCTypes);
-  
+
   /// GetProtocolRef - Return a reference to the internal protocol
   /// description, creating an empty one if it has not been
   /// defined. The return value has type ProtocolPtrTy.
@@ -935,27 +935,27 @@ protected:
 public:
   CGObjCCommonMac(CodeGen::CodeGenModule &cgm) :
     CGM(cgm), VMContext(cgm.getLLVMContext())
-  { }
-  
+    { }
+
   virtual llvm::Constant *GenerateConstantString(const ObjCStringLiteral *SL);
-  
+
   virtual llvm::Function *GenerateMethod(const ObjCMethodDecl *OMD,
                                          const ObjCContainerDecl *CD=0);
-  
+
   virtual void GenerateProtocol(const ObjCProtocolDecl *PD);
-  
+
   /// GetOrEmitProtocol - Get the protocol object for the given
   /// declaration, emitting it if necessary. The return value has type
   /// ProtocolPtrTy.
   virtual llvm::Constant *GetOrEmitProtocol(const ObjCProtocolDecl *PD)=0;
-  
+
   /// GetOrEmitProtocolRef - Get a forward reference to the protocol
   /// object for the given declaration, emitting it if needed. These
   /// forward references will be filled in with empty bodies if no
   /// definition is seen. The return value has type ProtocolPtrTy.
   virtual llvm::Constant *GetOrEmitProtocolRef(const ObjCProtocolDecl *PD)=0;
 };
-  
+
 class CGObjCMac : public CGObjCCommonMac {
 private:
   ObjCTypesHelper ObjCTypes;
@@ -964,7 +964,7 @@ private:
   void EmitImageInfo();
 
   /// EmitModuleInfo - Another marker encoding module level
-  /// information. 
+  /// information.
   void EmitModuleInfo();
 
   /// EmitModuleSymols - Emit module symbols, the list of defined
@@ -982,7 +982,7 @@ private:
 
   /// EmitClassRef - Return a Value*, of type ObjCTypes.ClassPtrTy,
   /// for the given class.
-  llvm::Value *EmitClassRef(CGBuilderTy &Builder, 
+  llvm::Value *EmitClassRef(CGBuilderTy &Builder,
                             const ObjCInterfaceDecl *ID);
 
   CodeGen::RValue EmitMessageSend(CodeGen::CodeGenFunction &CGF,
@@ -1000,7 +1000,7 @@ private:
   /// IvarListPtrTy.
   llvm::Constant *EmitIvarList(const ObjCImplementationDecl *ID,
                                bool ForClass);
-                               
+
   /// EmitMetaClass - Emit a forward reference to the class structure
   /// for the metaclass of the given interface. The return value has
   /// type ClassPtrTy.
@@ -1011,9 +1011,9 @@ private:
   llvm::Constant *EmitMetaClass(const ObjCImplementationDecl *ID,
                                 llvm::Constant *Protocols,
                                 const ConstantVector &Methods);
-  
+
   llvm::Constant *GetMethodConstant(const ObjCMethodDecl *MD);
-  
+
   llvm::Constant *GetMethodDescriptionConstant(const ObjCMethodDecl *MD);
 
   /// EmitMethodList - Emit the method list for the given
@@ -1023,7 +1023,7 @@ private:
                                  const ConstantVector &Methods);
 
   /// EmitMethodDescList - Emit a method description list for a list of
-  /// method declarations. 
+  /// method declarations.
   ///  - TypeName: The name for the type containing the methods.
   ///  - IsProtocol: True iff these methods are for a protocol.
   ///  - ClassMethds: True iff these are class methods.
@@ -1066,12 +1066,12 @@ private:
   /// EmitSelector - Return a Value*, of type ObjCTypes.SelectorPtrTy,
   /// for the given selector.
   llvm::Value *EmitSelector(CGBuilderTy &Builder, Selector Sel);
-  
-  public:
+
+public:
   CGObjCMac(CodeGen::CodeGenModule &cgm);
 
   virtual llvm::Function *ModuleInitFunction();
-  
+
   virtual CodeGen::RValue GenerateMessageSend(CodeGen::CodeGenFunction &CGF,
                                               QualType ResultType,
                                               Selector Sel,
@@ -1080,7 +1080,7 @@ private:
                                               const CallArgList &CallArgs,
                                               const ObjCMethodDecl *Method);
 
-  virtual CodeGen::RValue 
+  virtual CodeGen::RValue
   GenerateMessageSendSuper(CodeGen::CodeGenFunction &CGF,
                            QualType ResultType,
                            Selector Sel,
@@ -1089,7 +1089,7 @@ private:
                            llvm::Value *Receiver,
                            bool IsClassMessage,
                            const CallArgList &CallArgs);
-  
+
   virtual llvm::Value *GetClass(CGBuilderTy &Builder,
                                 const ObjCInterfaceDecl *ID);
 
@@ -1106,19 +1106,19 @@ private:
 
   virtual llvm::Value *GenerateProtocolRef(CGBuilderTy &Builder,
                                            const ObjCProtocolDecl *PD);
-    
+
   virtual llvm::Constant *GetPropertyGetFunction();
   virtual llvm::Constant *GetPropertySetFunction();
   virtual llvm::Constant *EnumerationMutationFunction();
-  
+
   virtual void EmitTryOrSynchronizedStmt(CodeGen::CodeGenFunction &CGF,
                                          const Stmt &S);
   virtual void EmitThrowStmt(CodeGen::CodeGenFunction &CGF,
                              const ObjCAtThrowStmt &S);
   virtual llvm::Value * EmitObjCWeakRead(CodeGen::CodeGenFunction &CGF,
-                                         llvm::Value *AddrWeakObj); 
+                                         llvm::Value *AddrWeakObj);
   virtual void EmitObjCWeakAssign(CodeGen::CodeGenFunction &CGF,
-                                  llvm::Value *src, llvm::Value *dst); 
+                                  llvm::Value *src, llvm::Value *dst);
   virtual void EmitObjCGlobalAssign(CodeGen::CodeGenFunction &CGF,
                                     llvm::Value *src, llvm::Value *dest);
   virtual void EmitObjCIvarAssign(CodeGen::CodeGenFunction &CGF,
@@ -1128,7 +1128,7 @@ private:
   virtual void EmitGCMemmoveCollectable(CodeGen::CodeGenFunction &CGF,
                                         llvm::Value *dest, llvm::Value *src,
                                         unsigned long size);
-  
+
   virtual LValue EmitObjCValueForIvar(CodeGen::CodeGenFunction &CGF,
                                       QualType ObjectTy,
                                       llvm::Value *BaseValue,
@@ -1138,30 +1138,30 @@ private:
                                       const ObjCInterfaceDecl *Interface,
                                       const ObjCIvarDecl *Ivar);
 };
-  
+
 class CGObjCNonFragileABIMac : public CGObjCCommonMac {
 private:
   ObjCNonFragileABITypesHelper ObjCTypes;
   llvm::GlobalVariable* ObjCEmptyCacheVar;
   llvm::GlobalVariable* ObjCEmptyVtableVar;
-  
+
   /// SuperClassReferences - uniqued super class references.
   llvm::DenseMap<IdentifierInfo*, llvm::GlobalVariable*> SuperClassReferences;
-  
+
   /// MetaClassReferences - uniqued meta class references.
   llvm::DenseMap<IdentifierInfo*, llvm::GlobalVariable*> MetaClassReferences;
 
   /// EHTypeReferences - uniqued class ehtype references.