4 files changed, 6 insertions, 17 deletions
diff --git a/lib/VMCore/BasicBlock.cpp b/lib/VMCore/BasicBlock.cpp
index 92bdc50e78..232a4e3391 100644
--- a/lib/VMCore/BasicBlock.cpp
+++ b/lib/VMCore/BasicBlock.cpp
@@ -96,10 +96,8 @@ void BasicBlock::setParent(Function *parent) {
 }
 
 // Specialize setName to take care of symbol table majik
-void BasicBlock::setName(const std::string &name, SymbolTable *ST) {
+void BasicBlock::setName(const std::string &name) {
   Function *P;
-  assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
-	 "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
   Value::setName(name);
   if (P && hasName()) P->getSymbolTable().insert(this);
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index ae4a549509..7cced301e6 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -64,10 +64,8 @@ Argument::Argument(const Type *Ty, const std::string &Name, Function *Par)
 
 
 // Specialize setName to take care of symbol table majik
-void Argument::setName(const std::string &name, SymbolTable *ST) {
+void Argument::setName(const std::string &name) {
   Function *P;
-  assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
-         "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
   Value::setName(name);
   if (P && hasName()) P->getSymbolTable().insert(this);
@@ -121,10 +119,8 @@ Function::~Function() {
 }
 
 // Specialize setName to take care of symbol table majik
-void Function::setName(const std::string &name, SymbolTable *ST) {
+void Function::setName(const std::string &name) {
   Module *P;
-  assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
-         "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
   Value::setName(name);
   if (P && hasName()) P->getSymbolTable().insert(this);
@@ -170,7 +166,7 @@ void Function::renameLocalSymbols() {
   for (SymbolTable::plane_iterator LPI = LST.plane_begin(), E = LST.plane_end();
        LPI != E; ++LPI)
     // All global symbols are of pointer type, ignore any non-pointer planes.
-    if (isa<PointerType>(LPI->first)) {
+    if (const PointerType *CurTy = dyn_cast<PointerType>(LPI->first)) {
       // Only check if the global plane has any symbols of this type.
       SymbolTable::plane_iterator GPI = GST.find(LPI->first);
       if (GPI != GST.plane_end()) {
diff --git a/lib/VMCore/Globals.cpp b/lib/VMCore/Globals.cpp
index 8bcb531324..efa588bd56 100644
--- a/lib/VMCore/Globals.cpp
+++ b/lib/VMCore/Globals.cpp
@@ -100,10 +100,8 @@ void GlobalVariable::setParent(Module *parent) {
 }
 
 // Specialize setName to take care of symbol table majik
-void GlobalVariable::setName(const std::string &name, SymbolTable *ST) {
+void GlobalVariable::setName(const std::string &name) {
   Module *P;
-  assert((ST == 0 || (!getParent() || ST == &getParent()->getSymbolTable())) &&
-         "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
   Value::setName(name);
   if (P && hasName()) P->getSymbolTable().insert(this);
diff --git a/lib/VMCore/Instruction.cpp b/lib/VMCore/Instruction.cpp
index b449c9962f..eeba47b52e 100644
--- a/lib/VMCore/Instruction.cpp
+++ b/lib/VMCore/Instruction.cpp
@@ -58,11 +58,8 @@ void Instruction::setParent(BasicBlock *P) {
 }
 
 // Specialize setName to take care of symbol table majik
-void Instruction::setName(const std::string &name, SymbolTable *ST) {
+void Instruction::setName(const std::string &name) {
   BasicBlock *P = 0; Function *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);