Back out 167431+167437+167487; I didn't realize how incomplete our test
coverage of this code is.

llvm-svn: 167495
diff --git a/clang/lib/CodeGen/CGObjCRuntime.h b/clang/lib/CodeGen/CGObjCRuntime.h
index 2178692..bc6589d 100644
--- a/clang/lib/CodeGen/CGObjCRuntime.h
+++ b/clang/lib/CodeGen/CGObjCRuntime.h
@@ -76,12 +76,12 @@
   ///
   /// The latter overload is suitable for computing the offset of a
   /// sythesized ivar.
-  CharUnits ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
-                                  const ObjCInterfaceDecl *OID,
-                                  const ObjCIvarDecl *Ivar);
-  CharUnits ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
-                                  const ObjCImplementationDecl *OID,
-                                  const ObjCIvarDecl *Ivar);
+  uint64_t ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
+                                 const ObjCInterfaceDecl *OID,
+                                 const ObjCIvarDecl *Ivar);
+  uint64_t ComputeIvarBaseOffset(CodeGen::CodeGenModule &CGM,
+                                 const ObjCImplementationDecl *OID,
+                                 const ObjCIvarDecl *Ivar);
 
   LValue EmitValueForIvarAtOffset(CodeGen::CodeGenFunction &CGF,
                                   const ObjCInterfaceDecl *OID,