Don't waste as much horizontal space on #uses flag when printing

[oota-llvm.git] / lib / VMCore / Instruction.cpp

diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index 8b833cf4bb71c5dafa89d4603c7b4426a132e705..8b37510d354b8d8d2c024a008acad5c5cb5fd9ed 100644 (file)
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -8,12 +8,11 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/Method.h"
 #include "llvm/SymbolTable.h"
-#include "llvm/Codegen/MachineInstr.h"
+#include "llvm/CodeGen/MachineInstr.h"
 
 Instruction::Instruction(const Type *ty, unsigned it, const string &Name) 
-  : User(ty, Value::InstructionVal, Name),
-    machineInstrVec(new MachineCodeForVMInstr)
-{
+  : User(ty, Value::InstructionVal, Name), 
+    machineInstrVec(new MachineCodeForVMInstr) {
   Parent = 0;
   iType = it;
 }
@@ -24,33 +23,33 @@ Instruction::~Instruction() {
 }
 
 // Specialize setName to take care of symbol table majik
-void Instruction::setName(const string &name) {
+void Instruction::setName(const string &name, SymbolTable *ST) {
   BasicBlock *P = 0; Method *PP = 0;
+  assert((ST == 0 || !getParent() || !getParent()->getParent() || 
+         ST == getParent()->getParent()->getSymbolTable()) &&
+        "Invalid symtab argument!");
   if ((P = getParent()) && (PP = P->getParent()) && hasName())
     PP->getSymbolTable()->remove(this);
   Value::setName(name);
   if (PP && hasName()) PP->getSymbolTableSure()->insert(this);
 }
 
-void
-Instruction::addMachineInstruction(MachineInstr* minstr)
-{
+void Instruction::addMachineInstruction(MachineInstr* minstr) {
   machineInstrVec->push_back(minstr);
 }
 
+#if 0
 // Dont make this inline because you would need to include
 // MachineInstr.h in Instruction.h, which creates a circular
 // sequence of forward declarations.  Trying to fix that will
 // cause a serious circularity in link order.
 // 
-const vector<Value*>&
-Instruction::getTempValuesForMachineCode() const
-{
+const vector<Value*> &Instruction::getTempValuesForMachineCode() const {
   return machineInstrVec->getTempValues();
 }
+#endif
 
-void
-Instruction::dropAllReferences() {
+void Instruction::dropAllReferences() {
   machineInstrVec->dropAllReferences();
   User::dropAllReferences();
 }