From cfca06d7963fa0909f90483b42a6d7d194d01e08 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 26 Jul 2020 19:36:28 +0000 Subject: Vendor import of llvm-project master 2e10b7a39b9, the last commit before the llvmorg-12-init tag, from which release/11.x was branched. --- llvm/lib/CodeGen/SafeStackLayout.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'llvm/lib/CodeGen/SafeStackLayout.h') diff --git a/llvm/lib/CodeGen/SafeStackLayout.h b/llvm/lib/CodeGen/SafeStackLayout.h index 349d9a8b595c..f0db1b42aa00 100644 --- a/llvm/lib/CodeGen/SafeStackLayout.h +++ b/llvm/lib/CodeGen/SafeStackLayout.h @@ -9,9 +9,9 @@ #ifndef LLVM_LIB_CODEGEN_SAFESTACKLAYOUT_H #define LLVM_LIB_CODEGEN_SAFESTACKLAYOUT_H -#include "SafeStackColoring.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" +#include "llvm/Analysis/StackLifetime.h" namespace llvm { @@ -27,10 +27,10 @@ class StackLayout { struct StackRegion { unsigned Start; unsigned End; - StackColoring::LiveRange Range; + StackLifetime::LiveRange Range; StackRegion(unsigned Start, unsigned End, - const StackColoring::LiveRange &Range) + const StackLifetime::LiveRange &Range) : Start(Start), End(End), Range(Range) {} }; @@ -40,7 +40,7 @@ class StackLayout { struct StackObject { const Value *Handle; unsigned Size, Alignment; - StackColoring::LiveRange Range; + StackLifetime::LiveRange Range; }; SmallVector StackObjects; @@ -56,7 +56,7 @@ public: /// Add an object to the stack frame. Value pointer is opaque and used as a /// handle to retrieve the object's offset in the frame later. void addObject(const Value *V, unsigned Size, unsigned Alignment, - const StackColoring::LiveRange &Range); + const StackLifetime::LiveRange &Range); /// Run the layout computation for all previously added objects. void computeLayout(); -- cgit v1.2.3