[compiler-rt] d9b062a - [TSan][Darwin] Remove unnecessary lit substitution

[Julian Lettner via llvm-commits]

Author: Julian Lettner
Date: 2020-08-20T13:00:32-07:00
New Revision: d9b062ad8777c283f9a1099a3ce29248348e5f40

URL: https://github.com/llvm/llvm-project/commit/d9b062ad8777c283f9a1099a3ce29248348e5f40
DIFF: https://github.com/llvm/llvm-project/commit/d9b062ad8777c283f9a1099a3ce29248348e5f40.diff

LOG: [TSan][Darwin] Remove unnecessary lit substitution

We don't test on very old versions of Apple platforms anymore.  The
following lit substitution concerning the minimum deployment target for
ARC support can be removed.

```
%darwin_min_target_with_full_runtime_arc_support -> 10.11
```

Differential Revision: https://reviews.llvm.org/D85803

Added: 
    

Modified: 
    compiler-rt/test/lit.common.cfg.py
    compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
    compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm
    compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm
    compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
    compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
    compiler-rt/test/tsan/Darwin/objc-synchronize.mm

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index d773f3766fd3..53b0a47f11a9 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -268,9 +268,7 @@
 # to the macOS version that first contained the relevant feature.
 darwin_min_deployment_target_substitutions = {
   '%macos_min_target_10_11': '10.11',
-  # rdar://problem/22207160
-  '%darwin_min_target_with_full_runtime_arc_support': '10.11',
-  '%darwin_min_target_with_tls_support': '10.12',
+  '%darwin_min_target_with_tls_support': '10.12',  # TLS requires watchOS 3+ simulator
 }
 
 if config.host_os == 'Darwin':

diff  --git a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
index b6a38d702240..0cf729e7f2d8 100644
--- a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
+++ b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation
 // RUN: %env_tsan_opts=ignore_interceptors_accesses=1 %run %t 2>&1 | FileCheck %s
 
 // Check that we do not report races between:

diff  --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm
index 5806e8af925e..c438984f1e5d 100644
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle-tagged.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN:     %run %t 6 2>&1 | FileCheck %s --check-prefix=SIX
 // RUN: not %run %t 7 2>&1 | FileCheck %s --check-prefix=SEVEN
 

diff  --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm
index fb816311580b..006716fefcd3 100644
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-cycle.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN:                                   not %run %t 2>&1 | FileCheck %s
 // RUN: %env_tsan_opts=detect_deadlocks=1 not %run %t 2>&1 | FileCheck %s
 // RUN: %env_tsan_opts=detect_deadlocks=0     %run %t 2>&1 | FileCheck %s --check-prefix=DISABLED

diff  --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
index ab6643e5c54e..be48a0ed59ad 100644
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN: %run %t 2>&1 | FileCheck %s
 
 #import <Foundation/Foundation.h>

diff  --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
index ab0af46ec4af..2b2c08b8c606 100644
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN: %run %t 2>&1 | FileCheck %s
 
 #import <Foundation/Foundation.h>

diff  --git a/compiler-rt/test/tsan/Darwin/objc-synchronize.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
index 0bf06370a9b8..85aaa24d42fd 100644
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
+// RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc
 // RUN: %run %t 2>&1 | FileCheck %s
 
 #import <Foundation/Foundation.h>