Make it work!

Author: bjorn3

src/debuginfo/unwind.rs

@@ -150,30 +150,31 @@ impl UnwindContext {
                     next_action: None,
                 });
 
-                //println!("{:?}", context.compiled_code().unwrap().buffer.call_sites());
-                for &(ret_addr, tag, landingpad) in
-                    &context.compiled_code().unwrap().buffer.exception_handlers
-                {
-                    match call_site.id.map(|id| id.bits()) {
-                        None => gcc_except_table_data.call_sites.0.push(CallSite {
-                            start: u64::from(ret_addr - 1),
+                for call_site in context.compiled_code().unwrap().buffer.call_sites() {
+                    if call_site.exception_handlers.is_empty() {
+                        gcc_except_table_data.call_sites.0.push(CallSite {
+                            start: u64::from(call_site.ret_addr - 1),
                             length: 1,
                             landing_pad: 0,
                             action_entry: None,
-                        }),
-                        Some(0) => gcc_except_table_data.call_sites.0.push(CallSite {
-                            start: u64::from(ret_addr - 1),
-                            length: 1,
-                            landing_pad: u64::from(landingpad),
-                            action_entry: None,
-                        }),
-                        Some(1) => gcc_except_table_data.call_sites.0.push(CallSite {
-                            start: u64::from(ret_addr - 1),
-                            length: 1,
-                            landing_pad: u64::from(landingpad),
-                            action_entry: Some(catch_action),
-                        }),
-                        _ => unreachable!(),
+                        });
+                    }
+                    for &(tag, landingpad) in &call_site.exception_handlers {
+                        match tag.expand().unwrap().as_u32() {
+                            0 => gcc_except_table_data.call_sites.0.push(CallSite {
+                                start: u64::from(call_site.ret_addr - 1),
+                                length: 1,
+                                landing_pad: u64::from(landingpad),
+                                action_entry: None,
+                            }),
+                            1 => gcc_except_table_data.call_sites.0.push(CallSite {
+                                start: u64::from(call_site.ret_addr - 1),
+                                length: 1,
+                                landing_pad: u64::from(landingpad),
+                                action_entry: Some(catch_action),
+                            }),
+                            _ => unreachable!(),
+                        }
                     }
                 }
                 //println!("{gcc_except_table_data:?}");