Author: hans
Date: Wed Aug 10 15:06:22 2016
New Revision: 278283
URL: http://llvm.org/viewvc/llvm-project?rev=278283&view=rev
Log:
Merging r276712:
------------------------------------------------------------------------
r276712 | eugenis | 2016-07-25 17:05:14 -0700 (Mon, 25 Jul 2016) | 3 lines
[safestack] Fix stack guard live range.
Stack guard slot is live throughout the function.
------------------------------------------------------------------------
Added:
llvm/branches/release_39/test/Transforms/SafeStack/coloring-ssp.ll
- copied unchanged from r276712,
llvm/trunk/test/Transforms/SafeStack/coloring-ssp.ll
Modified:
llvm/branches/release_39/ (props changed)
llvm/branches/release_39/lib/CodeGen/SafeStack.cpp
llvm/branches/release_39/lib/CodeGen/SafeStackColoring.cpp
Propchange: llvm/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 10 15:06:22 2016
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276740,276823,276956,276980,277114,277135,277371,277500,277504,277625,277691,277693,277773,278002,278086,278133
+/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277114,277135,277371,277500,277504,277625,277691,277693,277773,278002,278086,278133
Modified: llvm/branches/release_39/lib/CodeGen/SafeStack.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/CodeGen/SafeStack.cpp?rev=278283&r1=278282&r2=278283&view=diff
==============================================================================
--- llvm/branches/release_39/lib/CodeGen/SafeStack.cpp (original)
+++ llvm/branches/release_39/lib/CodeGen/SafeStack.cpp Wed Aug 10 15:06:22 2016
@@ -530,7 +530,7 @@ Value *SafeStack::moveStaticAllocasToUns
unsigned Align =
std::max(DL->getPrefTypeAlignment(Ty), StackGuardSlot->getAlignment());
SSL.addObject(StackGuardSlot,
getStaticAllocaAllocationSize(StackGuardSlot),
- Align, SSC.getLiveRange(StackGuardSlot));
+ Align, SSC.getFullLiveRange());
}
for (Argument *Arg : ByValArguments) {
Modified: llvm/branches/release_39/lib/CodeGen/SafeStackColoring.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/CodeGen/SafeStackColoring.cpp?rev=278283&r1=278282&r2=278283&view=diff
==============================================================================
--- llvm/branches/release_39/lib/CodeGen/SafeStackColoring.cpp (original)
+++ llvm/branches/release_39/lib/CodeGen/SafeStackColoring.cpp Wed Aug 10
15:06:22 2016
@@ -25,7 +25,9 @@ static cl::opt<bool> ClColoring("safe-st
cl::Hidden, cl::init(true));
const StackColoring::LiveRange &StackColoring::getLiveRange(AllocaInst *AI) {
- return LiveRanges[AllocaNumbering[AI]];
+ const auto IT = AllocaNumbering.find(AI);
+ assert(IT != AllocaNumbering.end());
+ return LiveRanges[IT->second];
}
bool StackColoring::readMarker(Instruction *I, bool *IsStart) {
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
