Mercurial > projects > ldc

changeset 1584:f4c56ed32238

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed issue in exception runtime with recent LLVM revisions, with this in place EH seems to work properly on x86-64. These fixes need to be merged into tango trunk still!
author tomas@localhost.localdomain
date Wed, 21 Oct 2009 05:46:56 +0200
parents 593f99fddd2f
children 29b0f2d11c92
files ir/irlandingpad.cpp runtime/internal/eh.d
diffstat 2 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ir/irlandingpad.cpp	Tue Sep 22 20:26:50 2009 +0200
+++ b/ir/irlandingpad.cpp	Wed Oct 21 05:46:56 2009 +0200
@@ -133,7 +133,7 @@
     }
     // if there's a finally, the eh table has to have a 0 action
     if(hasFinally)
-        selectorargs.push_back(LLConstantInt::get(LLType::getInt32Ty(gIR->context()), 0));
+        selectorargs.push_back(DtoConstSize_t(0));//LLConstantInt::get(LLType::getInt32Ty(gIR->context()), 0));
 
     // personality fn
     llvm::Function* personality_fn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_eh_personality");
--- a/runtime/internal/eh.d	Tue Sep 22 20:26:50 2009 +0200
+++ b/runtime/internal/eh.d	Wed Oct 21 05:46:56 2009 +0200
@@ -8,6 +8,7 @@
 import ldc.cstdarg;
 
 // debug = EH_personality;
+// debug = EH_personality_verbose;
 
 // current EH implementation works on x86
 // if it has a working unwind runtime
@@ -36,7 +37,7 @@
 // libunwind headers
 extern(C)
 {
-    enum _Unwind_Reason_Code
+    enum _Unwind_Reason_Code : int
     {
         NO_REASON = 0,
         FOREIGN_EXCEPTION_CAUGHT = 1,
@@ -49,7 +50,7 @@
         CONTINUE_UNWIND = 8
     }
 
-    enum _Unwind_Action
+    enum _Unwind_Action : int
     {
         SEARCH_PHASE = 1,
         CLEANUP_PHASE = 2,
@@ -63,7 +64,7 @@
 
     struct _Unwind_Exception
     {
-        char[8] exception_class;
+        ulong exception_class;
         _Unwind_Exception_Cleanup_Fn exception_cleanup;
         ptrdiff_t private_1;
         ptrdiff_t private_2;
@@ -207,6 +208,7 @@
 // reading the EH tables and deciding what to do
 extern(C) _Unwind_Reason_Code _d_eh_personality(int ver, _Unwind_Action actions, ulong exception_class, _Unwind_Exception* exception_info, _Unwind_Context_Ptr context)
 {
+  debug(EH_personality_verbose) printf("entering personality function. context: %p\n", context);
   // check ver: the C++ Itanium ABI only allows ver == 1
   if(ver != 1)
     return _Unwind_Reason_Code.FATAL_PHASE1_ERROR;
@@ -224,7 +226,8 @@
   ubyte* action_table;
   ClassInfo* classinfo_table;
   _d_getLanguageSpecificTables(context, callsite_table, action_table, classinfo_table);
-
+  if (callsite_table is null)
+    return _Unwind_Reason_Code.CONTINUE_UNWIND;
 
   /*
     find landing pad and action table index belonging to ip by walking
@@ -377,6 +380,14 @@
 private void _d_getLanguageSpecificTables(_Unwind_Context_Ptr context, ref ubyte* callsite, ref ubyte* action, ref ClassInfo* ci)
 {
   ubyte* data = cast(ubyte*)_Unwind_GetLanguageSpecificData(context);
+  if (data is null)
+  {
+    //printf("language specific data was null\n");
+    callsite = null;
+    action = null;
+    ci = null;
+    return;
+  }
 
   //TODO: Do proper DWARF reading here
   if(*data++ != 0xff)
@@ -405,7 +416,7 @@
     if (e !is null)
     {
         _d_exception* exc_struct = new _d_exception;
-        exc_struct.unwind_info.exception_class[] = _d_exception_class;
+        exc_struct.unwind_info.exception_class = *cast(ulong*)_d_exception_class.ptr;
         exc_struct.exception_object = e;
         _Unwind_Reason_Code ret = _Unwind_RaiseException(&exc_struct.unwind_info);
         console("_Unwind_RaiseException failed with reason code: ")(ret)("\n");