commit 3d68aa838be45dc2bda53c9abd0089c41a177b5f
author Douglas Gregor <dgregor@apple.com> Wed Oct 12 18:28:53 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Oct 12 18:28:53 2011 +0000
tree 516e26a6d70efdf147a1f88e05331672c0666c57
parent 8007320902690eaf5affa16e730a93fc8d0e414d

The Objective-C rewriter uses the fragile ABI, always.

llvm-svn: 141795

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index e0efe82..5bf0d26 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -1907,9 +1907,11 @@
       D.Diag(diag::err_drv_clang_unsupported) << A->getAsString(Args);
   } else {
     // Otherwise, determine if we are using the non-fragile ABI.
+    bool NonFragileABIIsDefault
+      = (!IsRewriter && getToolChain().IsObjCNonFragileABIDefault());
     if (Args.hasFlag(options::OPT_fobjc_nonfragile_abi,
                      options::OPT_fno_objc_nonfragile_abi,
-                     getToolChain().IsObjCNonFragileABIDefault())) {
+                     NonFragileABIIsDefault)) {
       // Determine the non-fragile ABI version to use.
 #ifdef DISABLE_DEFAULT_NONFRAGILEABI_TWO
       unsigned NonFragileABIVersion = 1;