[ignition] BytecodeGraphBuilder: Merge correct environment in try block

src/compiler/bytecode-graph-builder.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/bytecode-graph-builder.h"
 
 #include "src/ast/ast.h"
 #include "src/ast/scopes.h"
 #include "src/compilation-info.h"
 #include "src/compiler/bytecode-branch-analysis.h"
@@ skipping 888 matching lines @@
   for (uint32_t d = 0; d < depth; d++) {
     Node* extension_slot =
         NewNode(javascript()->LoadContext(d, Context::EXTENSION_INDEX, false),
                 environment()->Context());
 
     Node* check_no_extension =
         NewNode(javascript()->StrictEqual(CompareOperationHint::kAny),
                 extension_slot, jsgraph()->TheHoleConstant());
 
     NewBranch(check_no_extension);
-    Environment* false_environment = environment();
     Environment* true_environment = environment()->CopyForConditional();
 
     {
-      set_environment(false_environment);
       NewIfFalse();
       // If there is an extension, merge into the slow path.
       if (slow_environment == nullptr) {
-        slow_environment = false_environment;
+        slow_environment = environment();
         NewMerge();
       } else {
-        slow_environment->Merge(false_environment);
+        slow_environment->Merge(environment());
       }
     }
 
     {
       set_environment(true_environment);
       NewIfTrue();
       // Do nothing on if there is no extension, eventually falling through to
       // the fast path.
     }
   }
@@ skipping 18 matching lines @@
         jsgraph()->Constant(bytecode_iterator().GetConstantForIndexOperand(0));
 
     const Operator* op =
         javascript()->CallRuntime(typeof_mode == TypeofMode::NOT_INSIDE_TYPEOF
                                       ? Runtime::kLoadLookupSlot
                                       : Runtime::kLoadLookupSlotInsideTypeof);
     Node* value = NewNode(op, name);
     environment()->BindAccumulator(value, &states);
   }
 
-  fast_environment->Merge(slow_environment);
+  fast_environment->Merge(environment());
   set_environment(fast_environment);
 }
 
 void BytecodeGraphBuilder::VisitLdaLookupContextSlot() {
   BuildLdaLookupContextSlot(TypeofMode::NOT_INSIDE_TYPEOF);
 }
 
 void BytecodeGraphBuilder::VisitLdaLookupContextSlotInsideTypeof() {
   BuildLdaLookupContextSlot(TypeofMode::INSIDE_TYPEOF);
 }
@@ skipping 1221 matching lines @@
     // Phi does not exist yet, introduce one.
     value = NewPhi(inputs, value, control);
     value->ReplaceInput(inputs - 1, other);
   }
   return value;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8