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

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

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(); }

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>