[llvm-commits] [llvm] r107640 - in /llvm/trunk: include/llvm/Target/TargetLowering.h lib/CodeGen/StackProtector.cpp lib/Target/X86/X86ISelLowering.cpp lib/Target/X86/X86ISelLowering.h test/CodeGen/Generic/stack-protector.ll test/CodeGen/PowerPC/stack-protector.ll test/CodeGen/X86/stack-protector-linux.ll test/CodeGen/X86/stack-protector.ll
Nelson Elhage
nelhage at mit.edu
Tue Jul 6 14:36:40 PDT 2010
I take it you dropped the X86 tests (in r107641) until you could get
around to FileCheck-izing them, but was it intentional that you
committed the PPC test case but not the arm one?
- Nelson
On Tue, 06 Jul 2010 05:18:56 -0000, Eric Christopher <echristo at apple.com> wrote:
> Author: echristo
> Date: Tue Jul 6 00:18:56 2010
> New Revision: 107640
>
> URL: http://llvm.org/viewvc/llvm-project?rev=107640&view=rev
> Log:
> Fix up -fstack-protector on linux to use the segment
> registers. Split out testcases per architecture and os
> now.
>
> Patch from Nelson Elhage.
>
> Added:
> llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll
> llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll
> llvm/trunk/test/CodeGen/X86/stack-protector.ll
> Removed:
> llvm/trunk/test/CodeGen/Generic/stack-protector.ll
> Modified:
> llvm/trunk/include/llvm/Target/TargetLowering.h
> llvm/trunk/lib/CodeGen/StackProtector.cpp
> llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
> llvm/trunk/lib/Target/X86/X86ISelLowering.h
>
> Modified: llvm/trunk/include/llvm/Target/TargetLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=107640&r1=107639&r2=107640&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/Target/TargetLowering.h (original)
> +++ llvm/trunk/include/llvm/Target/TargetLowering.h Tue Jul 6 00:18:56 2010
> @@ -749,6 +749,14 @@
> /// getFunctionAlignment - Return the Log2 alignment of this function.
> virtual unsigned getFunctionAlignment(const Function *) const = 0;
>
> + /// getStackCookieLocation - Return true if the target stores stack
> + /// protector cookies at a fixed offset in some non-standard address
> + /// space, and populates the address space and offset as
> + /// appropriate.
> + virtual bool getStackCookieLocation(unsigned &AddressSpace, unsigned &Offset) const {
> + return false;
> + }
> +
> //===--------------------------------------------------------------------===//
> // TargetLowering Optimization Methods
> //
>
> Modified: llvm/trunk/lib/CodeGen/StackProtector.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StackProtector.cpp?rev=107640&r1=107639&r2=107640&view=diff
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/StackProtector.cpp (original)
> +++ llvm/trunk/lib/CodeGen/StackProtector.cpp Tue Jul 6 00:18:56 2010
> @@ -136,7 +136,7 @@
> bool StackProtector::InsertStackProtectors() {
> BasicBlock *FailBB = 0; // The basic block to jump to if check fails.
> AllocaInst *AI = 0; // Place on stack that stores the stack guard.
> - Constant *StackGuardVar = 0; // The stack guard variable.
> + Value *StackGuardVar = 0; // The stack guard variable.
>
> for (Function::iterator I = F->begin(), E = F->end(); I != E; ) {
> BasicBlock *BB = I++;
> @@ -155,7 +155,20 @@
> //
> PointerType *PtrTy = PointerType::getUnqual(
> Type::getInt8Ty(RI->getContext()));
> - StackGuardVar = M->getOrInsertGlobal("__stack_chk_guard", PtrTy);
> +
> + unsigned AddressSpace, Offset;
> + if (TLI->getStackCookieLocation(AddressSpace, Offset)) {
> + Constant *ASPtr = Constant::getNullValue(
> + PointerType::get(Type::getInt8Ty(RI->getContext()), AddressSpace));
> + APInt OffsetInt(32, Offset);
> + Constant *OffsetVal = Constant::getIntegerValue(
> + Type::getInt32Ty(RI->getContext()), OffsetInt);
> + StackGuardVar = ConstantExpr::getPointerCast(
> + ConstantExpr::getGetElementPtr(ASPtr, &OffsetVal, 1),
> + PointerType::get(PtrTy, AddressSpace));
> + } else {
> + StackGuardVar = M->getOrInsertGlobal("__stack_chk_guard", PtrTy);
> + }
>
> BasicBlock &Entry = F->getEntryBlock();
> Instruction *InsPt = &Entry.front();
>
> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=107640&r1=107639&r2=107640&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Jul 6 00:18:56 2010
> @@ -1189,6 +1189,27 @@
> return F->hasFnAttr(Attribute::OptimizeForSize) ? 0 : 4;
> }
>
> +bool X86TargetLowering::getStackCookieLocation(unsigned &AddressSpace,
> + unsigned &Offset) const {
> + if (!Subtarget->isTargetLinux())
> + return false;
> +
> + if (Subtarget->is64Bit()) {
> + // %fs:0x28, unless we're using a Kernel code model, in which case it's %gs:
> + Offset = 0x28;
> + if (getTargetMachine().getCodeModel() == CodeModel::Kernel)
> + AddressSpace = 256;
> + else
> + AddressSpace = 257;
> + } else {
> + // %gs:0x14 on i386
> + Offset = 0x14;
> + AddressSpace = 256;
> + }
> + return true;
> +}
> +
> +
> //===----------------------------------------------------------------------===//
> // Return Value Calling Convention Implementation
> //===----------------------------------------------------------------------===//
>
> Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=107640&r1=107639&r2=107640&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original)
> +++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Tue Jul 6 00:18:56 2010
> @@ -593,6 +593,12 @@
> /// getFunctionAlignment - Return the Log2 alignment of this function.
> virtual unsigned getFunctionAlignment(const Function *F) const;
>
> + /// getStackCookieLocation - Return true if the target stores stack
> + /// protector cookies at a fixed offset in some non-standard address
> + /// space, and populates the address space and offset as
> + /// appropriate.
> + virtual bool getStackCookieLocation(unsigned &AddressSpace, unsigned &Offset) const;
> +
> private:
> /// Subtarget - Keep a pointer to the X86Subtarget around so that we can
> /// make the right decision when generating code for different targets.
>
> Removed: llvm/trunk/test/CodeGen/Generic/stack-protector.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/stack-protector.ll?rev=107639&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/Generic/stack-protector.ll (original)
> +++ llvm/trunk/test/CodeGen/Generic/stack-protector.ll (removed)
> @@ -1,25 +0,0 @@
> -; RUN: llc < %s -o - | grep {__stack_chk_guard}
> -; RUN: llc < %s -o - | grep {__stack_chk_fail}
> -
> -@"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00" ; <[11 x i8]*> [#uses=1]
> -
> -define void @test(i8* %a) nounwind ssp {
> -entry:
> - %a_addr = alloca i8* ; <i8**> [#uses=2]
> - %buf = alloca [8 x i8] ; <[8 x i8]*> [#uses=2]
> - %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
> - store i8* %a, i8** %a_addr
> - %buf1 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> - %0 = load i8** %a_addr, align 4 ; <i8*> [#uses=1]
> - %1 = call i8* @strcpy(i8* %buf1, i8* %0) nounwind ; <i8*> [#uses=0]
> - %buf2 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> - %2 = call i32 (i8*, ...)* @printf(i8* getelementptr ([11 x i8]* @"\01LC", i32 0, i32 0), i8* %buf2) nounwind ; <i32> [#uses=0]
> - br label %return
> -
> -return: ; preds = %entry
> - ret void
> -}
> -
> -declare i8* @strcpy(i8*, i8*) nounwind
> -
> -declare i32 @printf(i8*, ...) nounwind
>
> Added: llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll?rev=107640&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll (added)
> +++ llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll Tue Jul 6 00:18:56 2010
> @@ -0,0 +1,25 @@
> +; RUN: llc -march=ppc32 < %s -o - | grep {__stack_chk_guard}
> +; RUN: llc -march=ppc32 < %s -o - | grep {__stack_chk_fail}
> +
> +@"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00" ; <[11 x i8]*> [#uses=1]
> +
> +define void @test(i8* %a) nounwind ssp {
> +entry:
> + %a_addr = alloca i8* ; <i8**> [#uses=2]
> + %buf = alloca [8 x i8] ; <[8 x i8]*> [#uses=2]
> + %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
> + store i8* %a, i8** %a_addr
> + %buf1 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> + %0 = load i8** %a_addr, align 4 ; <i8*> [#uses=1]
> + %1 = call i8* @strcpy(i8* %buf1, i8* %0) nounwind ; <i8*> [#uses=0]
> + %buf2 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> + %2 = call i32 (i8*, ...)* @printf(i8* getelementptr ([11 x i8]* @"\01LC", i32 0, i32 0), i8* %buf2) nounwind ; <i32> [#uses=0]
> + br label %return
> +
> +return: ; preds = %entry
> + ret void
> +}
> +
> +declare i8* @strcpy(i8*, i8*) nounwind
> +
> +declare i32 @printf(i8*, ...) nounwind
>
> Added: llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll?rev=107640&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll (added)
> +++ llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll Tue Jul 6 00:18:56 2010
> @@ -0,0 +1,28 @@
> +; RUN: llc -mtriple=i386-pc-linux-gnu < %s -o - | grep %gs:
> +; RUN: llc -mtriple=x86_64-pc-linux-gnu < %s -o - | grep %fs:
> +; RUN: llc -code-model=kernel -mtriple=x86_64-pc-linux-gnu < %s -o - | grep %gs:
> +; RUN: llc -mtriple=x86_64-apple-darwin < %s -o - | grep {__stack_chk_guard}
> +; RUN: llc -mtriple=x86_64-apple-darwin < %s -o - | grep {__stack_chk_fail}
> +
> +@"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00" ; <[11 x i8]*> [#uses=1]
> +
> +define void @test(i8* %a) nounwind ssp {
> +entry:
> + %a_addr = alloca i8* ; <i8**> [#uses=2]
> + %buf = alloca [8 x i8] ; <[8 x i8]*> [#uses=2]
> + %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
> + store i8* %a, i8** %a_addr
> + %buf1 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> + %0 = load i8** %a_addr, align 4 ; <i8*> [#uses=1]
> + %1 = call i8* @strcpy(i8* %buf1, i8* %0) nounwind ; <i8*> [#uses=0]
> + %buf2 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> + %2 = call i32 (i8*, ...)* @printf(i8* getelementptr ([11 x i8]* @"\01LC", i32 0, i32 0), i8* %buf2) nounwind ; <i32> [#uses=0]
> + br label %return
> +
> +return: ; preds = %entry
> + ret void
> +}
> +
> +declare i8* @strcpy(i8*, i8*) nounwind
> +
> +declare i32 @printf(i8*, ...) nounwind
>
> Added: llvm/trunk/test/CodeGen/X86/stack-protector.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stack-protector.ll?rev=107640&view=auto
> ==============================================================================
> --- llvm/trunk/test/CodeGen/X86/stack-protector.ll (added)
> +++ llvm/trunk/test/CodeGen/X86/stack-protector.ll Tue Jul 6 00:18:56 2010
> @@ -0,0 +1,25 @@
> +; RUN: llc -march=x86 < %s -o - | grep {__stack_chk_guard}
> +; RUN: llc -march=x86 < %s -o - | grep {__stack_chk_fail}
> +
> +@"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00" ; <[11 x i8]*> [#uses=1]
> +
> +define void @test(i8* %a) nounwind ssp {
> +entry:
> + %a_addr = alloca i8* ; <i8**> [#uses=2]
> + %buf = alloca [8 x i8] ; <[8 x i8]*> [#uses=2]
> + %"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
> + store i8* %a, i8** %a_addr
> + %buf1 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> + %0 = load i8** %a_addr, align 4 ; <i8*> [#uses=1]
> + %1 = call i8* @strcpy(i8* %buf1, i8* %0) nounwind ; <i8*> [#uses=0]
> + %buf2 = bitcast [8 x i8]* %buf to i8* ; <i8*> [#uses=1]
> + %2 = call i32 (i8*, ...)* @printf(i8* getelementptr ([11 x i8]* @"\01LC", i32 0, i32 0), i8* %buf2) nounwind ; <i32> [#uses=0]
> + br label %return
> +
> +return: ; preds = %entry
> + ret void
> +}
> +
> +declare i8* @strcpy(i8*, i8*) nounwind
> +
> +declare i32 @printf(i8*, ...) nounwind
>
>
> _______________________________________________
> 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