commit bd11c713420335244771fe2d07e0cd897c0c74cb
author sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Tue May 13 15:54:14 2014 +0000
committer sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Tue May 13 15:54:14 2014 +0000
tree 3f58119e0a90af9aada2f85a41b10c97052f2277
parent f36d9afe49c7720f1bdc5b0a1a3120a020d559e8

Thumb encoding: fix assertion failure caused by
"ldr.w pc, [reg, #imm]".  Fixes #333428.  (dimitry@google.com)



git-svn-id: svn://svn.valgrind.org/vex/trunk@2860 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/guest_arm_toIR.c

diff --git a/priv/guest_arm_toIR.c b/priv/guest_arm_toIR.c
index c28642e..e72ef3d 100644
--- a/priv/guest_arm_toIR.c
+++ b/priv/guest_arm_toIR.c
@@ -20416,9 +20416,8 @@
                vassert(rT == 15);
                vassert(condT == IRTemp_INVALID); /* due to check above */
                llPutIReg(15, mkexpr(newRt));
-               irsb->next = mkexpr(newRt);
-               irsb->jumpkind = Ijk_Boring;  /* or _Ret ? */
-               dres.whatNext  = Dis_StopHere;
+               dres.jk_StopHere = Ijk_Boring;
+               dres.whatNext    = Dis_StopHere;
             }
          }