Vendor import of clang trunk r130700:

http://llvm.org/svn/llvm-project/cfe/trunk@130700

1 files changed, 20 insertions, 4 deletions

diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h
index 0bd983e..a5f6789 100644
--- a/include/clang/Basic/LangOptions.h
+++ b/include/clang/Basic/LangOptions.h
@@ -34,6 +34,7 @@ public:
   unsigned Digraphs          : 1;  // C94, C99 and C++
   unsigned HexFloats         : 1;  // C99 Hexadecimal float constants.
   unsigned C99               : 1;  // C99 Support
+  unsigned C1X               : 1;  // C1X Support
   unsigned Microsoft         : 1;  // Microsoft extensions.
   unsigned Borland           : 1;  // Borland extensions.
   unsigned CPlusPlus         : 1;  // C++ Support
@@ -56,6 +57,7 @@ public:
   unsigned ObjCExceptions    : 1;  // Support Objective-C exceptions.
   unsigned CXXExceptions     : 1;  // Support C++ exceptions.
   unsigned SjLjExceptions    : 1;  // Use setjmp-longjump exception handling.
+  unsigned TraditionalCPP    : 1; /// Enable some traditional CPP emulation.
   unsigned RTTI              : 1;  // Support RTTI information.
 
   unsigned MSBitfields       : 1; // MS-compatible structure layout
@@ -87,6 +89,8 @@ public:
                                   // used (instead of C99 semantics).
   unsigned NoInline          : 1; // Should __NO_INLINE__ be defined.
 
+  unsigned Deprecated        : 1; // Should __DEPRECATED be defined.
+
   unsigned ObjCGCBitmapPrint : 1; // Enable printing of gc's bitmap layout
                                   // for __weak/__strong ivars.
 
@@ -112,6 +116,7 @@ public:
   unsigned NoConstantCFStrings : 1;  // Do not do CF strings
   unsigned InlineVisibilityHidden : 1; // Whether inline C++ methods have
                                        // hidden visibility by default.
+  unsigned ParseUnknownAnytype: 1; /// Let the user write __unknown_anytype.
 
   unsigned SpellChecking : 1; // Whether to perform spell-checking for error
                               // recovery.
@@ -123,6 +128,11 @@ public:
   unsigned DefaultFPContract : 1; // Default setting for FP_CONTRACT
   // FIXME: This is just a temporary option, for testing purposes.
   unsigned NoBitFieldTypeAlign : 1;
+  unsigned FakeAddressSpaceMap : 1; // Use a fake address space map, for
+                                    // testing languages such as OpenCL.
+
+  unsigned MRTD : 1;            // -mrtd calling convention
+  unsigned DelayedTemplateParsing : 1;  // Delayed template parsing
 
 private:
   // We declare multibit enums as unsigned because MSVC insists on making enums
@@ -164,10 +174,10 @@ public:
     AppleKext = 0;
     ObjCDefaultSynthProperties = 0;
     NoConstantCFStrings = 0; InlineVisibilityHidden = 0;
-    C99 = Microsoft = Borland = CPlusPlus = CPlusPlus0x = 0;
+    C99 = C1X = Microsoft = Borland = CPlusPlus = CPlusPlus0x = 0;
     CXXOperatorNames = PascalStrings = WritableStrings = ConstStrings = 0;
     Exceptions = ObjCExceptions = CXXExceptions = SjLjExceptions = 0;
-    Freestanding = NoBuiltin = 0;
+    TraditionalCPP = Freestanding = NoBuiltin = 0;
     MSBitfields = 0;
     NeXTRuntime = 1;
     RTTI = 1;
@@ -205,6 +215,8 @@ public:
     GNUInline = 0;
     NoInline = 0;
 
+    Deprecated = 0;
+
     CharIsSigned = 1;
     ShortWChar = 0;
     ShortEnums = 0;
@@ -216,6 +228,10 @@ public:
     FastRelaxedMath = 0;
     DefaultFPContract = 0;
     NoBitFieldTypeAlign = 0;
+    FakeAddressSpaceMap = 0;
+    MRTD = 0;
+    DelayedTemplateParsing = 0;
+    ParseUnknownAnytype = 0;
   }
 
   GCMode getGCMode() const { return (GCMode) GC; }
@@ -240,8 +256,8 @@ public:
     SignedOverflowBehavior = (unsigned)V;
   }
 
-  bool areExceptionsEnabled() const {
-    return Exceptions;
+  bool isSignedOverflowDefined() const {
+    return getSignedOverflowBehavior() == SOB_Defined;
   }
 };