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 | 5a56bb83ccca4b65761e9f088381ec546ae11dc3 (patch) | |
| tree | 1266f522efcf41ca232f2e5fa0e82c48dcfb73bd /clang/lib/CodeGen/CGObjCGNU.cpp | |
| parent | 3bfa753fa12560af05b008a7070b75908e843665 (diff) | |
| download | bcm5719-llvm-5a56bb83ccca4b65761e9f088381ec546ae11dc3.tar.gz bcm5719-llvm-5a56bb83ccca4b65761e9f088381ec546ae11dc3.zip | |
Propagate CharUnits into ObjC CodeGen. No intended functional change.
llvm-svn: 167431
Diffstat (limited to 'clang/lib/CodeGen/CGObjCGNU.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjCGNU.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGObjCGNU.cpp b/clang/lib/CodeGen/CGObjCGNU.cpp index 99abf0545ba..c181034d512 100644 --- a/clang/lib/CodeGen/CGObjCGNU.cpp +++ b/clang/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 * |
