diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index b96968d4592f5..f9ead20f6dacb 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -1132,6 +1132,12 @@ void Parser::AnnotateExistingDecltypeSpecifier(const DeclSpec &DS,
   // make sure we have a token we can turn into an annotation token
   if (PP.isBacktrackEnabled()) {
     PP.RevertCachedTokens(1);
+    if (DS.getTypeSpecType() == TST_error) {
+      // make sure we have meaningful cached tokens
+      if (EndLoc.isValid() && StartLoc.isValid() && EndLoc != StartLoc) {
+        EndLoc = PP.getLastCachedTokenLocation();
+      }
+    }
   } else
     PP.EnterToken(Tok, /*IsReinject*/ true);
 
diff --git a/clang/test/Parser/gh165246.cpp b/clang/test/Parser/gh165246.cpp
new file mode 100644
index 0000000000000..40fc622589f25
--- /dev/null
+++ b/clang/test/Parser/gh165246.cpp
@@ -0,0 +1,5 @@
+// RUN: %clang_cc1 -verify %s -std=c++11 -fsyntax-only
+
+int decltype {}
+// expected-error@-1 {{expected '(' after 'decltype'}} \
+// expected-error@-1 {{expected unqualified-id}}
\ No newline at end of file