From fca03389bdd3c2c91ac2e733deaa13555a7d6eb1 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 22 Apr 2015 21:39:55 +0000 Subject: [PATCH] Fix another test broken by r235537 llvm-svn: 235555 --- clang/test/CodeGen/sanitize-thread-attr.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/clang/test/CodeGen/sanitize-thread-attr.cpp b/clang/test/CodeGen/sanitize-thread-attr.cpp index fe5d810..dae48e0 100644 --- a/clang/test/CodeGen/sanitize-thread-attr.cpp +++ b/clang/test/CodeGen/sanitize-thread-attr.cpp @@ -46,16 +46,13 @@ int force_instance = TemplateTSANOk<42>() // Check that __cxx_global_var_init* get the sanitize_thread attribute. int global1 = 0; int global2 = *(int*)((char*)&global1+1); -// WITHOUT: @__cxx_global_var_init{{.*}}[[NOATTR_NO_TF:#[0-9]+]] -// BL: @__cxx_global_var_init{{.*}}[[NOATTR_NO_TF:#[0-9]+]] -// TSAN: @__cxx_global_var_init{{.*}}[[WITH_NO_TF:#[0-9]+]] +// WITHOUT: @__cxx_global_var_init{{.*}}[[NOATTR:#[0-9]+]] +// BL: @__cxx_global_var_init{{.*}}[[NOATTR:#[0-9]+]] +// TSAN: @__cxx_global_var_init{{.*}}[[WITH:#[0-9]+]] // WITHOUT: attributes [[NOATTR]] = { nounwind{{.*}} } -// WITHOUT: attributes [[NOATTR_NO_TF]] = { nounwind } // BL: attributes [[NOATTR]] = { nounwind{{.*}} } -// BL: attributes [[NOATTR_NO_TF]] = { nounwind{{.*}} } // TSAN: attributes [[NOATTR]] = { nounwind{{.*}} } // TSAN: attributes [[WITH]] = { nounwind sanitize_thread{{.*}} } -// TSAN: attributes [[WITH_NO_TF]] = { nounwind sanitize_thread } -- 2.7.4