Lazily initialize the 'final' and 'override' contextual keywords as suggested by Doug.

llvm-svn: 123876

3 files changed, 10 insertions, 7 deletions

diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h
index 4ac9eb9987b..185f263d5e4 100644
--- a/clang/include/clang/Parse/Parser.h
+++ b/clang/include/clang/Parse/Parser.h
@@ -113,8 +113,8 @@ class Parser : public CodeCompletionHandler {
   IdentifierInfo *Ident_pixel;
 
   /// C++0x contextual keywords. 
-  IdentifierInfo *Ident_final;
-  IdentifierInfo *Ident_override;
+  mutable IdentifierInfo *Ident_final;
+  mutable IdentifierInfo *Ident_override;
 
   llvm::OwningPtr<PragmaHandler> AlignHandler;
   llvm::OwningPtr<PragmaHandler> GCCVisibilityHandler;
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index 75a6f59eac0..0dc367c9fd3 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -1275,6 +1275,12 @@ VirtSpecifiers::VirtSpecifier Parser::isCXX0XVirtSpecifier() const {
   if (Tok.is(tok::identifier)) {
     IdentifierInfo *II = Tok.getIdentifierInfo();
 
+    // Initialize the contextual keywords.
+    if (!Ident_final) {
+      Ident_final = &PP.getIdentifierTable().get("final");
+      Ident_override = &PP.getIdentifierTable().get("override");
+    }
+
     if (II == Ident_override)
       return VirtSpecifiers::VS_Override;
 
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 47c62377c22..3327f7b5a90 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -387,11 +387,8 @@ void Parser::Initialize() {
     ObjCTypeQuals[objc_byref] = &PP.getIdentifierTable().get("byref");
   }
 
-  // Initialize C++0x contextual keywords.
-  if (getLang().CPlusPlus0x) {
-    Ident_final = &PP.getIdentifierTable().get("final");
-    Ident_override = &PP.getIdentifierTable().get("override");
-  }
+  Ident_final = 0;
+  Ident_override = 0;
 
   Ident_super = &PP.getIdentifierTable().get("super");