[Guile-commits] 04/04: Fix bad backtraces

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 7e502d57e0ec121222abe6fd3e1bbb94067f6dfe
Author: Andy Wingo <address@hidden>
Date:   Fri Jun 10 15:30:40 2016 +0200

    Fix bad backtraces
    
    * libguile/vm-engine.c (BV_REF, BV_BOUNDED_SET, BV_SET, integer->char)
      (char->integer): Use VM_ASSERT so that we save the IP before erroring
      out.
---
 libguile/vm-engine.c |   31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 078e078..7658589 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -2976,9 +2976,9 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
                                                                        \
     VM_VALIDATE_BYTEVECTOR (bv, "bv-" #stem "-ref");                    \
                                                                        \
-    if (SCM_UNLIKELY (SCM_BYTEVECTOR_LENGTH (bv) < size)                \
-        || SCM_UNLIKELY (SCM_BYTEVECTOR_LENGTH (bv) - size < c_idx))    \
-      vm_error_out_of_range_uint64 ("bv-" #stem "-ref", c_idx);         \
+    VM_ASSERT (SCM_BYTEVECTOR_LENGTH (bv) >= size                       \
+               && SCM_BYTEVECTOR_LENGTH (bv) - size >= c_idx,           \
+               vm_error_out_of_range_uint64 ("bv-" #stem "-ref", c_idx)); \
                                                                         \
     memcpy (&result, SCM_BYTEVECTOR_CONTENTS (bv) + c_idx, size);       \
     SP_SET_ ## slot (dst, result);                                      \
@@ -3043,13 +3043,13 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
                                                                        \
     VM_VALIDATE_BYTEVECTOR (bv, "bv-" #stem "-set!");                   \
                                                                        \
-    if (SCM_UNLIKELY (SCM_BYTEVECTOR_LENGTH (bv) < size)                \
-        || SCM_UNLIKELY (SCM_BYTEVECTOR_LENGTH (bv) - size < c_idx))    \
-      vm_error_out_of_range_uint64 ("bv-" #stem "-set!", c_idx);        \
+    VM_ASSERT (SCM_BYTEVECTOR_LENGTH (bv) >= size                       \
+               && SCM_BYTEVECTOR_LENGTH (bv) - size >= c_idx,           \
+               vm_error_out_of_range_uint64 ("bv-" #stem "-set!", c_idx)); \
                                                                         \
-    if (SCM_UNLIKELY (slot_val < min) || SCM_UNLIKELY (slot_val > max)) \
-      vm_error_out_of_range_ ## slot_type ("bv-" #stem "-set!",         \
-                                           slot_val);                   \
+    VM_ASSERT (slot_val >= min && slot_val <= max,                      \
+               vm_error_out_of_range_ ## slot_type ("bv-" #stem "-set!", \
+                                                    slot_val));         \
                                                                         \
     val = slot_val;                                                     \
     memcpy (SCM_BYTEVECTOR_CONTENTS (bv) + c_idx, &val, size);          \
@@ -3069,9 +3069,9 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
                                                                        \
     VM_VALIDATE_BYTEVECTOR (bv, "bv-" #stem "-set!");                   \
                                                                        \
-    if (SCM_UNLIKELY (SCM_BYTEVECTOR_LENGTH (bv) < size)                \
-        || SCM_UNLIKELY (SCM_BYTEVECTOR_LENGTH (bv) - size < c_idx))    \
-      vm_error_out_of_range_uint64 ("bv-" #stem "-set!", c_idx);        \
+    VM_ASSERT (SCM_BYTEVECTOR_LENGTH (bv) >= size                       \
+               && SCM_BYTEVECTOR_LENGTH (bv) - size >= c_idx,           \
+               vm_error_out_of_range_uint64 ("bv-" #stem "-set!", c_idx)); \
                                                                         \
     memcpy (SCM_BYTEVECTOR_CONTENTS (bv) + c_idx, &val, size);          \
     NEXT (1);                                                           \
@@ -3746,8 +3746,8 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
       UNPACK_12_12 (op, dst, src);
       x = SP_REF_U64 (src);
 
-      if (SCM_UNLIKELY (x > (scm_t_uint64) SCM_CODEPOINT_MAX))
-        vm_error_out_of_range_uint64 ("integer->char", x);
+      VM_ASSERT (x <= (scm_t_uint64) SCM_CODEPOINT_MAX,
+                 vm_error_out_of_range_uint64 ("integer->char", x));
 
       SP_SET (dst, SCM_MAKE_ITAG8 ((scm_t_bits) (scm_t_wchar) x, 
scm_tc8_char));
 
@@ -3766,8 +3766,7 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
       UNPACK_12_12 (op, dst, src);
       x = SP_REF (src);
 
-      if (SCM_UNLIKELY (!SCM_CHARP (x)))
-        vm_error_not_a_char ("char->integer", x);
+      VM_ASSERT (SCM_CHARP (x), vm_error_not_a_char ("char->integer", x));
 
       SP_SET_U64 (dst, SCM_CHAR (x));