[llvm-commits] [llvm] r163115 - /llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp
Jim Grosbach
grosbach at apple.com
Wed Sep 5 17:32:50 PDT 2012
Nice!
On Sep 3, 2012, at 5:27 AM, Benjamin Kramer <benny.kra at googlemail.com> wrote:
> Author: d0k
> Date: Mon Sep 3 07:27:43 2012
> New Revision: 163115
>
> URL: http://llvm.org/viewvc/llvm-project?rev=163115&view=rev
> Log:
> IRBuilderify the SjlLjEHPrepare pass.
>
> No functionality change.
>
> Modified:
> llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp
>
> Modified: llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp?rev=163115&r1=163114&r2=163115&view=diff
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SjLjEHPrepare.cpp Mon Sep 3 07:27:43 2012
> @@ -196,53 +196,38 @@
> new AllocaInst(FunctionContextTy, 0, Align, "fn_context", EntryBB->begin());
>
> // Fill in the function context structure.
> - Type *Int32Ty = Type::getInt32Ty(F.getContext());
> - Value *Zero = ConstantInt::get(Int32Ty, 0);
> - Value *One = ConstantInt::get(Int32Ty, 1);
> - Value *Two = ConstantInt::get(Int32Ty, 2);
> - Value *Three = ConstantInt::get(Int32Ty, 3);
> - Value *Four = ConstantInt::get(Int32Ty, 4);
> -
> - Value *Idxs[2] = { Zero, 0 };
> -
> for (unsigned I = 0, E = LPads.size(); I != E; ++I) {
> LandingPadInst *LPI = LPads[I];
> IRBuilder<> Builder(LPI->getParent()->getFirstInsertionPt());
>
> // Reference the __data field.
> - Idxs[1] = Two;
> - Value *FCData = Builder.CreateGEP(FuncCtx, Idxs, "__data");
> + Value *FCData = Builder.CreateConstGEP2_32(FuncCtx, 0, 2, "__data");
>
> // The exception values come back in context->__data[0].
> - Idxs[1] = Zero;
> - Value *ExceptionAddr = Builder.CreateGEP(FCData, Idxs, "exception_gep");
> + Value *ExceptionAddr = Builder.CreateConstGEP2_32(FCData, 0, 0,
> + "exception_gep");
> Value *ExnVal = Builder.CreateLoad(ExceptionAddr, true, "exn_val");
> - ExnVal = Builder.CreateIntToPtr(ExnVal, Type::getInt8PtrTy(F.getContext()));
> + ExnVal = Builder.CreateIntToPtr(ExnVal, Builder.getInt8PtrTy());
>
> - Idxs[1] = One;
> - Value *SelectorAddr = Builder.CreateGEP(FCData, Idxs, "exn_selector_gep");
> + Value *SelectorAddr = Builder.CreateConstGEP2_32(FCData, 0, 1,
> + "exn_selector_gep");
> Value *SelVal = Builder.CreateLoad(SelectorAddr, true, "exn_selector_val");
>
> substituteLPadValues(LPI, ExnVal, SelVal);
> }
>
> // Personality function
> - Idxs[1] = Three;
> + IRBuilder<> Builder(EntryBB->getTerminator());
> if (!PersonalityFn)
> PersonalityFn = LPads[0]->getPersonalityFn();
> - Value *PersonalityFieldPtr =
> - GetElementPtrInst::Create(FuncCtx, Idxs, "pers_fn_gep",
> - EntryBB->getTerminator());
> - new StoreInst(PersonalityFn, PersonalityFieldPtr, true,
> - EntryBB->getTerminator());
> + Value *PersonalityFieldPtr = Builder.CreateConstGEP2_32(FuncCtx, 0, 3,
> + "pers_fn_gep");
> + Builder.CreateStore(PersonalityFn, PersonalityFieldPtr, /*isVolatile=*/true);
>
> // LSDA address
> - Value *LSDA = CallInst::Create(LSDAAddrFn, "lsda_addr",
> - EntryBB->getTerminator());
> - Idxs[1] = Four;
> - Value *LSDAFieldPtr = GetElementPtrInst::Create(FuncCtx, Idxs, "lsda_gep",
> - EntryBB->getTerminator());
> - new StoreInst(LSDA, LSDAFieldPtr, true, EntryBB->getTerminator());
> + Value *LSDA = Builder.CreateCall(LSDAAddrFn, "lsda_addr");
> + Value *LSDAFieldPtr = Builder.CreateConstGEP2_32(FuncCtx, 0, 4, "lsda_gep");
> + Builder.CreateStore(LSDA, LSDAFieldPtr, /*isVolatile=*/true);
>
> return FuncCtx;
> }
> @@ -417,48 +402,31 @@
> Value *FuncCtx =
> setupFunctionContext(F, makeArrayRef(LPads.begin(), LPads.end()));
> BasicBlock *EntryBB = F.begin();
> - Type *Int32Ty = Type::getInt32Ty(F.getContext());
> -
> - Value *Idxs[2] = {
> - ConstantInt::get(Int32Ty, 0), 0
> - };
> + IRBuilder<> Builder(EntryBB->getTerminator());
>
> // Get a reference to the jump buffer.
> - Idxs[1] = ConstantInt::get(Int32Ty, 5);
> - Value *JBufPtr = GetElementPtrInst::Create(FuncCtx, Idxs, "jbuf_gep",
> - EntryBB->getTerminator());
> + Value *JBufPtr = Builder.CreateConstGEP2_32(FuncCtx, 0, 5, "jbuf_gep");
>
> // Save the frame pointer.
> - Idxs[1] = ConstantInt::get(Int32Ty, 0);
> - Value *FramePtr = GetElementPtrInst::Create(JBufPtr, Idxs, "jbuf_fp_gep",
> - EntryBB->getTerminator());
> -
> - Value *Val = CallInst::Create(FrameAddrFn,
> - ConstantInt::get(Int32Ty, 0),
> - "fp",
> - EntryBB->getTerminator());
> - new StoreInst(Val, FramePtr, true, EntryBB->getTerminator());
> + Value *FramePtr = Builder.CreateConstGEP2_32(JBufPtr, 0, 0, "jbuf_fp_gep");
> +
> + Value *Val = Builder.CreateCall(FrameAddrFn, Builder.getInt32(0), "fp");
> + Builder.CreateStore(Val, FramePtr, /*isVolatile=*/true);
>
> // Save the stack pointer.
> - Idxs[1] = ConstantInt::get(Int32Ty, 2);
> - Value *StackPtr = GetElementPtrInst::Create(JBufPtr, Idxs, "jbuf_sp_gep",
> - EntryBB->getTerminator());
> + Value *StackPtr = Builder.CreateConstGEP2_32(JBufPtr, 0, 2, "jbuf_sp_gep");
>
> - Val = CallInst::Create(StackAddrFn, "sp", EntryBB->getTerminator());
> - new StoreInst(Val, StackPtr, true, EntryBB->getTerminator());
> + Val = Builder.CreateCall(StackAddrFn, "sp");
> + Builder.CreateStore(Val, StackPtr, /*isVolatile=*/true);
>
> // Call the setjmp instrinsic. It fills in the rest of the jmpbuf.
> - Value *SetjmpArg = CastInst::Create(Instruction::BitCast, JBufPtr,
> - Type::getInt8PtrTy(F.getContext()), "",
> - EntryBB->getTerminator());
> - CallInst::Create(BuiltinSetjmpFn, SetjmpArg, "", EntryBB->getTerminator());
> + Value *SetjmpArg = Builder.CreateBitCast(JBufPtr, Builder.getInt8PtrTy());
> + Builder.CreateCall(BuiltinSetjmpFn, SetjmpArg);
>
> // Store a pointer to the function context so that the back-end will know
> // where to look for it.
> - Value *FuncCtxArg = CastInst::Create(Instruction::BitCast, FuncCtx,
> - Type::getInt8PtrTy(F.getContext()), "",
> - EntryBB->getTerminator());
> - CallInst::Create(FuncCtxFn, FuncCtxArg, "", EntryBB->getTerminator());
> + Value *FuncCtxArg = Builder.CreateBitCast(FuncCtx, Builder.getInt8PtrTy());
> + Builder.CreateCall(FuncCtxFn, FuncCtxArg);
>
> // At this point, we are all set up, update the invoke instructions to mark
> // their call_site values.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list