Commit 514b9ee7 authored by Bill Wendling's avatar Bill Wendling
Browse files

--- Merging r128102 into '.': 

U    lib/CodeGen/CGObjCGNU.cpp

llvm-svn: 128165
parent bc552ec9

clang/lib/CodeGen/CGObjCGNU.cpp

+5 −3
Original line number Diff line number Diff line
@@ -2451,11 +2451,13 @@ llvm::Value *CGObjCGNU::EmitIvarOffset(CodeGen::CodeGenFunction &CGF, 
                         const ObjCIvarDecl *Ivar) {

  if (CGM.getLangOptions().ObjCNonFragileABI) {

    Interface = FindIvarInterface(CGM.getContext(), Interface, Ivar);

    return CGF.Builder.CreateLoad(CGF.Builder.CreateLoad(

                ObjCIvarOffsetVariable(Interface, Ivar), false, "ivar"));

    return CGF.Builder.CreateZExtOrBitCast(

        CGF.Builder.CreateLoad(CGF.Builder.CreateLoad(

                ObjCIvarOffsetVariable(Interface, Ivar), false, "ivar")),

        PtrDiffTy);

  }

  uint64_t Offset = ComputeIvarBaseOffset(CGF.CGM, Interface, Ivar);

  return llvm::ConstantInt::get(LongTy, Offset, "ivar");

  return llvm::ConstantInt::get(PtrDiffTy, Offset, "ivar");

}



CodeGen::CGObjCRuntime *