[Interpreter] Remove constant pool type in tests

For historical reasons, the interpreter's bytecode expectations tests
required a type for the constant pool. This had two disadvantages:

 1. Strings and numbers were not visible in mixed pools, and
 2. Mismatches of pool types (e.g. when rebaselining) would cause parser
    errors

This removes the pool types, making everything 'mixed', but appending
the values to string and number valued constants. Specifying a pool type
in the *.golden header now prints a warning (for backwards compatibility).

BUG=v8:5350

Review-Url: https://codereview.chromium.org/2310103002
Cr-Commit-Position: refs/heads/master@{#39216}

test/cctest/interpreter/bytecode-expectations-printer.cc

@@ -224,32 +224,21 @@ void BytecodeExpectationsPrinter::PrintV8String(std::ostream& stream,
 
 void BytecodeExpectationsPrinter::PrintConstant(
     std::ostream& stream, i::Handle<i::Object> constant) const {
-  switch (const_pool_type_) {
-    case ConstantPoolType::kString:
-      CHECK(constant->IsString());
+  if (constant->IsSmi()) {
+    stream << "Smi [";
+    i::Smi::cast(*constant)->SmiPrint(stream);
+    stream << "]";
+  } else {
+    stream << i::HeapObject::cast(*constant)->map()->instance_type();
+    if (constant->IsHeapNumber()) {
+      stream << " [";
+      i::HeapNumber::cast(*constant)->HeapNumberPrint(stream);
+      stream << "]";
+    } else if (constant->IsString()) {
+      stream << " [";
       PrintV8String(stream, i::String::cast(*constant));
-      break;
-    case ConstantPoolType::kNumber:
-      if (constant->IsSmi()) {
-        i::Smi::cast(*constant)->SmiPrint(stream);
-      } else if (constant->IsHeapNumber()) {
-        i::HeapNumber::cast(*constant)->HeapNumberPrint(stream);
-      } else {
-        UNREACHABLE();
-      }
-      break;
-    case ConstantPoolType::kMixed:
-      if (constant->IsSmi()) {
-        stream << "kInstanceTypeDontCare";
-      } else {
-        stream << "InstanceType::"
-               << i::HeapObject::cast(*constant)->map()->instance_type();
-      }
-      break;
-    case ConstantPoolType::kUnknown:
-    default:
-      UNREACHABLE();
-      return;
+      stream << "]";
+    }
   }
 }
 

test/cctest/interpreter/bytecode-expectations-printer.h

@@ -26,17 +26,8 @@ class BytecodeArrayIterator;
 
 class BytecodeExpectationsPrinter final {
  public:
-  enum class ConstantPoolType {
-    kUnknown,
-    kString,
-    kNumber,
-    kMixed,
-  };
-
-  BytecodeExpectationsPrinter(v8::Isolate* i,
-                              ConstantPoolType t = ConstantPoolType::kMixed)
+  explicit BytecodeExpectationsPrinter(v8::Isolate* i)
       : isolate_(i),
-        const_pool_type_(t),
         execute_(true),
         wrap_(true),
         top_level_(false),
@@ -45,11 +36,6 @@ class BytecodeExpectationsPrinter final {
   void PrintExpectation(std::ostream& stream,  // NOLINT
                         const std::string& snippet) const;
 
-  void set_constant_pool_type(ConstantPoolType const_pool_type) {
-    const_pool_type_ = const_pool_type;
-  }
-  ConstantPoolType const_pool_type() const { return const_pool_type_; }
-
   void set_execute(bool execute) { execute_ = execute; }
   bool execute() const { return execute_; }
 
@@ -110,7 +96,6 @@ class BytecodeExpectationsPrinter final {
   }
 
   v8::Isolate* isolate_;
-  ConstantPoolType const_pool_type_;
   bool execute_;
   bool wrap_;
   bool top_level_;

test/cctest/interpreter/bytecode_expectations/ArrayLiterals.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -20,7 +19,7 @@ bytecodes: [
   /*   51 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -50,7 +49,7 @@ bytecodes: [
   /*   66 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -68,7 +67,7 @@ bytecodes: [
   /*   62 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -110,9 +109,9 @@ bytecodes: [
   /*   77 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ArrayLiteralsWide.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -789,263 +788,263 @@ bytecodes: [
   /* 2619 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/AssignmentsInBinaryExpression.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/BasicBlockToBoolean.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/BasicLoops.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -726,9 +725,9 @@ bytecodes: [
   /*  137 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["z"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/BreakableBlocks.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -123,8 +122,8 @@ bytecodes: [
   /*  103 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -194,10 +193,10 @@ bytecodes: [
   /*  162 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["y"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/CallGlobal.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/CallLookupSlot.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -50,10 +49,10 @@ bytecodes: [
   /*   74 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["g"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["eval"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/CallNew.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/CallRuntime.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f
@@ -84,7 +83,7 @@ bytecodes: [
   /*   44 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ClassAndSuperClass.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: test
@@ -41,8 +40,8 @@ bytecodes: [
   /*  131 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SYMBOL_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SYMBOL_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["method"],
 ]
 handlers: [
 ]
@@ -85,8 +84,8 @@ bytecodes: [
   /*  159 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SYMBOL_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SYMBOL_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -141,8 +140,8 @@ bytecodes: [
   /*  141 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["this"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["y_"],
 ]
 handlers: [
 ]
@@ -195,8 +194,8 @@ bytecodes: [
   /*  139 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["this"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["y_"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ClassDeclarations.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -52,10 +51,10 @@ bytecodes: [
   /*  149 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["prototype"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["speak"],
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -105,10 +104,10 @@ bytecodes: [
   /*  149 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["prototype"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["speak"],
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -178,12 +177,12 @@ bytecodes: [
   /*  129 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["b"],
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["prototype"],
+  SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -231,9 +230,9 @@ bytecodes: [
   /*  103 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["prototype"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["C"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/CompoundExpressions.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -71,8 +70,8 @@ bytecodes: [
   /*   67 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]
@@ -98,7 +97,7 @@ bytecodes: [
   /*   63 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -124,7 +123,7 @@ bytecodes: [
   /*   84 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/Conditional.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/ConstVariable.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 
@@ -48,7 +47,7 @@ bytecodes: [
   /*   58 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -77,7 +76,7 @@ bytecodes: [
   /*   55 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -107,7 +106,7 @@ bytecodes: [
   /*   56 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ConstVariableContextSlot.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -28,7 +27,7 @@ bytecodes: [
   /*   74 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -58,8 +57,8 @@ bytecodes: [
   /*   84 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -92,8 +91,8 @@ bytecodes: [
   /*   80 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -127,8 +126,8 @@ bytecodes: [
   /*   82 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ContextParameters.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f
@@ -26,7 +25,7 @@ bytecodes: [
   /*   52 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -51,7 +50,7 @@ bytecodes: [
   /*   66 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -76,7 +75,7 @@ bytecodes: [
   /*   61 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -99,7 +98,7 @@ bytecodes: [
   /*   65 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ContextVariables.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -22,7 +21,7 @@ bytecodes: [
   /*   71 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -44,7 +43,7 @@ bytecodes: [
   /*   75 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -68,7 +67,7 @@ bytecodes: [
   /*   92 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -92,7 +91,7 @@ bytecodes: [
   /*   78 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -126,8 +125,8 @@ bytecodes: [
   /*  104 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/CountOperators.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -110,8 +109,8 @@ bytecodes: [
   /*   70 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -133,8 +132,8 @@ bytecodes: [
   /*   70 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -161,8 +160,8 @@ bytecodes: [
   /*   90 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["var"],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -187,8 +186,8 @@ bytecodes: [
   /*   90 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["var"],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -214,7 +213,7 @@ bytecodes: [
   /*   90 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -242,7 +241,7 @@ bytecodes: [
   /*   90 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -269,7 +268,7 @@ bytecodes: [
   /*   84 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/CreateArguments.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/CreateRestParameter.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/DeadCodeRemoval.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/DeclareGlobals.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: no
 wrap: no
 top level: yes
@@ -34,8 +33,8 @@ bytecodes: [
   /*   10 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -59,7 +58,7 @@ bytecodes: [
   /*   15 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -93,8 +92,8 @@ bytecodes: [
   /*   15 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -122,7 +121,7 @@ bytecodes: [
   /*   20 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/Delete.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -23,8 +22,8 @@ bytecodes: [
   /*   75 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -45,8 +44,8 @@ bytecodes: [
   /*   89 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -67,7 +66,7 @@ bytecodes: [
   /*   76 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -115,8 +114,8 @@ bytecodes: [
   /*  113 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/DeleteLookupSlotInEval.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -31,7 +30,7 @@ bytecodes: [
   /*   25 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -82,7 +81,7 @@ bytecodes: [
   /*   32 S> */ B(Return),
 ]
 constant pool: [
-  "z",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["z"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/DoDebugger.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/DoExpression.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 do expressions: yes

test/cctest/interpreter/bytecode_expectations/Eval.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 
@@ -44,8 +43,8 @@ bytecodes: [
   /*   53 S> */ B(Return),
 ]
 constant pool: [
-  "eval",
-  "1;",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["eval"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["1;"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ForIn.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -92,7 +91,7 @@ bytecodes: [
   /*   85 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["potatoes"],
 ]
 handlers: [
 ]
@@ -134,7 +133,7 @@ bytecodes: [
   /*   80 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -187,9 +186,9 @@ bytecodes: [
   /*  152 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -233,8 +232,8 @@ bytecodes: [
   /*   98 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ForOf.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -126,17 +125,17 @@ bytecodes: [
   /*   62 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SYMBOL_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  SYMBOL_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["value"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [".catch"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["return"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["function"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [7, 116, 122],
@@ -270,17 +269,17 @@ bytecodes: [
   /*   85 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SYMBOL_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["potatoes"],
+  SYMBOL_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["value"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [".catch"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["return"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["function"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [11, 117, 123],
@@ -418,17 +417,17 @@ bytecodes: [
   /*  113 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SYMBOL_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  SYMBOL_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["value"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [".catch"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["return"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["function"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [7, 134, 140],
@@ -565,19 +564,19 @@ bytecodes: [
   /*  105 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SYMBOL_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  SYMBOL_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["value"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [".catch"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["return"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["function"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [15, 130, 136],

test/cctest/interpreter/bytecode_expectations/FunctionLiterals.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -20,7 +19,7 @@ bytecodes: [
   /*   55 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -41,7 +40,7 @@ bytecodes: [
   /*   59 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -64,7 +63,7 @@ bytecodes: [
   /*   71 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/Generators.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f
@@ -255,7 +254,7 @@ bytecodes: [
   /*   25 S> */ B(Return),
 ]
 constant pool: [
-  kInstanceTypeDontCare,
+  Smi [136],
 ]
 handlers: [
   [47, 228, 234],
@@ -576,26 +575,26 @@ bytecodes: [
   /*   44 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SYMBOL_TYPE,
-  kInstanceTypeDontCare,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  kInstanceTypeDontCare,
-  kInstanceTypeDontCare,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  kInstanceTypeDontCare,
-  kInstanceTypeDontCare,
-  kInstanceTypeDontCare,
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  SYMBOL_TYPE,
+  Smi [151],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["next"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["done"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["value"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
+  Smi [132],
+  Smi [156],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [".catch"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["return"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["function"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
+  FIXED_ARRAY_TYPE,
+  Smi [153],
+  Smi [143],
+  Smi [566],
 ]
 handlers: [
   [47, 679, 685],

test/cctest/interpreter/bytecode_expectations/GlobalCompoundExpressions.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -25,7 +24,7 @@ bytecodes: [
   /*   51 S> */ B(Return),
 ]
 constant pool: [
-  "global",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["global"],
 ]
 handlers: [
 ]
@@ -47,7 +46,7 @@ bytecodes: [
   /*   57 S> */ B(Return),
 ]
 constant pool: [
-  "unallocated",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["unallocated"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/GlobalCountOperators.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -25,7 +24,7 @@ bytecodes: [
   /*   48 S> */ B(Return),
 ]
 constant pool: [
-  "global",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["global"],
 ]
 handlers: [
 ]
@@ -49,7 +48,7 @@ bytecodes: [
   /*   48 S> */ B(Return),
 ]
 constant pool: [
-  "global",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["global"],
 ]
 handlers: [
 ]
@@ -71,7 +70,7 @@ bytecodes: [
   /*   68 S> */ B(Return),
 ]
 constant pool: [
-  "unallocated",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["unallocated"],
 ]
 handlers: [
 ]
@@ -95,7 +94,7 @@ bytecodes: [
   /*   54 S> */ B(Return),
 ]
 constant pool: [
-  "unallocated",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["unallocated"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/GlobalDelete.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f
@@ -27,7 +26,7 @@ bytecodes: [
   /*   58 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -76,7 +75,7 @@ bytecodes: [
   /*   56 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -101,7 +100,7 @@ bytecodes: [
   /*   42 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["b"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/HeapNumberConstants.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 
@@ -20,7 +19,7 @@ bytecodes: [
   /*   46 S> */ B(Return),
 ]
 constant pool: [
-  1.2,
+  HEAP_NUMBER_TYPE [1.2],
 ]
 handlers: [
 ]
@@ -40,8 +39,8 @@ bytecodes: [
   /*   59 S> */ B(Return),
 ]
 constant pool: [
-  1.2,
-  2.6,
+  HEAP_NUMBER_TYPE [1.2],
+  HEAP_NUMBER_TYPE [2.6],
 ]
 handlers: [
 ]
@@ -61,8 +60,8 @@ bytecodes: [
   /*   61 S> */ B(Return),
 ]
 constant pool: [
-  3.14,
-  3.14,
+  HEAP_NUMBER_TYPE [3.14],
+  HEAP_NUMBER_TYPE [3.14],
 ]
 handlers: [
 ]
@@ -850,263 +849,263 @@ bytecodes: [
   /* 2867 S> */ B(Return),
 ]
 constant pool: [
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  1.414,
-  3.14,
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [1.414],
+  HEAP_NUMBER_TYPE [3.14],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/IfConditions.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f
@@ -406,8 +405,8 @@ bytecodes: [
   /* 1117 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::HEAP_NUMBER_TYPE,
-  kInstanceTypeDontCare,
+  HEAP_NUMBER_TYPE [0.01],
+  Smi [391],
 ]
 handlers: [
 ]
@@ -632,7 +631,7 @@ bytecodes: [
   /* 1112 S> */ B(Return),
 ]
 constant pool: [
-  kInstanceTypeDontCare,
+  Smi [391],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/IntegerConstants.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/JumpsRequiringConstantWideOperands.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 
@@ -978,318 +977,318 @@ bytecodes: [
   /* 4177 S> */ B(Return),
 ]
 constant pool: [
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.1,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.2,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.3,
-  0.4,
-  0.4,
-  0.4,
-  0.4,
-  0.4,
-  0.4,
-  0.4,
-  0.4,
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.1],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.2],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.3],
+  HEAP_NUMBER_TYPE [0.4],
+  HEAP_NUMBER_TYPE [0.4],
+  HEAP_NUMBER_TYPE [0.4],
+  HEAP_NUMBER_TYPE [0.4],
+  HEAP_NUMBER_TYPE [0.4],
+  HEAP_NUMBER_TYPE [0.4],
+  HEAP_NUMBER_TYPE [0.4],
+  HEAP_NUMBER_TYPE [0.4],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/LetVariable.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 
@@ -48,7 +47,7 @@ bytecodes: [
   /*   56 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -76,7 +75,7 @@ bytecodes: [
   /*   52 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -106,7 +105,7 @@ bytecodes: [
   /*   54 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/LetVariableContextSlot.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -28,7 +27,7 @@ bytecodes: [
   /*   72 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -58,8 +57,8 @@ bytecodes: [
   /*   82 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -93,8 +92,8 @@ bytecodes: [
   /*   78 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -129,8 +128,8 @@ bytecodes: [
   /*   80 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/LoadGlobal.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -466,7 +465,7 @@ bytecodes: [
   /* 1315 S> */ B(Return),
 ]
 constant pool: [
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/LogicalExpressions.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 
@@ -319,7 +318,7 @@ bytecodes: [
   /*  624 S> */ B(Return),
 ]
 constant pool: [
-  260,
+  Smi [260],
 ]
 handlers: [
 ]
@@ -505,7 +504,7 @@ bytecodes: [
   /*  624 S> */ B(Return),
 ]
 constant pool: [
-  260,
+  Smi [260],
 ]
 handlers: [
 ]
@@ -692,7 +691,7 @@ bytecodes: [
   /*  630 S> */ B(Return),
 ]
 constant pool: [
-  260,
+  Smi [260],
 ]
 handlers: [
 ]
@@ -879,7 +878,7 @@ bytecodes: [
   /*  630 S> */ B(Return),
 ]
 constant pool: [
-  260,
+  Smi [260],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/LookupSlot.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 
@@ -45,9 +44,9 @@ bytecodes: [
   /*   65 S> */ B(Return),
 ]
 constant pool: [
-  "eval",
-  "var x = 10;",
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["eval"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["var x = 10;"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -91,9 +90,9 @@ bytecodes: [
   /*   72 S> */ B(Return),
 ]
 constant pool: [
-  "eval",
-  "var x = 10;",
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["eval"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["var x = 10;"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -137,9 +136,9 @@ bytecodes: [
   /*   59 S> */ B(Return),
 ]
 constant pool: [
-  "x",
-  "eval",
-  "",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["eval"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE [""],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/LookupSlotInEval.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -26,7 +25,7 @@ bytecodes: [
   /*   25 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -51,7 +50,7 @@ bytecodes: [
   /*   23 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -76,7 +75,7 @@ bytecodes: [
   /*   37 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]
@@ -100,7 +99,7 @@ bytecodes: [
   /*   32 S> */ B(Return),
 ]
 constant pool: [
-  "x",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/NewTarget.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/ObjectLiterals.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -21,7 +20,7 @@ bytecodes: [
   /*   46 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -40,7 +39,7 @@ bytecodes: [
   /*   71 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -62,8 +61,8 @@ bytecodes: [
   /*   80 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -86,8 +85,8 @@ bytecodes: [
   /*   76 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -108,9 +107,9 @@ bytecodes: [
   /*   67 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["func"],
 ]
 handlers: [
 ]
@@ -131,9 +130,9 @@ bytecodes: [
   /*   68 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["func"],
 ]
 handlers: [
 ]
@@ -162,9 +161,9 @@ bytecodes: [
   /*   68 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -193,10 +192,10 @@ bytecodes: [
   /*  102 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
+  SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -225,9 +224,9 @@ bytecodes: [
   /*   74 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["b"],
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]
@@ -255,7 +254,7 @@ bytecodes: [
   /*   62 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -278,7 +277,7 @@ bytecodes: [
   /*   62 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -308,8 +307,8 @@ bytecodes: [
   /*   69 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["test"],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -340,9 +339,9 @@ bytecodes: [
   /*   77 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["test"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -376,8 +375,8 @@ bytecodes: [
   /*   84 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["test"],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]
@@ -423,12 +422,12 @@ bytecodes: [
   /*   99 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
+  SHARED_FUNCTION_INFO_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ObjectLiteralsWide.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -790,263 +789,263 @@ bytecodes: [
   /* 2638 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/OuterContextVariables.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/Parameters.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/PrimitiveExpressions.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/PrimitiveReturnStatements.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/PropertyCall.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -24,7 +23,7 @@ bytecodes: [
   /*   33 S> */ B(Return),
 ]
 constant pool: [
-  "func",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["func"],
 ]
 handlers: [
 ]
@@ -49,7 +48,7 @@ bytecodes: [
   /*   43 S> */ B(Return),
 ]
 constant pool: [
-  "func",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["func"],
 ]
 handlers: [
 ]
@@ -75,7 +74,7 @@ bytecodes: [
   /*   44 S> */ B(Return),
 ]
 constant pool: [
-  "func",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["func"],
 ]
 handlers: [
 ]
@@ -481,7 +480,7 @@ bytecodes: [
   /* 1186 S> */ B(Return),
 ]
 constant pool: [
-  "func",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["func"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/PropertyLoads.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -23,7 +22,7 @@ bytecodes: [
   /*   31 S> */ B(Return),
 ]
 constant pool: [
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]
@@ -43,7 +42,7 @@ bytecodes: [
   /*   33 S> */ B(Return),
 ]
 constant pool: [
-  "key",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["key"],
 ]
 handlers: [
 ]
@@ -104,7 +103,7 @@ bytecodes: [
   /*   48 S> */ B(Return),
 ]
 constant pool: [
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]
@@ -639,7 +638,7 @@ bytecodes: [
   /* 1834 S> */ B(Return),
 ]
 constant pool: [
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/PropertyStores.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -24,8 +23,8 @@ bytecodes: [
   /*   32 S> */ B(Return),
 ]
 constant pool: [
-  "val",
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]
@@ -46,8 +45,8 @@ bytecodes: [
   /*   34 S> */ B(Return),
 ]
 constant pool: [
-  "val",
-  "key",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["key"],
 ]
 handlers: [
 ]
@@ -70,7 +69,7 @@ bytecodes: [
   /*   32 S> */ B(Return),
 ]
 constant pool: [
-  "val",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -91,7 +90,7 @@ bytecodes: [
   /*   33 S> */ B(Return),
 ]
 constant pool: [
-  "val",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -113,7 +112,7 @@ bytecodes: [
   /*   34 S> */ B(Return),
 ]
 constant pool: [
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]
@@ -134,8 +133,8 @@ bytecodes: [
   /*   46 S> */ B(Return),
 ]
 constant pool: [
-  "val",
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]
@@ -156,7 +155,7 @@ bytecodes: [
   /*   47 S> */ B(Return),
 ]
 constant pool: [
-  "val",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["val"],
 ]
 handlers: [
 ]
@@ -563,7 +562,7 @@ bytecodes: [
   /* 1822 S> */ B(Return),
 ]
 constant pool: [
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]
@@ -971,7 +970,7 @@ bytecodes: [
   /* 1837 S> */ B(Return),
 ]
 constant pool: [
-  "name",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/RegExpLiterals.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 
@@ -20,7 +19,7 @@ bytecodes: [
   /*   49 S> */ B(Return),
 ]
 constant pool: [
-  "ab+d",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["ab+d"],
 ]
 handlers: [
 ]
@@ -38,7 +37,7 @@ bytecodes: [
   /*   58 S> */ B(Return),
 ]
 constant pool: [
-  "(\u005cw+)\u005cs(\u005cw+)",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["(\u005cw+)\u005cs(\u005cw+)"],
 ]
 handlers: [
 ]
@@ -61,9 +60,9 @@ bytecodes: [
   /*   62 S> */ B(Return),
 ]
 constant pool: [
-  "ab+d",
-  "exec",
-  "abdd",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["ab+d"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["exec"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["abdd"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/RegExpLiteralsWide.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -789,263 +788,263 @@ bytecodes: [
   /* 2616 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::HEAP_NUMBER_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  HEAP_NUMBER_TYPE [1.23],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["ab+d"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/RemoveRedundantLdar.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/StoreGlobal.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f
@@ -25,7 +24,7 @@ bytecodes: [
   /*   33 S> */ B(Return),
 ]
 constant pool: [
-  "a",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -46,7 +45,7 @@ bytecodes: [
   /*   39 S> */ B(Return),
 ]
 constant pool: [
-  "a",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -68,7 +67,7 @@ bytecodes: [
   /*   47 S> */ B(Return),
 ]
 constant pool: [
-  "a",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -90,7 +89,7 @@ bytecodes: [
   /*   29 S> */ B(Return),
 ]
 constant pool: [
-  "a",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -498,8 +497,8 @@ bytecodes: [
   /* 1312 S> */ B(Return),
 ]
 constant pool: [
-  "name",
-  "a",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]
@@ -908,8 +907,8 @@ bytecodes: [
   /* 1328 S> */ B(Return),
 ]
 constant pool: [
-  "name",
-  "a",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["name"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/StringConstants.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 
@@ -20,7 +19,7 @@ bytecodes: [
   /*   61 S> */ B(Return),
 ]
 constant pool: [
-  "This is a string",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["This is a string"],
 ]
 handlers: [
 ]
@@ -40,8 +39,8 @@ bytecodes: [
   /*   82 S> */ B(Return),
 ]
 constant pool: [
-  "First string",
-  "Second string",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["First string"],
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["Second string"],
 ]
 handlers: [
 ]
@@ -61,7 +60,7 @@ bytecodes: [
   /*   79 S> */ B(Return),
 ]
 constant pool: [
-  "Same string",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["Same string"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/Switch.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 
@@ -461,8 +460,8 @@ bytecodes: [
   /*  680 S> */ B(Return),
 ]
 constant pool: [
-  262,
-  266,
+  Smi [262],
+  Smi [266],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/ThisFunction.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/Throw.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: yes
 
@@ -37,7 +36,7 @@ bytecodes: [
   /*   34 E> */ B(Throw),
 ]
 constant pool: [
-  "Error",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["Error"],
 ]
 handlers: [
 ]
@@ -60,7 +59,7 @@ bytecodes: [
   /*   72 S> */ B(Return),
 ]
 constant pool: [
-  "Error",
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["Error"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/TopLevelObjectLiterals.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: no
 wrap: no
 top level: yes
@@ -36,11 +35,11 @@ bytecodes: [
   /*   33 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::SHARED_FUNCTION_INFO_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["a"],
+  FIXED_ARRAY_TYPE,
+  SHARED_FUNCTION_INFO_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["func"],
 ]
 handlers: [
 ]

test/cctest/interpreter/bytecode_expectations/TryCatch.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -34,8 +33,8 @@ bytecodes: [
   /*   75 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["e"],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [4, 7, 9],
@@ -82,10 +81,10 @@ bytecodes: [
   /*  103 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["e1"],
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["e2"],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [4, 8, 10],

test/cctest/interpreter/bytecode_expectations/TryFinally.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -96,8 +95,8 @@ bytecodes: [
   /*   99 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["e"],
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [8, 42, 48],
@@ -163,9 +162,9 @@ bytecodes: [
   /*  123 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["e"],
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
 ]
 handlers: [
   [4, 68, 74],

test/cctest/interpreter/bytecode_expectations/Typeof.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: string
 execute: yes
 wrap: no
 test function name: f

test/cctest/interpreter/bytecode_expectations/UnaryOperators.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/WideRegisters.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: number
 execute: yes
 wrap: yes
 

test/cctest/interpreter/bytecode_expectations/WithStatement.golden

@@ -3,7 +3,6 @@
 #
 
 ---
-pool type: mixed
 execute: yes
 wrap: yes
 
@@ -27,9 +26,9 @@ bytecodes: [
   /*   62 S> */ B(Return),
 ]
 constant pool: [
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::FIXED_ARRAY_TYPE,
-  InstanceType::ONE_BYTE_INTERNALIZED_STRING_TYPE,
+  FIXED_ARRAY_TYPE,
+  FIXED_ARRAY_TYPE,
+  ONE_BYTE_INTERNALIZED_STRING_TYPE ["x"],
 ]
 handlers: [
 ]

test/cctest/interpreter/generate-bytecode-expectations.cc

@@ -43,9 +43,7 @@ class ProgramOptions final {
         execute_(true),
         top_level_(false),
         do_expressions_(false),
-        verbose_(false),
-        const_pool_type_(
-            BytecodeExpectationsPrinter::ConstantPoolType::kMixed) {}
+        verbose_(false) {}
 
   bool Validate() const;
   void UpdateFromHeader(std::istream& stream);   // NOLINT
@@ -65,9 +63,6 @@ class ProgramOptions final {
   bool do_expressions() const { return do_expressions_; }
   bool verbose() const { return verbose_; }
   bool suppress_runtime_errors() const { return rebaseline_ && !verbose_; }
-  BytecodeExpectationsPrinter::ConstantPoolType const_pool_type() const {
-    return const_pool_type_;
-  }
   std::vector<std::string> input_filenames() const { return input_filenames_; }
   std::string output_filename() const { return output_filename_; }
   std::string test_function_name() const { return test_function_name_; }
@@ -83,7 +78,6 @@ class ProgramOptions final {
   bool top_level_;
   bool do_expressions_;
   bool verbose_;
-  BytecodeExpectationsPrinter::ConstantPoolType const_pool_type_;
   std::vector<std::string> input_filenames_;
   std::string output_filename_;
   std::string test_function_name_;
@@ -105,33 +99,6 @@ class V8InitializationScope final {
   DISALLOW_COPY_AND_ASSIGN(V8InitializationScope);
 };
 
-BytecodeExpectationsPrinter::ConstantPoolType ParseConstantPoolType(
-    const char* type_string) {
-  if (strcmp(type_string, "number") == 0) {
-    return BytecodeExpectationsPrinter::ConstantPoolType::kNumber;
-  } else if (strcmp(type_string, "string") == 0) {
-    return BytecodeExpectationsPrinter::ConstantPoolType::kString;
-  } else if (strcmp(type_string, "mixed") == 0) {
-    return BytecodeExpectationsPrinter::ConstantPoolType::kMixed;
-  }
-  return BytecodeExpectationsPrinter::ConstantPoolType::kUnknown;
-}
-
-const char* ConstantPoolTypeToString(
-    BytecodeExpectationsPrinter::ConstantPoolType type) {
-  switch (type) {
-    case BytecodeExpectationsPrinter::ConstantPoolType::kNumber:
-      return "number";
-    case BytecodeExpectationsPrinter::ConstantPoolType::kMixed:
-      return "mixed";
-    case BytecodeExpectationsPrinter::ConstantPoolType::kString:
-      return "string";
-    default:
-      UNREACHABLE();
-      return nullptr;
-  }
-}
-
 bool ParseBoolean(const char* string) {
   if (strcmp(string, "yes") == 0) {
     return true;
@@ -187,8 +154,6 @@ ProgramOptions ProgramOptions::FromCommandLine(int argc, char** argv) {
       options.print_help_ = true;
     } else if (strcmp(argv[i], "--raw-js") == 0) {
       options.read_raw_js_snippet_ = true;
-    } else if (strncmp(argv[i], "--pool-type=", 12) == 0) {
-      options.const_pool_type_ = ParseConstantPoolType(argv[i] + 12);
     } else if (strcmp(argv[i], "--stdin") == 0) {
       options.read_from_stdin_ = true;
     } else if (strcmp(argv[i], "--rebaseline") == 0) {
@@ -238,12 +203,6 @@ bool ProgramOptions::Validate() const {
   if (parsing_failed_) return false;
   if (print_help_) return true;
 
-  if (const_pool_type_ ==
-      BytecodeExpectationsPrinter::ConstantPoolType::kUnknown) {
-    REPORT_ERROR("Unknown constant pool type.");
-    return false;
-  }
-
   if (!read_from_stdin_ && input_filenames_.empty()) {
     REPORT_ERROR("No input file specified.");
     return false;
@@ -293,9 +252,7 @@ void ProgramOptions::UpdateFromHeader(std::istream& stream) {
   }
 
   while (std::getline(stream, line)) {
-    if (line.compare(0, 11, "pool type: ") == 0) {
-      const_pool_type_ = ParseConstantPoolType(line.c_str() + 11);
-    } else if (line.compare(0, 9, "execute: ") == 0) {
+    if (line.compare(0, 9, "execute: ") == 0) {
       execute_ = ParseBoolean(line.c_str() + 9);
     } else if (line.compare(0, 6, "wrap: ") == 0) {
       wrap_ = ParseBoolean(line.c_str() + 6);
@@ -318,8 +275,6 @@ void ProgramOptions::UpdateFromHeader(std::istream& stream) {
 
 void ProgramOptions::PrintHeader(std::ostream& stream) const {  // NOLINT
   stream << "---"
-            "\npool type: "
-         << ConstantPoolTypeToString(const_pool_type_)
          << "\nexecute: " << BooleanToString(execute_)
          << "\nwrap: " << BooleanToString(wrap_);
 
@@ -424,8 +379,7 @@ void GenerateExpectationsFile(std::ostream& stream,  // NOLINT
   v8::Local<v8::Context> context = v8::Context::New(platform.isolate());
   v8::Context::Scope context_scope(context);
 
-  BytecodeExpectationsPrinter printer(platform.isolate(),
-                                      options.const_pool_type());
+  BytecodeExpectationsPrinter printer(platform.isolate());
   printer.set_wrap(options.wrap());
   printer.set_execute(options.execute());
   printer.set_top_level(options.top_level());

test/cctest/interpreter/test-bytecode-generator.cc

@@ -151,12 +151,9 @@ bool CompareTexts(const std::string& generated, const std::string& expected) {
   } while (true);
 }
 
-using ConstantPoolType = BytecodeExpectationsPrinter::ConstantPoolType;
-
 TEST(PrimitiveReturnStatements) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "",
 
@@ -187,8 +184,7 @@ TEST(PrimitiveReturnStatements) {
 
 TEST(PrimitiveExpressions) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var x = 0; return x;\n",
 
@@ -223,8 +219,7 @@ TEST(PrimitiveExpressions) {
 
 TEST(LogicalExpressions) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var x = 0; return x || 3;\n",
 
@@ -267,8 +262,7 @@ TEST(LogicalExpressions) {
 
 TEST(Parameters) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -294,8 +288,7 @@ TEST(Parameters) {
 
 TEST(IntegerConstants) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "return 12345678;\n",
 
@@ -310,8 +303,7 @@ TEST(IntegerConstants) {
 
 TEST(HeapNumberConstants) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "return 1.2;\n",
 
@@ -330,8 +322,7 @@ TEST(HeapNumberConstants) {
 
 TEST(StringConstants) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "return \"This is a string\";\n",
 
@@ -346,8 +337,7 @@ TEST(StringConstants) {
 
 TEST(PropertyLoads) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -390,8 +380,7 @@ TEST(PropertyLoads) {
 
 TEST(PropertyStores) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -456,8 +445,7 @@ TEST(PropertyStores) {
 
 TEST(PropertyCall) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -484,8 +472,7 @@ TEST(PropertyCall) {
 
 TEST(LoadGlobal) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -517,8 +504,7 @@ TEST(LoadGlobal) {
 
 TEST(StoreGlobal) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -562,8 +548,7 @@ TEST(StoreGlobal) {
 
 TEST(CallGlobal) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -583,8 +568,7 @@ TEST(CallGlobal) {
 
 TEST(CallRuntime) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -608,8 +592,7 @@ TEST(CallRuntime) {
 
 TEST(IfConditions) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -723,8 +706,7 @@ TEST(IfConditions) {
 
 TEST(DeclareGlobals) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
   printer.set_execute(false);
@@ -748,8 +730,7 @@ TEST(DeclareGlobals) {
 
 TEST(BreakableBlocks) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "var x = 0;\n"
@@ -795,8 +776,7 @@ TEST(BreakableBlocks) {
 
 TEST(BasicLoops) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var x = 0;\n"
       "while (false) { x = 99; break; continue; }\n"
@@ -949,8 +929,7 @@ TEST(BasicLoops) {
 
 TEST(JumpsRequiringConstantWideOperands) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
     REPEAT_256("var x = 0.1;\n")
     REPEAT_32("var x = 0.2;\n")
@@ -969,8 +948,7 @@ TEST(JumpsRequiringConstantWideOperands) {
 
 TEST(UnaryOperators) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var x = 0;\n"
       "while (x != 10) {\n"
@@ -1007,8 +985,7 @@ TEST(UnaryOperators) {
 
 TEST(Typeof) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1030,8 +1007,7 @@ TEST(Typeof) {
 
 TEST(Delete) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "var a = {x:13, y:14}; return delete a.x;\n",
@@ -1056,8 +1032,7 @@ TEST(Delete) {
 
 TEST(GlobalDelete) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1094,8 +1069,7 @@ TEST(GlobalDelete) {
 
 TEST(FunctionLiterals) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "return function(){ }\n",
@@ -1111,8 +1085,7 @@ TEST(FunctionLiterals) {
 
 TEST(RegExpLiterals) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "return /ab+d/;\n",
@@ -1128,8 +1101,7 @@ TEST(RegExpLiterals) {
 
 TEST(RegExpLiteralsWide) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "var a;"                   //
@@ -1143,8 +1115,7 @@ TEST(RegExpLiteralsWide) {
 
 TEST(ArrayLiterals) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "return [ 1, 2 ];\n",
@@ -1162,8 +1133,7 @@ TEST(ArrayLiterals) {
 
 TEST(ArrayLiteralsWide) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "var a;"                   //
@@ -1177,8 +1147,7 @@ TEST(ArrayLiteralsWide) {
 
 TEST(ObjectLiterals) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "return { };\n",
@@ -1218,8 +1187,7 @@ TEST(ObjectLiterals) {
 
 TEST(ObjectLiteralsWide) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var a;"                   //
       REPEAT_256("\na = 1.23;")  //
@@ -1232,8 +1200,7 @@ TEST(ObjectLiteralsWide) {
 
 TEST(TopLevelObjectLiterals) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
   printer.set_execute(false);
@@ -1249,8 +1216,7 @@ TEST(TopLevelObjectLiterals) {
 
 TEST(TryCatch) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "try { return 1; } catch(e) { return 2; }\n",
@@ -1266,8 +1232,7 @@ TEST(TryCatch) {
 
 TEST(TryFinally) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var a = 1;\n"
       "try { a = 2; } finally { a = 3; }\n",
@@ -1286,8 +1251,7 @@ TEST(TryFinally) {
 
 TEST(Throw) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "throw 1;\n",
 
@@ -1302,8 +1266,7 @@ TEST(Throw) {
 
 TEST(CallNew) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1337,8 +1300,7 @@ TEST(ContextVariables) {
   STATIC_ASSERT(Context::MIN_CONTEXT_SLOTS + 3 + 249 == 256);
 
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
     "var a; return function() { a = 1; };\n",
 
@@ -1365,8 +1327,7 @@ TEST(ContextVariables) {
 
 TEST(ContextParameters) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1386,8 +1347,7 @@ TEST(ContextParameters) {
 
 TEST(OuterContextVariables) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1417,8 +1377,7 @@ TEST(OuterContextVariables) {
 
 TEST(CountOperators) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var a = 1; return ++a;\n",
 
@@ -1449,8 +1408,7 @@ TEST(CountOperators) {
 
 TEST(GlobalCountOperators) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1478,8 +1436,7 @@ TEST(GlobalCountOperators) {
 
 TEST(CompoundExpressions) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var a = 1; a += 2;\n",
 
@@ -1498,8 +1455,7 @@ TEST(CompoundExpressions) {
 
 TEST(GlobalCompoundExpressions) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1519,8 +1475,7 @@ TEST(GlobalCompoundExpressions) {
 
 TEST(CreateArguments) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1544,8 +1499,7 @@ TEST(CreateArguments) {
 
 TEST(CreateRestParameter) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1565,8 +1519,7 @@ TEST(CreateRestParameter) {
 
 TEST(ForIn) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "for (var p in null) {}\n",
 
@@ -1596,8 +1549,7 @@ TEST(ForIn) {
 
 TEST(ForOf) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "for (var p of [0, 1, 2]) {}\n",
 
@@ -1619,8 +1571,7 @@ TEST(ForOf) {
 
 TEST(Conditional) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "return 1 ? 2 : 3;\n",
 
@@ -1638,8 +1589,7 @@ TEST(Conditional) {
 
 TEST(Switch) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
     "var a = 1;\n"
     "switch(a) {\n"
@@ -1706,8 +1656,7 @@ TEST(Switch) {
 
 TEST(BasicBlockToBoolean) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var a = 1; if (a || a < 0) { return 1; }\n",
 
@@ -1722,8 +1671,7 @@ TEST(BasicBlockToBoolean) {
 
 TEST(DeadCodeRemoval) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "return; var a = 1; a();\n",
 
@@ -1740,8 +1688,7 @@ TEST(DeadCodeRemoval) {
 
 TEST(ThisFunction) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1759,8 +1706,7 @@ TEST(ThisFunction) {
 
 TEST(NewTarget) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "return new.target;\n",
@@ -1774,8 +1720,7 @@ TEST(NewTarget) {
 
 TEST(RemoveRedundantLdar) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var ld_a = 1;\n"          // This test is to check Ldar does not
       "while(true) {\n"          // get removed if the preceding Star is
@@ -1802,8 +1747,7 @@ TEST(RemoveRedundantLdar) {
 
 TEST(AssignmentsInBinaryExpression) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var x = 0, y = 1;\n"
       "return (x = 2, y = 3, x = 4, y = 5);\n",
@@ -1843,8 +1787,7 @@ TEST(AssignmentsInBinaryExpression) {
 
 TEST(Eval) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "return eval('1;');\n",
   };
@@ -1855,8 +1798,7 @@ TEST(Eval) {
 
 TEST(LookupSlot) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
 
   const char* snippets[] = {
       "eval('var x = 10;'); return x;\n",
@@ -1872,8 +1814,7 @@ TEST(LookupSlot) {
 
 TEST(CallLookupSlot) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "g = function(){}; eval(''); return g();\n",
   };
@@ -1886,8 +1827,7 @@ TEST(CallLookupSlot) {
 
 TEST(LookupSlotInEval) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1916,8 +1856,7 @@ TEST(LookupSlotInEval) {
 
 TEST(LookupSlotWideInEval) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1952,8 +1891,7 @@ TEST(LookupSlotWideInEval) {
 
 TEST(DeleteLookupSlotInEval) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");
 
@@ -1989,8 +1927,7 @@ TEST(WideRegisters) {
   std::string prologue(os.str());
 
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kNumber);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "x0 = x127;\n"
       "return x0;\n",
@@ -2032,8 +1969,7 @@ TEST(WideRegisters) {
 
 TEST(ConstVariable) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "const x = 10;\n",
 
@@ -2050,8 +1986,7 @@ TEST(ConstVariable) {
 
 TEST(LetVariable) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "let x = 10;\n",
 
@@ -2070,8 +2005,7 @@ TEST(ConstVariableContextSlot) {
   // TODO(mythria): Add tests for initialization of this via super calls.
   // TODO(mythria): Add tests that walk the context chain.
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "const x = 10; function f1() {return x;}\n",
 
@@ -2088,8 +2022,7 @@ TEST(ConstVariableContextSlot) {
 
 TEST(LetVariableContextSlot) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "let x = 10; function f1() {return x;}\n",
 
@@ -2109,8 +2042,7 @@ TEST(DoExpression) {
   FLAG_harmony_do_expressions = true;
 
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "var a = do { }; return a;\n",
 
@@ -2127,8 +2059,7 @@ TEST(DoExpression) {
 
 TEST(WithStatement) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "with ({x:42}) { return x; }\n",
   };
@@ -2139,8 +2070,7 @@ TEST(WithStatement) {
 
 TEST(DoDebugger) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kString);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "debugger;\n",
   };
@@ -2151,8 +2081,7 @@ TEST(DoDebugger) {
 
 TEST(ClassDeclarations) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   const char* snippets[] = {
       "class Person {\n"
       "  constructor(name) { this.name = name; }\n"
@@ -2182,8 +2111,7 @@ TEST(ClassDeclarations) {
 
 TEST(ClassAndSuperClass) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("test");
   const char* snippets[] = {
@@ -2241,8 +2169,7 @@ TEST(ClassAndSuperClass) {
 
 TEST(Generators) {
   InitializedIgnitionHandleScope scope;
-  BytecodeExpectationsPrinter printer(CcTest::isolate(),
-                                      ConstantPoolType::kMixed);
+  BytecodeExpectationsPrinter printer(CcTest::isolate());
   printer.set_wrap(false);
   printer.set_test_function_name("f");