From: Ivo Raisr <ivosh@ivosh.net>
Date: Fri, 29 Sep 2017 05:06:03 +0000 (+0200)
Subject: Fix initialization of inherited ATmpInfo in initAEnv().
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=669027de9c44ef79ad0086c2da726ae8dd95b632;p=thirdparty%2Fvalgrind.git

Fix initialization of inherited ATmpInfo in initAEnv().
---

diff --git a/VEX/priv/ir_opt.c b/VEX/priv/ir_opt.c
index 12cf16bd96..6939776f40 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;
+      }
    }
 }