1 files changed, 11 insertions, 2 deletions
diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h
index f0f1432..dc77d4c 100644
--- a/include/clang/Basic/LangOptions.h
+++ b/include/clang/Basic/LangOptions.h
@@ -119,6 +119,8 @@ public:
   unsigned InlineVisibilityHidden : 1; // Whether inline C++ methods have
                                        // hidden visibility by default.
   unsigned ParseUnknownAnytype: 1; /// Let the user write __unknown_anytype.
+  unsigned DebuggerSupport : 1;   /// Do things that only make sense when
+                                  /// supporting a debugger
 
   unsigned SpellChecking : 1; // Whether to perform spell-checking for error
                               // recovery.
@@ -130,6 +132,10 @@ public:
   unsigned DefaultFPContract : 1; // Default setting for FP_CONTRACT
   // FIXME: This is just a temporary option, for testing purposes.
   unsigned NoBitFieldTypeAlign : 1;
+  unsigned ObjCAutoRefCount : 1; // Objective C automated reference counting
+  unsigned ObjCRuntimeHasWeak : 1; // The ARC runtime supports __weak
+  unsigned ObjCInferRelatedReturnType : 1; // Infer Objective-C related return
+                                           // types
   unsigned FakeAddressSpaceMap : 1; // Use a fake address space map, for
                                     // testing languages such as OpenCL.
 
@@ -172,10 +178,13 @@ public:
     Trigraphs = BCPLComment = Bool = DollarIdents = AsmPreprocessor = 0;
     GNUMode = GNUKeywords = ImplicitInt = Digraphs = 0;
     HexFloats = 0;
+    ObjCAutoRefCount = 0;
+    ObjCRuntimeHasWeak = 0;
+    ObjCInferRelatedReturnType = 0;
     GC = ObjC1 = ObjC2 = ObjCNonFragileABI = ObjCNonFragileABI2 = 0;
     AppleKext = 0;
     ObjCDefaultSynthProperties = 0;
-    ObjCInferRelatedResultType = 0;
+    ObjCInferRelatedResultType = 1;
     NoConstantCFStrings = 0; InlineVisibilityHidden = 0;
     C99 = C1X = Microsoft = Borland = CPlusPlus = CPlusPlus0x = 0;
     CXXOperatorNames = PascalStrings = WritableStrings = ConstStrings = 0;
@@ -234,7 +243,7 @@ public:
     FakeAddressSpaceMap = 0;
     MRTD = 0;
     DelayedTemplateParsing = 0;
-    ParseUnknownAnytype = 0;
+    ParseUnknownAnytype = DebuggerSupport = 0;
   }
 
   GCMode getGCMode() const { return (GCMode) GC; }