//===----------------------------------------------------------------------===//
//
//                     The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//

// On Windows Clang bugs out when both __declspec and __attribute__ are present,
// the processing goes awry preventing the definition of the types.
// XFAIL: LIBCXX-WINDOWS-FIXME

// UNSUPPORTED: libcpp-has-no-threads
// REQUIRES: thread-safety

// <mutex>

// MODULES_DEFINES: _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
#define _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS

#include <mutex>

std::mutex m;
int foo __attribute__((guarded_by(m)));

static void scoped() {
#if __cplusplus >= 201703L
  std::scoped_lock<std::mutex> lock(m);
  foo++;
#endif
}

int main() {
  scoped();
  std::lock_guard<std::mutex> lock(m);
  foo++;
}

//===----------------------------------------------------------------------===//
//
//                     The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//

// On Windows Clang bugs out when both __declspec and __attribute__ are present,
// the processing goes awry preventing the definition of the types.
// XFAIL: LIBCXX-WINDOWS-FIXME

// UNSUPPORTED: libcpp-has-no-threads
// REQUIRES: thread-safety

// <mutex>

// MODULES_DEFINES: _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS
#define _LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS

#include <mutex>

std::mutex m;
int foo __attribute__((guarded_by(m)));

static void scoped() {
  std::scoped_lock<std::mutex> lock(m);
  foo++;
}

int main() {
  scoped();
  std::lock_guard<std::mutex> lock(m);
  foo++;
}

--- 
+++ 
@@ -25,8 +25,10 @@
 int foo __attribute__((guarded_by(m)));
 
 static void scoped() {
+#if __cplusplus >= 201703L
   std::scoped_lock<std::mutex> lock(m);
   foo++;
+#endif
 }
 
 int main() {
Use std::scoped_lock only for C++17 and newer

This fixes a test failure caused by D53049.

git-svn-id: 756ef344af921d95d562d9e9f9389127a89a6314@344192 91177308-0d34-0410-b5e6-96231b3b80d8
