[llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs UpgradeParser.y UpgradeParser.y.cvs

[Reid Spencer]

Changes in directory llvm/tools/llvm-upgrade:

UpgradeParser.cpp.cvs updated: 1.52 -> 1.53
UpgradeParser.y updated: 1.53 -> 1.54
UpgradeParser.y.cvs updated: 1.51 -> 1.52
---
Log message:

For PR1136: http://llvm.org/PR1136 : Rename GlobalVariable::isExternal as isDeclaration to avoid
confusion with external linkage types.


---
Diffs of the changes:  (+6 -6)

 UpgradeParser.cpp.cvs |    4 ++--
 UpgradeParser.y       |    4 ++--
 UpgradeParser.y.cvs   |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)


Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.52 llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.53
--- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.52	Mon Jan 29 13:08:46 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs	Tue Jan 30 14:08:38 2007
@@ -5113,11 +5113,11 @@
                (Fn = CurModule.CurrentModule->getFunction(FunctionName, FT))) {
       // If this is the case, either we need to be a forward decl, or it needs 
       // to be.
-      if (!CurFun.isDeclare && !Fn->isExternal())
+      if (!CurFun.isDeclare && !Fn->isDeclaration())
         error("Redefinition of function '" + FunctionName + "'");
       
       // Make sure to strip off any argument names so we can't get conflicts.
-      if (Fn->isExternal())
+      if (Fn->isDeclaration())
         for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end();
              AI != AE; ++AI)
           AI->setName("");


Index: llvm/tools/llvm-upgrade/UpgradeParser.y
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y:1.53 llvm/tools/llvm-upgrade/UpgradeParser.y:1.54
--- llvm/tools/llvm-upgrade/UpgradeParser.y:1.53	Mon Jan 29 13:07:18 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y	Tue Jan 30 14:08:39 2007
@@ -2619,11 +2619,11 @@
                (Fn = CurModule.CurrentModule->getFunction(FunctionName, FT))) {
       // If this is the case, either we need to be a forward decl, or it needs 
       // to be.
-      if (!CurFun.isDeclare && !Fn->isExternal())
+      if (!CurFun.isDeclare && !Fn->isDeclaration())
         error("Redefinition of function '" + FunctionName + "'");
       
       // Make sure to strip off any argument names so we can't get conflicts.
-      if (Fn->isExternal())
+      if (Fn->isDeclaration())
         for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end();
              AI != AE; ++AI)
           AI->setName("");


Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.51 llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.52
--- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.51	Mon Jan 29 13:08:46 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs	Tue Jan 30 14:08:39 2007
@@ -2619,11 +2619,11 @@
                (Fn = CurModule.CurrentModule->getFunction(FunctionName, FT))) {
       // If this is the case, either we need to be a forward decl, or it needs 
       // to be.
-      if (!CurFun.isDeclare && !Fn->isExternal())
+      if (!CurFun.isDeclare && !Fn->isDeclaration())
         error("Redefinition of function '" + FunctionName + "'");
       
       // Make sure to strip off any argument names so we can't get conflicts.
-      if (Fn->isExternal())
+      if (Fn->isDeclaration())
         for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end();
              AI != AE; ++AI)
           AI->setName("");