Merge remote-tracking branch 'origin/swift-3.1-branch' into stable
* origin/swift-3.1-branch:
[asan] Mark failing test as UNSUPPORTED.
diff --git a/test/asan/TestCases/use-after-scope-types.cc b/test/asan/TestCases/use-after-scope-types.cc
index b213681..049a329 100644
--- a/test/asan/TestCases/use-after-scope-types.cc
+++ b/test/asan/TestCases/use-after-scope-types.cc
@@ -13,6 +13,9 @@
// RUN: %env_asan_opts=detect_stack_use_after_scope=0 %run %t 11
+// Temporarily disable to fix the bot.
+// UNSUPPORTED: darwin
+
#include <stdlib.h>
#include <string>
#include <vector>
