commit 259d71a464212756009dfd2418005c6eb5840c94
author David Majnemer <david.majnemer@gmail.com> Thu Jan 21 23:01:11 2016 +0000
committer David Majnemer <david.majnemer@gmail.com> Thu Jan 21 23:01:11 2016 +0000
tree 48d373cb62e962277acc167cd4d97b550eb357f5
parent 9beec21fcf334849b063d838160dbd5512eb411c

[MSVC Compat] Don't omit frame pointers if /Oy- is specified before /O2

Microsoft's documentation states that specifying
/Oy- after the /O[12x] options disables frame-pointer omission.
What it does *not* state is that it also disables frame-pointer omission
if /Oy- is specified before /O[12x].

llvm-svn: 258447

clang/lib/Driver/MSVCToolChain.cpp

diff --git a/clang/lib/Driver/MSVCToolChain.cpp b/clang/lib/Driver/MSVCToolChain.cpp
index 6874715..1d2d20b 100644
--- a/clang/lib/Driver/MSVCToolChain.cpp
+++ b/clang/lib/Driver/MSVCToolChain.cpp
@@ -659,7 +659,8 @@
             DAL.AddFlagArg(A, Opts.getOption(options::OPT_fbuiltin));
             DAL.AddJoinedArg(A, Opts.getOption(options::OPT_O), "2");
           }
-          if (SupportsForcingFramePointer)
+          if (SupportsForcingFramePointer &&
+              !DAL.hasArgNoClaim(options::OPT_fno_omit_frame_pointer))
             DAL.AddFlagArg(A,
                            Opts.getOption(options::OPT_fomit_frame_pointer));
           if (OptChar == '1' || OptChar == '2')