Remove unused LangOptions NoExtensions and Boolean.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70282 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h
index 60f4d084f30098aecd91cefc1f3a9330c27e9148..fba474b2f527759bcd4765a19966024ce7caca09 100644 (file)
--- a/include/clang/Basic/LangOptions.h
+++ b/include/clang/Basic/LangOptions.h
@@ -32,7 +32,6 @@ public:
   unsigned Microsoft         : 1;  // Microsoft extensions.
   unsigned CPlusPlus         : 1;  // C++ Support
   unsigned CPlusPlus0x       : 1;  // C++0x Support
-  unsigned NoExtensions      : 1;  // All extensions are disabled, strict mode.
   unsigned CXXOperatorNames  : 1;  // Treat C++ operator names as keywords.
     
   unsigned ObjC1             : 1;  // Objective-C 1 support enabled.
@@ -40,7 +39,6 @@ public:
   unsigned ObjCNonFragileABI : 1;  // Objective-C modern abi enabled
     
   unsigned PascalStrings     : 1;  // Allow Pascal strings
-  unsigned Boolean           : 1;  // Allow bool/true/false
   unsigned WritableStrings   : 1;  // Allow writable strings
   unsigned LaxVectorConversions : 1;
   unsigned Exceptions        : 1;  // Support exception handling.
@@ -103,8 +101,8 @@ public:
     GNUMode = ImplicitInt = Digraphs = 0;
     HexFloats = 0;
     GC = ObjC1 = ObjC2 = ObjCNonFragileABI = 0;
-    C99 = Microsoft = CPlusPlus = CPlusPlus0x = NoExtensions = 0;
-    CXXOperatorNames = PascalStrings = Boolean = WritableStrings = 0;
+    C99 = Microsoft = CPlusPlus = CPlusPlus0x = 0;
+    CXXOperatorNames = PascalStrings = WritableStrings = 0;
     Exceptions = NeXTRuntime = Freestanding = NoBuiltin = 0;
     LaxVectorConversions = 1;
     HeinousExtensions = 0;

diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index c1cb87bc160d78866db01f5a5db55d84d1e8f3ff..6dd7806d0aaf661fa0fdcccbd6495f31d09b2fb9 100644 (file)
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -1242,13 +1242,11 @@ bool PCHReader::ParseLanguageOptions(
   PARSE_LANGOPT_IMPORTANT(Microsoft, diag::warn_pch_microsoft_extensions);
   PARSE_LANGOPT_IMPORTANT(CPlusPlus, diag::warn_pch_cplusplus);
   PARSE_LANGOPT_IMPORTANT(CPlusPlus0x, diag::warn_pch_cplusplus0x);
-  PARSE_LANGOPT_IMPORTANT(NoExtensions, diag::warn_pch_extensions);
   PARSE_LANGOPT_BENIGN(CXXOperatorName);
   PARSE_LANGOPT_IMPORTANT(ObjC1, diag::warn_pch_objective_c);
   PARSE_LANGOPT_IMPORTANT(ObjC2, diag::warn_pch_objective_c2);
   PARSE_LANGOPT_IMPORTANT(ObjCNonFragileABI, diag::warn_pch_nonfragile_abi);
   PARSE_LANGOPT_BENIGN(PascalStrings);
-  PARSE_LANGOPT_BENIGN(Boolean);
   PARSE_LANGOPT_BENIGN(WritableStrings);
   PARSE_LANGOPT_IMPORTANT(LaxVectorConversions, 
                           diag::warn_pch_lax_vector_conversions);

diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp
index 6b58e250920d0bd32bb492f839820bb7cbc34a81..cd2021479ff53d1c00c985bc68bee0b5605a2a00 100644 (file)
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -478,7 +478,6 @@ void PCHWriter::WriteLanguageOptions(const LangOptions &LangOpts) {
   Record.push_back(LangOpts.Microsoft);  // Microsoft extensions.
   Record.push_back(LangOpts.CPlusPlus);  // C++ Support
   Record.push_back(LangOpts.CPlusPlus0x);  // C++0x Support
-  Record.push_back(LangOpts.NoExtensions);  // All extensions are disabled, strict mode.
   Record.push_back(LangOpts.CXXOperatorNames);  // Treat C++ operator names as keywords.
     
   Record.push_back(LangOpts.ObjC1);  // Objective-C 1 support enabled.
@@ -486,7 +485,6 @@ void PCHWriter::WriteLanguageOptions(const LangOptions &LangOpts) {
   Record.push_back(LangOpts.ObjCNonFragileABI);  // Objective-C modern abi enabled
     
   Record.push_back(LangOpts.PascalStrings);  // Allow Pascal strings
-  Record.push_back(LangOpts.Boolean);  // Allow bool/true/false
   Record.push_back(LangOpts.WritableStrings);  // Allow writable strings
   Record.push_back(LangOpts.LaxVectorConversions);
   Record.push_back(LangOpts.Exceptions);  // Support exception handling.

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index 3d5c70d7c9c3236508d9ed82fc01f9c2bbad353c..92452ec5be40cea9387297b8aba593f0bff326fd 100644 (file)
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -753,7 +753,6 @@ static void InitializeLanguageStandard(LangOptions &Options, LangKind LK,
   case lang_cxx98:
     Options.CPlusPlus = 1;
     Options.CXXOperatorNames = !NoOperatorNames;
-    Options.Boolean = 1;
     // FALL THROUGH.
   case lang_gnu99:
   case lang_c99: