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 0e73d37978f12d764d5a26e2e302d06f99415cee..8b37510d354b8d8d2c024a008acad5c5cb5fd9ed 100644 (file)
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -8,7 +8,7 @@
 #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), 
@@ -23,8 +23,11 @@ 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);