diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index d8894c6..278c80f 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -426,7 +426,8 @@
 
     // Only annotate C++ scope. Allow class-name as an identifier in case
     // it's a constructor.
-    TryAnnotateScopeToken();
+    if (getLang().CPlusPlus)
+      TryAnnotateScopeToken();
     
     switch (Tok.getKind()) {
     default: