[llvm-commits] [llvm] r124330 - in /llvm/trunk: include/llvm/User.h lib/VMCore/User.cpp

[Jay Foad]

Author: foad
Date: Wed Jan 26 15:56:10 2011
New Revision: 124330

URL: http://llvm.org/viewvc/llvm-project?rev=124330&view=rev
Log:
Simplify User::operator delete().

Modified:
    llvm/trunk/include/llvm/User.h
    llvm/trunk/lib/VMCore/User.cpp

Modified: llvm/trunk/include/llvm/User.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/User.h?rev=124330&r1=124329&r2=124330&view=diff
==============================================================================
--- llvm/trunk/include/llvm/User.h (original)
+++ llvm/trunk/include/llvm/User.h Wed Jan 26 15:56:10 2011
@@ -53,6 +53,7 @@
   void dropHungoffUses() {
     Use::zap(OperandList, OperandList + NumOperands, true);
     OperandList = 0;
+    // Reset NumOperands so User::operator delete() does the right thing.
     NumOperands = 0;
   }
 public:

Modified: llvm/trunk/lib/VMCore/User.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/User.cpp?rev=124330&r1=124329&r2=124330&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/User.cpp (original)
+++ llvm/trunk/lib/VMCore/User.cpp Wed Jan 26 15:56:10 2011
@@ -73,16 +73,9 @@
 void User::operator delete(void *Usr) {
   User *Start = static_cast<User*>(Usr);
   Use *Storage = static_cast<Use*>(Usr) - Start->NumOperands;
-  //
-  // look for a variadic User
-  if (Storage == Start->OperandList) {
-    ::operator delete(Storage);
-    return;
-  }
-  //
-  // in all other cases just delete the nullary User (covers hung-off
-  // uses also
-  ::operator delete(Usr);
+  // If there were hung-off uses, they will have been freed already and
+  // NumOperands reset to 0, so here we just free the User itself.
+  ::operator delete(Storage);
 }
 
 } // End llvm namespace