diff options
| author | Tanya Lattner <tonic@nondot.org> | 2007-06-18 22:23:39 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2007-06-18 22:23:39 +0000 |
| commit | aab22008442aa88305918cbfbebdf69c4ad3ff09 (patch) | |
| tree | 3754c4c61b3222ce61df2f4450f33c992b1aab29 | |
| parent | b4f2d8a056801b17b80c26d0b4e29fe4672f4d74 (diff) | |
| download | bcm5719-llvm-aab22008442aa88305918cbfbebdf69c4ad3ff09.tar.gz bcm5719-llvm-aab22008442aa88305918cbfbebdf69c4ad3ff09.zip | |
Modify annotate intrinsic to take 2 additional args: file and line number.
Fix up Annotate attribute test case.
Fix DebugFilename.c test case to look for right file name.
llvm-svn: 37632
| -rw-r--r-- | llvm/include/llvm/Intrinsics.td | 5 | ||||
| -rw-r--r-- | llvm/test/CFrontend/2004-02-13-Memset.c (renamed from llvm/test/CFrontend/2004-02-13-Memset.c.tr) | 0 | ||||
| -rw-r--r-- | llvm/test/CFrontend/2004-02-14-ZeroInitializer.c (renamed from llvm/test/CFrontend/2004-02-14-ZeroInitializer.c.tr) | 0 | ||||
| -rw-r--r-- | llvm/test/CFrontend/2006-09-25-DebugFilename.c (renamed from llvm/test/CFrontend/2006-09-25-DebugFilename.c.tr) | 2 | ||||
| -rw-r--r-- | llvm/test/CFrontend/2007-06-15-AnnotateAttribute.c | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/llvm/include/llvm/Intrinsics.td b/llvm/include/llvm/Intrinsics.td index 4b427f30a43..0f9ef6a76fa 100644 --- a/llvm/include/llvm/Intrinsics.td +++ b/llvm/include/llvm/Intrinsics.td @@ -237,8 +237,9 @@ def int_eh_typeid_for : Intrinsic<[llvm_i32_ty, llvm_ptr_ty]>; //===---------------- Generic Variable Attribute Intrinsics----------------===// // -def int_var_annotation : Intrinsic<[llvm_void_ty, llvm_ptr_ty, llvm_ptr_ty], - [], "llvm.var.annotation">; +def int_var_annotation : Intrinsic<[llvm_void_ty, llvm_ptr_ty, llvm_ptr_ty, + llvm_ptr_ty, llvm_i32_ty], + [], "llvm.var.annotation">; //===----------------------------------------------------------------------===// // Target-specific intrinsics diff --git a/llvm/test/CFrontend/2004-02-13-Memset.c.tr b/llvm/test/CFrontend/2004-02-13-Memset.c index ca0db7a18b2..ca0db7a18b2 100644 --- a/llvm/test/CFrontend/2004-02-13-Memset.c.tr +++ b/llvm/test/CFrontend/2004-02-13-Memset.c diff --git a/llvm/test/CFrontend/2004-02-14-ZeroInitializer.c.tr b/llvm/test/CFrontend/2004-02-14-ZeroInitializer.c index bede9078741..bede9078741 100644 --- a/llvm/test/CFrontend/2004-02-14-ZeroInitializer.c.tr +++ b/llvm/test/CFrontend/2004-02-14-ZeroInitializer.c diff --git a/llvm/test/CFrontend/2006-09-25-DebugFilename.c.tr b/llvm/test/CFrontend/2006-09-25-DebugFilename.c index e115c394a5e..2139c1ade56 100644 --- a/llvm/test/CFrontend/2006-09-25-DebugFilename.c.tr +++ b/llvm/test/CFrontend/2006-09-25-DebugFilename.c @@ -1,5 +1,5 @@ // RUN: ignore %llvmgcc -xc %s -S -o /dev/null |& \ -// RUN: grep fluffy | grep 2006-09-25-DebugFilename.c.tr +// RUN: grep fluffy | grep 2006-09-25-DebugFilename.c #include "2006-09-25-DebugFilename.h" int func1() { return hfunc1(); } int func2() { fluffy; return hfunc1(); } diff --git a/llvm/test/CFrontend/2007-06-15-AnnotateAttribute.c b/llvm/test/CFrontend/2007-06-15-AnnotateAttribute.c index 18ce69389dc..6fe09c2e33e 100644 --- a/llvm/test/CFrontend/2007-06-15-AnnotateAttribute.c +++ b/llvm/test/CFrontend/2007-06-15-AnnotateAttribute.c @@ -1,5 +1,4 @@ -// RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep llvm.global.annotations | grep foo \ -// RUN: | grep @X | grep @a +// RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep llvm.global.annotations // RUN: %llvmgxx -c -emit-llvm %s -o - | llvm-dis | grep -c llvm.var.annotation | grep 3 #include <stdio.h> |
