1 files changed, 2 insertions, 18 deletions

diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index 89da9fbf3c9..c92d5f30f95 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -2100,13 +2100,13 @@ void Parser::MaybeParseAndDiagnoseDeclSpecAfterCXX11VirtSpecifierSeq(
   ParseTypeQualifierListOpt(DS, AR_NoAttributesParsed, false);
   D.ExtendWithDeclSpec(DS);
 
-  auto &Function = D.getFunctionTypeInfo();
   if (DS.getTypeQualifiers() != DeclSpec::TQ_unspecified) {
     auto DeclSpecCheck = [&] (DeclSpec::TQ TypeQual,
                               const char *FixItName,
                               SourceLocation SpecLoc,
                               unsigned* QualifierLoc) {
       FixItHint Insertion;
+      auto &Function = D.getFunctionTypeInfo();
       if (DS.getTypeQualifiers() & TypeQual) {
         if (!(Function.TypeQuals & TypeQual)) {
           std::string Name(FixItName);
@@ -2122,6 +2122,7 @@ void Parser::MaybeParseAndDiagnoseDeclSpecAfterCXX11VirtSpecifierSeq(
           << Insertion;
       }
     };
+    auto &Function = D.getFunctionTypeInfo();
     DeclSpecCheck(DeclSpec::TQ_const, "const", DS.getConstSpecLoc(),
                   &Function.ConstQualifierLoc);
     DeclSpecCheck(DeclSpec::TQ_volatile, "volatile", DS.getVolatileSpecLoc(),
@@ -2129,23 +2130,6 @@ void Parser::MaybeParseAndDiagnoseDeclSpecAfterCXX11VirtSpecifierSeq(
     DeclSpecCheck(DeclSpec::TQ_restrict, "restrict", DS.getRestrictSpecLoc(),
                   &Function.RestrictQualifierLoc);
   }
-
-  // Parse ref-qualifiers.
-  bool RefQualifierIsLValueRef = true;
-  SourceLocation RefQualifierLoc;
-  if (ParseRefQualifier(RefQualifierIsLValueRef, RefQualifierLoc)) {
-    const char *Name = (RefQualifierIsLValueRef ? "& " : "&& ");
-    FixItHint Insertion = FixItHint::CreateInsertion(VS.getFirstLocation(), Name);
-    Function.RefQualifierIsLValueRef = RefQualifierIsLValueRef;
-    Function.RefQualifierLoc = RefQualifierLoc.getRawEncoding();
-
-    Diag(RefQualifierLoc, diag::err_declspec_after_virtspec)
-      << (RefQualifierIsLValueRef ? "&" : "&&")
-      << VirtSpecifiers::getSpecifierName(VS.getLastSpecifier())
-      << FixItHint::CreateRemoval(RefQualifierLoc)
-      << Insertion;
-    D.SetRangeEnd(RefQualifierLoc);
-  }
 }
 
 /// ParseCXXClassMemberDeclaration - Parse a C++ class member declaration.