[llvm-commits] CVS: llvm/lib/VMCore/Function.cpp Verifier.cpp

[Chris Lattner]

Changes in directory llvm/lib/VMCore:

Function.cpp updated: 1.65 -> 1.66
Verifier.cpp updated: 1.85 -> 1.86

---
Log message:

Rename the intrinsic enum values for llvm.va_* from Intrinsic::va_* to 
Intrinsic::va*.  This avoid conflicting with macros in the stdlib.h file.


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

Index: llvm/lib/VMCore/Function.cpp
diff -u llvm/lib/VMCore/Function.cpp:1.65 llvm/lib/VMCore/Function.cpp:1.66
--- llvm/lib/VMCore/Function.cpp:1.65	Fri Feb 13 20:47:16 2004
+++ llvm/lib/VMCore/Function.cpp	Fri Mar 12 18:24:00 2004
@@ -234,9 +234,9 @@
     if (getName() == "llvm.siglongjmp") return Intrinsic::siglongjmp;
     break;
   case 'v':
-    if (getName() == "llvm.va_copy")  return Intrinsic::va_copy;
-    if (getName() == "llvm.va_end")   return Intrinsic::va_end;
-    if (getName() == "llvm.va_start") return Intrinsic::va_start;
+    if (getName() == "llvm.va_copy")  return Intrinsic::vacopy;
+    if (getName() == "llvm.va_end")   return Intrinsic::vaend;
+    if (getName() == "llvm.va_start") return Intrinsic::vastart;
     break;
   }
   // The "llvm." namespace is reserved!


Index: llvm/lib/VMCore/Verifier.cpp
diff -u llvm/lib/VMCore/Verifier.cpp:1.85 llvm/lib/VMCore/Verifier.cpp:1.86
--- llvm/lib/VMCore/Verifier.cpp:1.85	Thu Mar 11 23:54:31 2004
+++ llvm/lib/VMCore/Verifier.cpp	Fri Mar 12 18:24:00 2004
@@ -548,14 +548,14 @@
   // FIXME: this should check the return type of each intrinsic as well, also
   // arguments!
   switch (ID) {
-  case Intrinsic::va_start:
+  case Intrinsic::vastart:
     Assert1(CI.getParent()->getParent()->getFunctionType()->isVarArg(),
             "llvm.va_start intrinsic may only occur in function with variable"
             " args!", &CI);
     NumArgs = 0;
     break;
-  case Intrinsic::va_end:          NumArgs = 1; break;
-  case Intrinsic::va_copy:         NumArgs = 1; break;
+  case Intrinsic::vaend:          NumArgs = 1; break;
+  case Intrinsic::vacopy:         NumArgs = 1; break;
 
   case Intrinsic::returnaddress:
   case Intrinsic::frameaddress: