[Guile-commits] 292/437: AARCH64: Correct assertion test

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit b23322100c46bf33e341932fe08e5cda85d9b514
Author: pcpa <address@hidden>
Date:   Sun Aug 10 11:26:18 2014 -0300

    AARCH64: Correct assertion test
    
        * lib/jit_aarch64.c: Correct bad setup for assertion
        of consistency before a patch.
---
 ChangeLog         | 5 +++++
 lib/jit_aarch64.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 065fa8e..dd6698c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-08-10 Paulo Andrade <address@hidden>
 
+       * lib/jit_aarch64.c: Correct bad setup for assertion
+       of consistency before a patch.
+
+2014-08-10 Paulo Andrade <address@hidden>
+
        * lib/jit_mips-cpu.c: Correct typo in the jit_bmsr
        implementation that was using the wrong test result
        register.
diff --git a/lib/jit_aarch64.c b/lib/jit_aarch64.c
index b685021..ca522a5 100644
--- a/lib/jit_aarch64.c
+++ b/lib/jit_aarch64.c
@@ -1196,6 +1196,10 @@ _patch(jit_state_t *_jit, jit_word_t instr, jit_node_t 
*node)
     jit_int32_t                 flag;
 
     assert(node->flag & jit_flag_node);
+    if (node->code == jit_code_movi)
+       flag = node->v.n->flag;
+    else
+       flag = node->u.n->flag;
     assert(!(flag & jit_flag_patch));
     if (_jitc->patches.offset >= _jitc->patches.length) {
        jit_realloc((jit_pointer_t *)&_jitc->patches.ptr,