Index: llvm/include/llvm/Support/Casting.h
===================================================================
--- llvm/include/llvm/Support/Casting.h
+++ llvm/include/llvm/Support/Casting.h
@@ -18,6 +18,7 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/type_traits.h"
 #include <cassert>
+#include <memory>
 
 namespace llvm {
 
@@ -161,6 +162,17 @@
   typedef const To* ret_type;   // Constant pointer arg case, return const Ty*
 };
 
+struct bar;
+
+template <class To, class From>
+struct cast_retty_impl<To, std::unique_ptr<From>> {
+private:
+  typedef typename cast_retty_impl<To, From *>::ret_type PointerType;
+  typedef typename std::remove_pointer<PointerType>::type ResultType;
+
+public:
+  typedef std::unique_ptr<ResultType> ret_type;
+};
 
 template<class To, class From, class SimpleFrom>
 struct cast_retty_wrap {
@@ -298,6 +310,15 @@
   return isa<X>(Val) ? cast<X>(Val) : nullptr;
 }
 
+template <class X, class Y>
+LLVM_NODISCARD inline typename cast_retty<X, std::unique_ptr<Y>>::ret_type
+dyn_cast(std::unique_ptr<Y> &Val) {
+  if (!isa<X>(Val.get()))
+    return nullptr;
+  typedef typename cast_retty<X, std::unique_ptr<Y>>::ret_type ret_type;
+  return ret_type(cast<X>(Val.release()));
+}
+
 // dyn_cast_or_null<X> - Functionally identical to dyn_cast, except that a null
 // value is accepted.
 //
@@ -323,6 +344,14 @@
   return (Val && isa<X>(Val)) ? cast<X>(Val) : nullptr;
 }
 
+template <class X, class Y>
+LLVM_NODISCARD inline typename cast_retty<X, std::unique_ptr<Y>>::ret_type
+dyn_cast_or_null(std::unique_ptr<Y> &Val) {
+  if (!Val)
+    return nullptr;
+  return dyn_cast<X>(Val);
+}
+
 } // End llvm namespace
 
 #endif
Index: llvm/unittests/Support/Casting.cpp
===================================================================
--- llvm/unittests/Support/Casting.cpp
+++ llvm/unittests/Support/Casting.cpp
@@ -150,6 +150,11 @@
   // EXPECT_EQ(F4, null_foo);
   foo *F5 = B1.daz();
   EXPECT_NE(F5, null_foo);
+
+  std::unique_ptr<const bar> BP(B2);
+  std::unique_ptr<const foo> FP = dyn_cast<foo>(BP);
+  EXPECT_NE(FP.get(), null_foo);
+  FP.release();
 }
 
 TEST(CastingTest, dyn_cast_or_null) {
@@ -163,6 +168,10 @@
   EXPECT_EQ(F4, null_foo);
   foo *F5 = B1.naz();
   EXPECT_NE(F5, null_foo);
+
+  std::unique_ptr<const bar> BP(fub());
+  std::unique_ptr<const foo> FP = dyn_cast_or_null<foo>(BP);
+  EXPECT_EQ(FP.get(), null_foo);
 }
 
 // These lines are errors...