| Index: src/IceDefs.h
|
| diff --git a/src/IceDefs.h b/src/IceDefs.h
|
| index a38da03e290511a53f673b3e47e08c90c6d4194a..5f96d7e7e5bb6bbaf1f942ba662b1d896c8a5f97 100644
|
| --- a/src/IceDefs.h
|
| +++ b/src/IceDefs.h
|
| @@ -145,10 +145,14 @@ using InstList = llvm::ilist<Inst>;
|
| using PhiList = InstList;
|
| using AssignList = InstList;
|
|
|
| +// Standard library containers with CfgLocalAllocator.
|
| +template <typename T> using CfgVector = std::vector<T, CfgLocalAllocator<T>>;
|
| +template <typename T> using CfgList = std::list<T, CfgLocalAllocator<T>>;
|
| +
|
| // Containers that are arena-allocated from the Cfg's allocator.
|
| -using OperandList = std::vector<Operand *, CfgLocalAllocator<Operand *>>;
|
| -using VarList = std::vector<Variable *, CfgLocalAllocator<Variable *>>;
|
| -using NodeList = std::vector<CfgNode *, CfgLocalAllocator<CfgNode *>>;
|
| +using OperandList = CfgVector<Operand *>;
|
| +using VarList = CfgVector<Variable *>;
|
| +using NodeList = CfgVector<CfgNode *>;
|
|
|
| // Contains that use the default (global) allocator.
|
| using ConstantList = std::vector<Constant *>;
|
| @@ -168,8 +172,7 @@ using InstNumberT = int32_t;
|
| /// value, giving the instruction number that begins or ends a variable's live
|
| /// range.
|
| using LiveBeginEndMapEntry = std::pair<SizeT, InstNumberT>;
|
| -using LiveBeginEndMap =
|
| - std::vector<LiveBeginEndMapEntry, CfgLocalAllocator<LiveBeginEndMapEntry>>;
|
| +using LiveBeginEndMap = CfgVector<LiveBeginEndMapEntry>;
|
| using LivenessBV = llvm::BitVector;
|
|
|
| using TimerStackIdT = uint32_t;
|
|
|