From 5ea6a89e522bb5455c809954259a0862daacb4a8 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 21 Feb 2013 19:44:18 +0000 Subject: [PATCH] Try to get buildbots to pass these tests. llvm-svn: 175784 --- clang/test/CXX/special/class.dtor/p3-0x.cpp | 2 +- clang/test/CodeGen/address-safety-attr.cpp | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/clang/test/CXX/special/class.dtor/p3-0x.cpp b/clang/test/CXX/special/class.dtor/p3-0x.cpp index c3d3f6ab369e..dc76e0030820 100644 --- a/clang/test/CXX/special/class.dtor/p3-0x.cpp +++ b/clang/test/CXX/special/class.dtor/p3-0x.cpp @@ -176,4 +176,4 @@ struct TVC : VX template TVC::~TVC() {} -// CHECK: attributes [[ATTRGRP]] = { nounwind "target-features"={{.*}} } +// CHECK: attributes [[ATTRGRP]] = { nounwind{{.*}} } diff --git a/clang/test/CodeGen/address-safety-attr.cpp b/clang/test/CodeGen/address-safety-attr.cpp index 827f8d15b4d0..5f098fd98315 100644 --- a/clang/test/CodeGen/address-safety-attr.cpp +++ b/clang/test/CodeGen/address-safety-attr.cpp @@ -47,12 +47,15 @@ int force_instance = TemplateAddressSafetyOk<42>() // Check that __cxx_global_var_init* get the address_safety attribute. int global1 = 0; int global2 = *(int*)((char*)&global1+1); -// WITHOUT: @__cxx_global_var_init{{.*}}#1 -// BL: @__cxx_global_var_init{{.*}}#1 -// ASAN: @__cxx_global_var_init{{.*}}#2 +// WITHOUT: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]] +// BL: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]] +// ASAN: @__cxx_global_var_init{{.*}}#[[GVI:[0-9]+]] -// WITHOUT: attributes #[[NOATTR]] = { nounwind "target-features"={{.*}} } -// BL: attributes #[[NOATTR]] = { nounwind "target-features"={{.*}} } +// WITHOUT: attributes #[[NOATTR]] = { nounwind{{.*}} } +// WITHOUT: attributes #[[GVI]] = { nounwind{{.*}} } +// BL: attributes #[[NOATTR]] = { nounwind{{.*}} } +// BL: attributes #[[GVI]] = { nounwind{{.*}} } -// ASAN: attributes #[[NOATTR]] = { nounwind "target-features"={{.*}} } -// ASAN: attributes #[[WITH]] = { address_safety nounwind "target-features"={{.*}} } +// ASAN: attributes #[[NOATTR]] = { nounwind{{.*}} } +// ASAN: attributes #[[WITH]] = { address_safety nounwind{{.*}} } +// ASAN: attributes #[[GVI]] = { address_safety nounwind{{.*}} }