From: David Majnemer <david.majnemer@gmail.com>
Date: Sun, 10 May 2015 21:38:26 +0000 (+0000)
Subject: [MS ABI] Update EH emission for MSVC 2015 compatibility
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99d6ac1bc6f76af25b443ef1911addd2dd1039b8;p=clang

[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.

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

diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp
index 337aaf23fd..6e0bdd24a7 100644
--- a/lib/CodeGen/CGException.cpp
+++ b/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";
diff --git a/test/CodeGenCXX/microsoft-abi-eh-terminate.cpp b/test/CodeGenCXX/microsoft-abi-eh-terminate.cpp
new file mode 100644
index 0000000000..cbc1686893
--- /dev/null
+++ b/test/CodeGenCXX/microsoft-abi-eh-terminate.cpp
@@ -0,0 +1,15 @@
+// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -triple=x86_64-pc-windows-msvc -mconstructor-aliases -fexceptions -fcxx-exceptions -fms-compatibility-version=18.00 | FileCheck -check-prefix=MSVC2013 %s
+// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -triple=x86_64-pc-windows-msvc -mconstructor-aliases -fexceptions -fcxx-exceptions -fms-compatibility-version=19.00 | FileCheck -check-prefix=MSVC2015 %s
+
+void may_throw();
+void never_throws() noexcept(true) {
+  may_throw();
+}
+
+// CHECK-LABEL: define void @"\01?never_throws@@YAXXZ"
+// CHECK:      invoke void @"\01?may_throw@@YAXXZ"()
+
+// CHECK:      landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__CxxFrameHandler3 to i8*)
+// MSVC2013:   call void @"\01?terminate@@YAXXZ"()
+// MSVC2015:   call void @__std_terminate()
+// CHECK-NEXT: unreachable