Index: include/llvm/ADT/iterator.h
===================================================================
--- include/llvm/ADT/iterator.h
+++ include/llvm/ADT/iterator.h
@@ -155,7 +155,14 @@
     typename T = typename std::iterator_traits<WrappedIteratorT>::value_type,
     typename DifferenceTypeT =
         typename std::iterator_traits<WrappedIteratorT>::difference_type,
-    typename PointerT = T *, typename ReferenceT = T &,
+    typename PointerT = typename std::conditional<
+        std::is_same<T, typename std::iterator_traits<
+                            WrappedIteratorT>::value_type>::value,
+        typename std::iterator_traits<WrappedIteratorT>::pointer, T *>::type,
+    typename ReferenceT = typename std::conditional<
+        std::is_same<T, typename std::iterator_traits<
+                            WrappedIteratorT>::value_type>::value,
+        typename std::iterator_traits<WrappedIteratorT>::reference, T &>::type,
     // Don't provide these, they are mostly to act as aliases below.
     typename WrappedTraitsT = std::iterator_traits<WrappedIteratorT>>
 class iterator_adaptor_base
Index: unittests/Support/IteratorTest.cpp
===================================================================
--- unittests/Support/IteratorTest.cpp
+++ unittests/Support/IteratorTest.cpp
@@ -98,4 +98,15 @@
   EXPECT_EQ(End, I);
 }
 
+TEST(IteratorAdaptorBaseTest, ForwardTypedefs) {
+  struct WeirdIter
+      : std::iterator<std::input_iterator_tag, int, int, int, int> {};
+  struct AdaptedIter : iterator_adaptor_base<AdaptedIter, WeirdIter> {};
+  static_assert(std::is_same<typename AdaptedIter::value_type, int>::value, "");
+  static_assert(std::is_same<typename AdaptedIter::difference_type, int>::value,
+                "");
+  static_assert(std::is_same<typename AdaptedIter::pointer, int>::value, "");
+  static_assert(std::is_same<typename AdaptedIter::reference, int>::value, "");
+}
+
 } // anonymous namespace