commit 4c4efee6d3113f20b41efaeec08934332d2ea40e
author Douglas Gregor <dgregor@apple.com> Mon Jun 13 16:42:53 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Mon Jun 13 16:42:53 2011 +0000
tree 803dec660a3ed909d6793568be9895dd2b751040
parent 85269fcfc8639d7137b1c574c4825f4678ce245b

Eliminate the -f[no]objc-infer-related-result-type flags; there's no
reason to allow the user to control these semantics through a flag.


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

lib/Sema/SemaDeclObjC.cpp

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index bfa2ef4..0b032f8 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -2112,8 +2112,7 @@
     mergeObjCMethodDecls(ObjCMethod, InterfaceMD);
   }
   
-  if (!ObjCMethod->hasRelatedResultType() && 
-      getLangOptions().ObjCInferRelatedResultType) {
+  if (!ObjCMethod->hasRelatedResultType()) {
     bool InferRelatedResultType = false;
     switch (ObjCMethod->getMethodFamily()) {
     case OMF_None: