diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-11-06 01:51:20 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-11-06 01:51:20 +0000 |
| commit | 38ad4f40aa0ddc691d9b5ecbb4e9ca6ce95f3a05 (patch) | |
| tree | 689234dcbd55d75ca545f3d7e6752ff948246da1 /lib/CodeGen/CGObjCGNU.cpp | |
| parent | 04fd3820d04032df40ec073a901cade92869c765 (diff) | |
Propagate CharUnits into ObjC CodeGen. No intended functional change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167431 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGObjCGNU.cpp')
| -rw-r--r-- | lib/CodeGen/CGObjCGNU.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp index 99abf0545b..c181034d51 100644 --- a/lib/CodeGen/CGObjCGNU.cpp +++ b/lib/CodeGen/CGObjCGNU.cpp @@ -2083,7 +2083,7 @@ void CGObjCGNU::GenerateClass(const ObjCImplementationDecl *OID) { Context.getObjCEncodingForType(IVD->getType(), TypeStr); IvarTypes.push_back(MakeConstantString(TypeStr)); // Get the offset - uint64_t BaseOffset = ComputeIvarBaseOffset(CGM, OID, IVD); + uint64_t BaseOffset = ComputeIvarBaseOffset(CGM, OID, IVD).getQuantity(); uint64_t Offset = BaseOffset; if (CGM.getLangOpts().ObjCRuntime.isNonFragile()) { Offset = BaseOffset - superInstanceSize; @@ -2655,7 +2655,7 @@ llvm::GlobalVariable *CGObjCGNU::ObjCIvarOffsetVariable( // description. if (!CGM.getContext().getObjCImplementation( const_cast<ObjCInterfaceDecl *>(ID))) - Offset = ComputeIvarBaseOffset(CGM, ID, Ivar); + Offset = ComputeIvarBaseOffset(CGM, ID, Ivar).getQuantity(); llvm::ConstantInt *OffsetGuess = llvm::ConstantInt::get(Int32Ty, Offset, /*isSigned*/true); @@ -2728,8 +2728,9 @@ llvm::Value *CGObjCGNU::EmitIvarOffset(CodeGenFunction &CGF, Offset = CGF.Builder.CreateZExtOrBitCast(Offset, PtrDiffTy); return Offset; } - uint64_t Offset = ComputeIvarBaseOffset(CGF.CGM, Interface, Ivar); - return llvm::ConstantInt::get(PtrDiffTy, Offset, /*isSigned*/true); + CharUnits Offset = ComputeIvarBaseOffset(CGF.CGM, Interface, Ivar); + return llvm::ConstantInt::get(PtrDiffTy, Offset.getQuantity(), + /*isSigned*/true); } CGObjCRuntime * |