Deemed too cute to live.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33964 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td
index bda4a92..126205a 100644 (file)
--- a/include/llvm/Intrinsics.td
+++ b/include/llvm/Intrinsics.td
@@ -88,7 +88,7 @@ def llvm_v4i32_ty      : LLVMPackedType<v4i32, 4, llvm_i32_ty>;   //  4 x i32
 def llvm_v4f32_ty      : LLVMPackedType<v4f32, 4, llvm_float_ty>; //  4 x float
 def llvm_v2f64_ty      : LLVMPackedType<v2f64, 2, llvm_double_ty>;//  2 x double
 
-def ...                : LLVMType<isVoid, "...">; // vararg
+def llvm_vararg_ty     : LLVMType<isVoid, "...">; // vararg
 
 //===----------------------------------------------------------------------===//
 // Intrinsic Definitions.
@@ -222,7 +222,7 @@ def int_dbg_declare      : Intrinsic<[llvm_void_ty, llvm_ptr_ty,
 //===------------------ Exception Handling Intrinsics----------------------===//
 //
 def int_eh_exception : Intrinsic<[llvm_ptr_ty]>;
-def int_eh_handlers : Intrinsic<[llvm_ptr_ty, llvm_ptr_ty, ...]>;
+def int_eh_handlers : Intrinsic<[llvm_ptr_ty, llvm_ptr_ty, llvm_vararg_ty]>;
 
 //===----------------------------------------------------------------------===//
 // Target-specific intrinsics

diff --git a/utils/TableGen/FileLexer.l b/utils/TableGen/FileLexer.l
index fa89b8b..cc6825f 100644 (file)
--- a/utils/TableGen/FileLexer.l
+++ b/utils/TableGen/FileLexer.l
@@ -176,7 +176,7 @@ using namespace llvm;
 
 Comment      \/\/.*
 
-Identifier   [a-zA-Z_][0-9a-zA-Z_]*|\.\.\.
+Identifier   [a-zA-Z_][0-9a-zA-Z_]*
 Integer      [-+]?[0-9]+|0x[0-9a-fA-F]+|0b[01]+
 CodeFragment \[\{([^}]+|\}[^\]])*\}\]
 StringVal    \"[^"]*\"