tsan: compilation of tests with newest clang

llvm-svn: 157392

2 files changed, 7 insertions, 5 deletions

diff --git a/compiler-rt/lib/tsan/output_tests/simple_stack2.cc b/compiler-rt/lib/tsan/output_tests/simple_stack2.cc
index d3b03aef7cd..0a7ad6e76bb 100644
--- a/compiler-rt/lib/tsan/output_tests/simple_stack2.cc
+++ b/compiler-rt/lib/tsan/output_tests/simple_stack2.cc
@@ -9,16 +9,16 @@ void __attribute__((noinline)) foo1() {
 }
 
 void __attribute__((noinline)) bar1() {
-  volatile int tmp = 42; (void)tmp;
+  volatile int tmp = 42; int tmp2 = tmp; (void)tmp2;
   foo1();
 }
 
 void __attribute__((noinline)) foo2() {
-  volatile int v = Global; (void)v;
+  volatile int v = Global; int v2 = v; (void)v2;
 }
 
 void __attribute__((noinline)) bar2() {
-  volatile int tmp = 42; (void)tmp;
+  volatile int tmp = 42; int tmp2 = tmp; (void)tmp2;
   foo2();
 }
 
diff --git a/compiler-rt/lib/tsan/rtl_tests/tsan_mop.cc b/compiler-rt/lib/tsan/rtl_tests/tsan_mop.cc
index 79bfc28d7e0..bf4edf08e15 100644
--- a/compiler-rt/lib/tsan/rtl_tests/tsan_mop.cc
+++ b/compiler-rt/lib/tsan/rtl_tests/tsan_mop.cc
@@ -194,12 +194,14 @@ TEST(ThreadSanitizer, HarmfulRaceOnVptr) {
 
 static void foo() {
   volatile int x = 42;
-  (void)x;
+  int x2 = x;
+  (void)x2;
 }
 
 static void bar() {
   volatile int x = 43;
-  (void)x;
+  int x2 = x;
+  (void)x2;
 }
 
 TEST(ThreadSanitizer, ReportDeadThread) {