diff --git a/libcxx/include/__memory/allocator.h b/libcxx/include/__memory/allocator.h
--- a/libcxx/include/__memory/allocator.h
+++ b/libcxx/include/__memory/allocator.h
@@ -80,6 +80,7 @@
 class _LIBCPP_TEMPLATE_VIS allocator
     : private __non_trivial_if<!is_void<_Tp>::value, allocator<_Tp> >
 {
+    static_assert(!is_volatile<typename remove_pointer<_Tp>::type>::value, "std::allocator does not support volatile types");
 public:
     typedef size_t      size_type;
     typedef ptrdiff_t   difference_type;
@@ -162,6 +163,7 @@
 class _LIBCPP_TEMPLATE_VIS allocator<const _Tp>
     : private __non_trivial_if<!is_void<_Tp>::value, allocator<const _Tp> >
 {
+    static_assert(!is_volatile<typename remove_pointer<_Tp>::type>::value, "std::allocator does not support volatile types");
 public:
     typedef size_t      size_type;
     typedef ptrdiff_t   difference_type;
diff --git a/libcxx/test/libcxx/memory/allocator_volatile.verify.cpp b/libcxx/test/libcxx/memory/allocator_volatile.verify.cpp
new file mode 100644
--- /dev/null
+++ b/libcxx/test/libcxx/memory/allocator_volatile.verify.cpp
@@ -0,0 +1,17 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// REQUIRES: libc++
+
+#include <memory>
+
+auto A1 = std::allocator<volatile int>{}; // expected-error@*:* {{std::allocator does not support volatile types}}
+auto A2 = std::allocator<const volatile int>{}; // expected-error@*:* {{std::allocator does not support volatile types}}
+
+auto A3 = std::allocator<volatile int*>{}; // expected-error@*:* {{std::allocator does not support volatile types}}
+auto A4 = std::allocator<const volatile int*>{}; // expected-error@*:* {{std::allocator does not support volatile types}}