diff options
author | Nate Begeman <natebegeman@mac.com> | 2008-05-15 01:23:11 +0000 |
---|---|---|
committer | Nate Begeman <natebegeman@mac.com> | 2008-05-15 01:23:11 +0000 |
commit | ff155f03bd5d4a8fbeff09ad854582a37cdaa228 (patch) | |
tree | 7a49fb1e31e389335f23855a4cbc510945f9d961 /include/llvm/User.h | |
parent | 386f3e9d50507ecbfb01436dee85cb41ac2df530 (diff) | |
download | llvm-ff155f03bd5d4a8fbeff09ad854582a37cdaa228.tar.gz llvm-ff155f03bd5d4a8fbeff09ad854582a37cdaa228.tar.bz2 llvm-ff155f03bd5d4a8fbeff09ad854582a37cdaa228.tar.xz |
Move the operator new and operator delete out of line. This fixes an issue with
operator new() referring to the static initTags function, which has to be in the
same linkage unit as any file including User.h.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51136 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/User.h')
-rw-r--r-- | include/llvm/User.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/include/llvm/User.h b/include/llvm/User.h index 1454779154..44beac2ff8 100644 --- a/include/llvm/User.h +++ b/include/llvm/User.h @@ -227,16 +227,7 @@ protected: /// unsigned NumOperands; - void *operator new(size_t s, unsigned Us) { - void *Storage = ::operator new(s + sizeof(Use) * Us); - Use *Start = static_cast<Use*>(Storage); - Use *End = Start + Us; - User *Obj = reinterpret_cast<User*>(End); - Obj->OperandList = Start; - Obj->NumOperands = Us; - Use::initTags(Start, End); - return Obj; - } + void *operator new(size_t s, unsigned Us); User(const Type *Ty, unsigned vty, Use *OpList, unsigned NumOps) : Value(Ty, vty), OperandList(OpList), NumOperands(NumOps) {} Use *allocHungoffUses(unsigned) const; @@ -251,13 +242,7 @@ public: ~User() { Use::zap(OperandList, OperandList + NumOperands); } - void operator delete(void *Usr) { - User *Start = static_cast<User*>(Usr); - Use *Storage = static_cast<Use*>(Usr) - Start->NumOperands; - ::operator delete(Storage == Start->OperandList - ? Storage - : Usr); - } + void operator delete(void *Usr); template <unsigned Idx> Use &Op() { return OperandTraits<User>::op_begin(this)[Idx]; } |