[Interpreter] Ensure ToBoolean bytecodes are correctly emitted at the start of basic blocks

test/cctest/interpreter/test-interpreter.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.
 
 // TODO(rmcilroy): Remove this define after this flag is turned on globally
 #define V8_IMMINENT_DEPRECATION_WARNINGS
 
 #include "src/v8.h"
 
 #include "src/execution.h"
@@ skipping 1509 matching lines @@
 
 TEST(InterpreterUnaryNot) {
   HandleAndZoneScope handles;
   for (size_t i = 1; i < 10; i++) {
     bool expected_value = ((i & 1) == 1);
     BytecodeArrayBuilder builder(handles.main_isolate(), handles.main_zone());
     Register r0(0);
     builder.set_locals_count(0);
     builder.set_context_count(0);
     builder.set_parameter_count(0);
-    builder.EnterBlock();
     builder.LoadFalse();
     for (size_t j = 0; j < i; j++) {
       builder.LogicalNot();
     }
-    builder.LeaveBlock().Return();
+    builder.Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
     InterpreterTester tester(handles.main_isolate(), bytecode_array);
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->IsBoolean());
     CHECK_EQ(return_value->BooleanValue(), expected_value);
   }
 }
 
 
@@ skipping 38 matching lines @@
       std::make_pair(
           Handle<Object>::cast(factory->NewStringFromStaticChars("")), false),
   };
 
   for (size_t i = 0; i < arraysize(object_type_tuples); i++) {
     BytecodeArrayBuilder builder(handles.main_isolate(), handles.main_zone());
     Register r0(0);
     builder.set_locals_count(0);
     builder.set_context_count(0);
     builder.set_parameter_count(0);
-    builder.EnterBlock();
     LoadAny(&builder, factory, object_type_tuples[i].first);
     builder.CastAccumulatorToBoolean();
-    builder.LeaveBlock().Return();
+    builder.Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
     InterpreterTester tester(handles.main_isolate(), bytecode_array);
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->IsBoolean());
     CHECK_EQ(return_value->BooleanValue(), object_type_tuples[i].second);
   }
 }
 
 
@@ skipping 14 matching lines @@
       std::make_pair(
           Handle<Object>::cast(factory->NewStringFromStaticChars("")), true),
   };
 
   for (size_t i = 0; i < arraysize(object_type_tuples); i++) {
     BytecodeArrayBuilder builder(handles.main_isolate(), handles.main_zone());
     Register r0(0);
     builder.set_locals_count(0);
     builder.set_context_count(0);
     builder.set_parameter_count(0);
-    builder.EnterBlock();
     LoadAny(&builder, factory, object_type_tuples[i].first);
     builder.LogicalNot();
-    builder.LeaveBlock().Return();
+    builder.Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
     InterpreterTester tester(handles.main_isolate(), bytecode_array);
     auto callable = tester.GetCallable<>();
     Handle<Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->IsBoolean());
     CHECK_EQ(return_value->BooleanValue(), object_type_tuples[i].second);
   }
 }
 
 
@@ skipping 12 matching lines @@
           Handle<Object>::cast(factory->NewStringFromStaticChars("hello")),
           "string"),
   };
 
   for (size_t i = 0; i < arraysize(object_type_tuples); i++) {
     BytecodeArrayBuilder builder(handles.main_isolate(), handles.main_zone());
     Register r0(0);
     builder.set_locals_count(0);
     builder.set_context_count(0);
     builder.set_parameter_count(0);
-    builder.EnterBlock();
     LoadAny(&builder, factory, object_type_tuples[i].first);
     builder.TypeOf();
-    builder.LeaveBlock().Return();
+    builder.Return();
     Handle<BytecodeArray> bytecode_array = builder.ToBytecodeArray();
     InterpreterTester tester(handles.main_isolate(), bytecode_array);
     auto callable = tester.GetCallable<>();
     Handle<v8::internal::String> return_value =
         Handle<v8::internal::String>::cast(callable().ToHandleChecked());
     auto actual = return_value->ToCString();
     CHECK_EQ(strcmp(&actual[0], object_type_tuples[i].second), 0);
   }
 }
 
@@ skipping 1212 matching lines @@
     auto callable = tester.GetCallable<>();
 
     Handle<i::Object> return_value = callable().ToHandleChecked();
     CHECK(return_value->SameValue(*switch_ops[i].second));
   }
 }
 
 }  // namespace interpreter
 }  // namespace internal
 }  // namespace v8