From 11dd9c3d557dd880dc1121781595bbf983df2a47 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 21 Dec 2014 21:52:38 +0000 Subject: [PATCH] CodeGen: minor style tweaks to SSP Clean up some style related things in the StackProtector CodeGen. NFC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224693 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/StackProtector.cpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/CodeGen/StackProtector.cpp b/lib/CodeGen/StackProtector.cpp index 3385f0695fe..a132805ac84 100644 --- a/lib/CodeGen/StackProtector.cpp +++ b/lib/CodeGen/StackProtector.cpp @@ -333,7 +333,7 @@ static CallInst *FindPotentialTailCall(BasicBlock *BB, ReturnInst *RI, /// Returns true if the platform/triple supports the stackprotectorcreate pseudo /// node. static bool CreatePrologue(Function *F, Module *M, ReturnInst *RI, - const TargetLoweringBase *TLI, const Triple &Trip, + const TargetLoweringBase *TLI, const Triple &TT, AllocaInst *&AI, Value *&StackGuardVar) { bool SupportsSelectionDAGSP = false; PointerType *PtrTy = Type::getInt8PtrTy(RI->getContext()); @@ -342,9 +342,10 @@ static bool CreatePrologue(Function *F, Module *M, ReturnInst *RI, Constant *OffsetVal = ConstantInt::get(Type::getInt32Ty(RI->getContext()), Offset); - StackGuardVar = ConstantExpr::getIntToPtr( - OffsetVal, PointerType::get(PtrTy, AddressSpace)); - } else if (Trip.isOSOpenBSD()) { + StackGuardVar = + ConstantExpr::getIntToPtr(OffsetVal, PointerType::get(PtrTy, + AddressSpace)); + } else if (TT.isOSOpenBSD()) { StackGuardVar = M->getOrInsertGlobal("__guard_local", PtrTy); cast(StackGuardVar) ->setVisibility(GlobalValue::HiddenVisibility); @@ -397,14 +398,13 @@ bool StackProtector::InsertStackProtectors() { InsertionPt = RI; // At this point we know that BB has a return statement so it *DOES* // have a terminator. - assert(InsertionPt != nullptr && "BB must have a terminator instruction at " - "this point."); + assert(InsertionPt != nullptr && + "BB must have a terminator instruction at this point."); } Function *Intrinsic = Intrinsic::getDeclaration(M, Intrinsic::stackprotectorcheck); CallInst::Create(Intrinsic, StackGuardVar, "", InsertionPt); - } else { // If we do not support SelectionDAG based tail calls, generate IR level // tail calls. @@ -467,7 +467,7 @@ bool StackProtector::InsertStackProtectors() { } } - // Return if we didn't modify any basic blocks. I.e., there are no return + // Return if we didn't modify any basic blocks. i.e., there are no return // statements in the function. if (!HasPrologue) return false; @@ -482,14 +482,16 @@ BasicBlock *StackProtector::CreateFailBB() { BasicBlock *FailBB = BasicBlock::Create(Context, "CallStackCheckFailBlk", F); IRBuilder<> B(FailBB); if (Trip.isOSOpenBSD()) { - Constant *StackChkFail = M->getOrInsertFunction( - "__stack_smash_handler", Type::getVoidTy(Context), - Type::getInt8PtrTy(Context), nullptr); + Constant *StackChkFail = + M->getOrInsertFunction("__stack_smash_handler", + Type::getVoidTy(Context), + Type::getInt8PtrTy(Context), nullptr); B.CreateCall(StackChkFail, B.CreateGlobalStringPtr(F->getName(), "SSH")); } else { - Constant *StackChkFail = M->getOrInsertFunction( - "__stack_chk_fail", Type::getVoidTy(Context), nullptr); + Constant *StackChkFail = + M->getOrInsertFunction("__stack_chk_fail", Type::getVoidTy(Context), + nullptr); B.CreateCall(StackChkFail); } B.CreateUnreachable();