diff options
Diffstat (limited to 'llvm/lib/CodeGen/SafeStackLayout.cpp')
-rw-r--r-- | llvm/lib/CodeGen/SafeStackLayout.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/SafeStackLayout.cpp b/llvm/lib/CodeGen/SafeStackLayout.cpp index 09964866e4d3..c823454f825c 100644 --- a/llvm/lib/CodeGen/SafeStackLayout.cpp +++ b/llvm/lib/CodeGen/SafeStackLayout.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "SafeStackLayout.h" -#include "SafeStackColoring.h" +#include "llvm/Analysis/StackLifetime.h" #include "llvm/IR/Value.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Compiler.h" @@ -39,7 +39,7 @@ LLVM_DUMP_METHOD void StackLayout::print(raw_ostream &OS) { } void StackLayout::addObject(const Value *V, unsigned Size, unsigned Alignment, - const StackColoring::LiveRange &Range) { + const StackLifetime::LiveRange &Range) { StackObjects.push_back({V, Size, Alignment, Range}); ObjectAlignments[V] = Alignment; MaxAlignment = std::max(MaxAlignment, Alignment); @@ -76,7 +76,7 @@ void StackLayout::layoutObject(StackObject &Obj) { LLVM_DEBUG(dbgs() << " Does not intersect, skip.\n"); continue; } - if (Obj.Range.Overlaps(R.Range)) { + if (Obj.Range.overlaps(R.Range)) { // Find the next appropriate location. Start = AdjustStackOffset(R.End, Obj.Size, Obj.Alignment); End = Start + Obj.Size; @@ -96,7 +96,7 @@ void StackLayout::layoutObject(StackObject &Obj) { if (Start > LastRegionEnd) { LLVM_DEBUG(dbgs() << " Creating gap region: " << LastRegionEnd << " .. " << Start << "\n"); - Regions.emplace_back(LastRegionEnd, Start, StackColoring::LiveRange()); + Regions.emplace_back(LastRegionEnd, Start, StackLifetime::LiveRange(0)); LastRegionEnd = Start; } LLVM_DEBUG(dbgs() << " Creating new region: " << LastRegionEnd << " .. " @@ -125,7 +125,7 @@ void StackLayout::layoutObject(StackObject &Obj) { // Update live ranges for all affected regions. for (StackRegion &R : Regions) { if (Start < R.End && End > R.Start) - R.Range.Join(Obj.Range); + R.Range.join(Obj.Range); if (End <= R.End) break; } |