]> git.ipfire.org Git - thirdparty/valgrind.git/commitdiff
Fix initialization of inherited ATmpInfo in initAEnv().
authorIvo Raisr <ivosh@ivosh.net>
Fri, 29 Sep 2017 05:06:03 +0000 (07:06 +0200)
committerIvo Raisr <ivosh@ivosh.net>
Fri, 29 Sep 2017 05:06:03 +0000 (07:06 +0200)
VEX/priv/ir_opt.c

index 12cf16bd9600148731c1e7888e522be02825fcf0..6939776f403cd639f11cfe6e65795ed493da8ccd 100644 (file)
@@ -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;
+      }
    }
 }