commit 7429c5941b2b8411cb66d5448c95381c59c7c697
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Fri Feb 14 08:56:25 2014 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Fri Feb 14 08:56:25 2014 +0000
tree 9747a0af75e8f9a882a6163a5a47c1cb4ec2d037
parent b8665226ec21e500dd210a39b8ca6c99dd7f4f51

Enable generation of unwind tables when building with sanitizers.

llvm-svn: 201391

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index c48c061..ee64d42 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -2536,10 +2536,11 @@
   // -fasynchronous-unwind-tables and -fnon-call-exceptions interact in more
   // complicated ways.
   bool AsynchronousUnwindTables =
-    Args.hasFlag(options::OPT_fasynchronous_unwind_tables,
-                 options::OPT_fno_asynchronous_unwind_tables,
-                 getToolChain().IsUnwindTablesDefault() &&
-                 !KernelOrKext);
+      Args.hasFlag(options::OPT_fasynchronous_unwind_tables,
+                   options::OPT_fno_asynchronous_unwind_tables,
+                   (getToolChain().IsUnwindTablesDefault() ||
+                    getToolChain().getSanitizerArgs().needsUnwindTables()) &&
+                       !KernelOrKext);
   if (Args.hasFlag(options::OPT_funwind_tables, options::OPT_fno_unwind_tables,
                    AsynchronousUnwindTables))
     CmdArgs.push_back("-munwind-tables");