diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h

index 63c7f48a..c510b288 100644

--- a/llvm/include/llvm/ADT/STLExtras.h

+++ b/llvm/include/llvm/ADT/STLExtras.h

@@ -1820,9 +1820,9 @@ template <typename R> struct result_pair {

   result_pair(std::size_t Index, IterOfRange<R> Iter)

       : Index(Index), Iter(Iter) {}

-  result_pair<R>(const result_pair<R> &Other)

+  result_pair(const result_pair &Other)

       : Index(Other.Index), Iter(Other.Iter) {}

-  result_pair<R> &operator=(const result_pair<R> &Other) {

+  result_pair &operator=(const result_pair &Other) {

     Index = Other.Index;

     Iter = Other.Iter;

     return *this;

@@ -1870,8 +1870,8 @@ public:

     return Result.Iter == RHS.Result.Iter;

   }

-  enumerator_iter<R>(const enumerator_iter<R> &Other) : Result(Other.Result) {}

-  enumerator_iter<R> &operator=(const enumerator_iter<R> &Other) {

+  enumerator_iter(const enumerator_iter &Other) : Result(Other.Result) {}

+  enumerator_iter &operator=(const enumerator_iter &Other) {

     Result = Other.Result;

     return *this;

   }