Obtain expression from eh_frame

src/unwinder/frame.rs

@@ -1,5 +1,5 @@
 use gimli::{
-    BaseAddresses, CfaRule, Expression, Register, RegisterRule, UnwindContext, UnwindTableRow,
+    BaseAddresses, CfaRule, Register, RegisterRule, UnwindContext, UnwindExpression, UnwindTableRow,
 };
 #[cfg(feature = "dwarf-expr")]
 use gimli::{Evaluation, EvaluationResult, Location, Value};
@@ -79,8 +79,9 @@ impl Frame {
     fn evaluate_expression(
         &self,
         ctx: &Context,
-        expr: Expression<StaticSlice>,
+        expr: UnwindExpression<usize>,
     ) -> Result<usize, gimli::Error> {
+        let expr = expr.get(&self.fde_result.eh_frame).unwrap();
         let mut eval =
             Evaluation::<_, StoreOnStack>::new_in(expr.0, self.fde_result.fde.cie().encoding());
         let mut result = eval.evaluate()?;
@@ -120,7 +121,7 @@ impl Frame {
     fn evaluate_expression(
         &self,
         _ctx: &Context,
-        _expr: Expression<StaticSlice>,
+        _expr: UnwindExpression<usize>,
     ) -> Result<usize, gimli::Error> {
         Err(gimli::Error::UnsupportedEvaluation)
     }