diff --git a/llvm/unittests/ADT/RangeAdapterTest.cpp b/llvm/unittests/ADT/RangeAdapterTest.cpp
--- a/llvm/unittests/ADT/RangeAdapterTest.cpp
+++ b/llvm/unittests/ADT/RangeAdapterTest.cpp
@@ -157,14 +157,12 @@
 
 TYPED_TEST(RangeAdapterRValueTest, RangeType) {
   static_assert(
-      std::is_same<
-          decltype(reverse(*static_cast<TypeParam *>(nullptr)).begin()),
-          decltype(static_cast<TypeParam *>(nullptr)->rbegin())>::value,
+      std::is_same_v<decltype(reverse(std::declval<TypeParam>()).begin()),
+                     decltype(std::declval<TypeParam>().rbegin())>,
       "reverse().begin() should have the same type as rbegin()");
   static_assert(
-      std::is_same<
-          decltype(reverse(*static_cast<const TypeParam *>(nullptr)).begin()),
-          decltype(static_cast<const TypeParam *>(nullptr)->rbegin())>::value,
+      std::is_same_v<decltype(reverse(std::declval<const TypeParam>()).begin()),
+                     decltype(std::declval<const TypeParam>().rbegin())>,
       "reverse().begin() should have the same type as rbegin() [const]");
 }