diff options
author | David Majnemer <david.majnemer@gmail.com> | 2015-05-10 21:38:26 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2015-05-10 21:38:26 +0000 |
commit | fb6ffca6f8229f9f2b2f7394305be572fe96a313 (patch) | |
tree | bd91cd5c110164e9a2ec884d58b05b52406b311d /clang/lib/CodeGen/CGException.cpp | |
parent | 173504e494e812198ad4d680548efa075fcbced8 (diff) | |
download | bcm5719-llvm-fb6ffca6f8229f9f2b2f7394305be572fe96a313.tar.gz bcm5719-llvm-fb6ffca6f8229f9f2b2f7394305be572fe96a313.zip |
[MS ABI] Update EH emission for MSVC 2015 compatibility
MSVC 2015 renamed the symbol found by name lookup for 'std::terminate'
so we cannot rely on using '?terminate@@YAXXZ'. Furthermore, it seems
that 2015 will be the first release of MSVC which permits inlining a
function which is noexcept into a function which isn't. This is
implemented by creating a cleanup for the invoker which jumps to
__std_terminate. Clang's implementation of this aspect of the MSVC
scheme is slightly less efficient in this respect because we use a
catch handler configured as a catch-all handler instead.
llvm-svn: 236961
Diffstat (limited to 'clang/lib/CodeGen/CGException.cpp')
-rw-r--r-- | clang/lib/CodeGen/CGException.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 337aaf23fd0..6e0bdd24a75 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -60,7 +60,10 @@ llvm::Constant *CodeGenModule::getTerminateFn() { name = "_ZSt9terminatev"; } else if (getLangOpts().CPlusPlus && getTarget().getCXXABI().isMicrosoft()) { - name = "\01?terminate@@YAXXZ"; + if (getLangOpts().isCompatibleWithMSVC(19)) + name = "__std_terminate"; + else + name = "\01?terminate@@YAXXZ"; } else if (getLangOpts().ObjC1 && getLangOpts().ObjCRuntime.hasTerminate()) name = "objc_terminate"; |