[cfe-commits] r104999 - /cfe/trunk/lib/CodeGen/CGException.cpp

Daniel Dunbar daniel at zuster.org
Fri May 28 12:43:36 PDT 2010


Author: ddunbar
Date: Fri May 28 14:43:36 2010
New Revision: 104999

URL: http://llvm.org/viewvc/llvm-project?rev=104999&view=rev
Log:
Fix personality function name when using SjLj exceptions.

Modified:
    cfe/trunk/lib/CodeGen/CGException.cpp

Modified: cfe/trunk/lib/CodeGen/CGException.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGException.cpp?rev=104999&r1=104998&r2=104999&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGException.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGException.cpp Fri May 28 14:43:36 2010
@@ -126,9 +126,12 @@
 static llvm::Constant *getPersonalityFn(CodeGenModule &CGM) {
   const char *PersonalityFnName = "__gcc_personality_v0";
   LangOptions Opts = CGM.getLangOptions();
-  if (Opts.CPlusPlus)
+  if (Opts.CPlusPlus) {
+    if (Opts.SjLjExceptions)
+     PersonalityFnName = "__gxx_personality_sj0";
+    else
      PersonalityFnName = "__gxx_personality_v0";
-  else if (Opts.ObjC1) {
+  } else if (Opts.ObjC1) {
     if (Opts.NeXTRuntime) {
       if (Opts.ObjCNonFragileABI)
         PersonalityFnName = "__gcc_personality_v0";





More information about the cfe-commits mailing list