From 317201d77354e6fc9547468ce827e1a7c30761d7 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 13 Mar 2004 00:24:00 +0000 Subject: Rename the intrinsic enum values for llvm.va_* from Intrinsic::va_* to Intrinsic::va*. This avoid conflicting with macros in the stdlib.h file. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12356 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/VMCore/Function.cpp | 6 +++--- lib/VMCore/Verifier.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/VMCore') diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index 43f3dc4..7d24916 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -234,9 +234,9 @@ unsigned Function::getIntrinsicID() const { 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! diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index dfac6b9..1e3c3c7 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -548,14 +548,14 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) { // 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: -- cgit v1.1