[Valgrind-developers] [valgrind/jit-hacks-2] Fix initialization of inherited ATmpInfo in initAEnv().

[Ivo R. <ir...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=669027de9c44ef79ad0086c2da726ae8dd95b632

commit 669027de9c44ef79ad0086c2da726ae8dd95b632
Author: Ivo Raisr <iv...@iv...>
Date:   Fri Sep 29 07:06:03 2017 +0200

    Fix initialization of inherited ATmpInfo in initAEnv().

Diff:
---
 VEX/priv/ir_opt.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/VEX/priv/ir_opt.c b/VEX/priv/ir_opt.c
index 12cf16b..6939776 100644
--- a/VEX/priv/ir_opt.c
+++ b/VEX/priv/ir_opt.c
@@ -5289,8 +5289,15 @@ static void ppAEnv ( ATmpInfo* env )
 static void initAEnv(ATmpInfo env[], ATmpInfo parent[])
 {
    for (UInt i = 0; i < A_NENV; i++) {
-      env[i].bindee = (parent != NULL) ? parent[i].bindee : NULL;
-      env[i].binder = (parent != NULL) ? parent[i].binder : IRTemp_INVALID;
+      if (LIKELY(parent == NULL)) {
+         env[i].binder = IRTemp_INVALID;
+         env[i].bindee = NULL;
+      } else {
+         env[i].binder      = parent[i].binder;
+         env[i].bindee      = parent[i].bindee;
+         env[i].doesLoad    = parent[i].doesLoad;
+         env[i].getInterval = parent[i].getInterval;
+      }
    }
 }