diff options
| author | Jordy Rose <jediknil@belkadan.com> | 2011-08-30 01:51:13 +0000 |
|---|---|---|
| committer | Jordy Rose <jediknil@belkadan.com> | 2011-08-30 01:51:13 +0000 |
| commit | b7abce9f8bed3b7bc19a71a596463505fe353df8 (patch) | |
| tree | ea067c9e2fd9a3d9f790e2dd478aef6d51cb9bd6 | |
| parent | 3480ef24d1c85e7a44a12c29c73723307af0233c (diff) | |
| download | bcm5719-llvm-b7abce9f8bed3b7bc19a71a596463505fe353df8.tar.gz bcm5719-llvm-b7abce9f8bed3b7bc19a71a596463505fe353df8.zip | |
Remove obsolete ObjCInferRelatedReturnType from LangOptions...the correct option is ObjCInferRelatedResultType.
llvm-svn: 138793
| -rw-r--r-- | clang/include/clang/Basic/LangOptions.h | 3 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTReader.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTWriter.cpp | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/clang/include/clang/Basic/LangOptions.h b/clang/include/clang/Basic/LangOptions.h index 5cdeda3877d..4267eecf23a 100644 --- a/clang/include/clang/Basic/LangOptions.h +++ b/clang/include/clang/Basic/LangOptions.h @@ -134,8 +134,6 @@ public: 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. @@ -180,7 +178,6 @@ public: HexFloats = 0; ObjCAutoRefCount = 0; ObjCRuntimeHasWeak = 0; - ObjCInferRelatedReturnType = 0; GC = ObjC1 = ObjC2 = ObjCNonFragileABI = ObjCNonFragileABI2 = 0; AppleKext = 0; ObjCDefaultSynthProperties = 0; diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index 2817d86d36d..fe714300ac8 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -154,7 +154,6 @@ PCHValidator::ReadLanguageOptions(const LangOptions &LangOpts) { PARSE_LANGOPT_IMPORTANT(ElideConstructors, diag::warn_pch_elide_constructors); PARSE_LANGOPT_BENIGN(SpellChecking); PARSE_LANGOPT_IMPORTANT(ObjCAutoRefCount, diag::warn_pch_auto_ref_count); - PARSE_LANGOPT_BENIGN(ObjCInferRelatedReturnType); #undef PARSE_LANGOPT_IMPORTANT #undef PARSE_LANGOPT_BENIGN @@ -3085,7 +3084,6 @@ bool ASTReader::ParseLanguageOptions( PARSE_LANGOPT(SpellChecking); PARSE_LANGOPT(MRTD); PARSE_LANGOPT(ObjCAutoRefCount); - PARSE_LANGOPT(ObjCInferRelatedReturnType); #undef PARSE_LANGOPT return Listener->ReadLanguageOptions(LangOpts); diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 79703216f5d..0d2a0154de9 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -1134,7 +1134,6 @@ void ASTWriter::WriteLanguageOptions(const LangOptions &LangOpts) { Record.push_back(LangOpts.SpellChecking); Record.push_back(LangOpts.MRTD); Record.push_back(LangOpts.ObjCAutoRefCount); - Record.push_back(LangOpts.ObjCInferRelatedReturnType); Stream.EmitRecord(LANGUAGE_OPTIONS, Record); } |
