[llvm-commits] CVS: llvm/lib/CodeGen/MachineBasicBlock.cpp MachineInstr.cpp MachineFunction.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/CodeGen:

MachineBasicBlock.cpp updated: 1.5 -> 1.6
MachineInstr.cpp updated: 1.89 -> 1.90
MachineFunction.cpp updated: 1.51 -> 1.52

---
Log message:

Add LeakDetection to MachineInstr.

Move out of line member functions of MachineBasicBlock to
MachineBasicBlock.cpp.


---
Diffs of the changes:  (+80 -11)

Index: llvm/lib/CodeGen/MachineBasicBlock.cpp
diff -u /dev/null llvm/lib/CodeGen/MachineBasicBlock.cpp:1.6
--- /dev/null	Mon Feb 16 01:17:53 2004
+++ llvm/lib/CodeGen/MachineBasicBlock.cpp	Mon Feb 16 01:17:42 2004
@@ -0,0 +1,68 @@
+//===-- llvm/CodeGen/MachineBasicBlock.cpp ----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Collect the sequence of machine instructions for a basic block.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/CodeGen/MachineBasicBlock.h"
+
+#include "llvm/BasicBlock.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include "Support/LeakDetector.h"
+#include <iostream>
+
+using namespace llvm;
+
+MachineInstr* ilist_traits<MachineInstr>::createNode()
+{
+    MachineInstr* dummy = new MachineInstr(0, 0);
+    LeakDetector::removeGarbageObject(dummy);
+    return dummy;
+}
+
+void ilist_traits<MachineInstr>::addNodeToList(MachineInstr* N)
+{
+    assert(N->parent == 0 && "machine instruction already in a basic block");
+    N->parent = parent;
+    LeakDetector::removeGarbageObject(N);
+}
+
+void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr* N)
+{
+    assert(N->parent != 0 && "machine instruction not in a basic block");
+    N->parent = 0;
+    LeakDetector::addGarbageObject(N);
+}
+
+void ilist_traits<MachineInstr>::transferNodesFromList(
+    iplist<MachineInstr, ilist_traits<MachineInstr> >& toList,
+    ilist_iterator<MachineInstr> first,
+    ilist_iterator<MachineInstr> last)
+{
+    if (parent != toList.parent)
+        for (; first != last; ++first)
+            first->parent = toList.parent;
+}
+
+void MachineBasicBlock::dump() const
+{
+    print(std::cerr);
+}
+
+void MachineBasicBlock::print(std::ostream &OS) const
+{
+    const BasicBlock *LBB = getBasicBlock();
+    OS << "\n" << LBB->getName() << " (" << (const void*)LBB << "):\n";
+    for (const_iterator I = begin(); I != end(); ++I) {
+        OS << "\t";
+        I->print(OS, MachineFunction::get(LBB->getParent()).getTarget());
+    }
+}


Index: llvm/lib/CodeGen/MachineInstr.cpp
diff -u llvm/lib/CodeGen/MachineInstr.cpp:1.89 llvm/lib/CodeGen/MachineInstr.cpp:1.90
--- llvm/lib/CodeGen/MachineInstr.cpp:1.89	Fri Feb 13 15:01:20 2004
+++ llvm/lib/CodeGen/MachineInstr.cpp	Mon Feb 16 01:17:42 2004
@@ -20,6 +20,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/MRegisterInfo.h"
+#include "Support/LeakDetector.h"
 
 namespace llvm {
 
@@ -38,6 +39,8 @@
     numImplicitRefs(0),
     operands(numOperands, MachineOperand()),
     parent(0) {
+  // Make sure that we get added to a machine basicblock
+  LeakDetector::addGarbageObject(this);
 }
 
 /// MachineInstr ctor - This constructor only does a _reserve_ of the operands,
@@ -48,6 +51,8 @@
 MachineInstr::MachineInstr(short opcode, unsigned numOperands, bool XX, bool YY)
   : Opcode(opcode), numImplicitRefs(0), parent(0) {
   operands.reserve(numOperands);
+  // Make sure that we get added to a machine basicblock
+  LeakDetector::addGarbageObject(this);
 }
 
 /// MachineInstr ctor - Work exactly the same as the ctor above, except that the
@@ -58,7 +63,14 @@
   : Opcode(opcode), numImplicitRefs(0), parent(0) {
   assert(MBB && "Cannot use inserting ctor with null basic block!");
   operands.reserve(numOperands);
+  // Make sure that we get added to a machine basicblock
+  LeakDetector::addGarbageObject(this);
   MBB->push_back(this);  // Add instruction to end of basic block!
+}
+
+MachineInstr::~MachineInstr()
+{
+  LeakDetector::removeGarbageObject(this);
 }
 
 /// OperandComplete - Return true if it's illegal to add a new operand


Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.51 llvm/lib/CodeGen/MachineFunction.cpp:1.52
--- llvm/lib/CodeGen/MachineFunction.cpp:1.51	Sat Feb 14 18:03:15 2004
+++ llvm/lib/CodeGen/MachineFunction.cpp	Mon Feb 16 01:17:42 2004
@@ -120,17 +120,6 @@
   OS << "\nEnd function \"" << Fn->getName() << "\"\n\n";
 }
 
-void MachineBasicBlock::dump() const { print(std::cerr); }
-
-void MachineBasicBlock::print(std::ostream &OS) const {
-  const BasicBlock *LBB = getBasicBlock();
-  OS << "\n" << LBB->getName() << " (" << (const void*)LBB << "):\n";
-  for (const_iterator I = begin(); I != end(); ++I) {
-    OS << "\t";
-    I->print(OS, MachineFunction::get(LBB->getParent()).getTarget());
-  }
-}
-
 // The next two methods are used to construct and to retrieve
 // the MachineCodeForFunction object for the given function.
 // construct() -- Allocates and initializes for a given function and target