Skip to content

V
V8
Commit b28b7e13 authored by leszeks's avatar leszeks Committed by Commit bot
Browse files
Options

[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}
parent ca6c8734
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2773 additions and 2989 deletions
test/cctest/interpreter/bytecode-expectations-printer.cc
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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/AssignmentsInBinaryExpression.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: string
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/BasicBlockToBoolean.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/BasicLoops.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: string
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/CallLookupSlot.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: mixed
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/CallRuntime.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/ConstVariable.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: string
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/CreateRestParameter.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/DeadCodeRemoval.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/DeclareGlobals.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: string
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/DoExpression.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: string
execute: yes
wrap: yes
do expressions: yes
......
test/cctest/interpreter/bytecode_expectations/Eval.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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/IfConditions.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/LetVariable.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: mixed
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/ObjectLiterals.golden
View file @ b28b7e13
......@@ -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/OuterContextVariables.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: mixed
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/Parameters.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: mixed
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/PrimitiveExpressions.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/PrimitiveReturnStatements.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/PropertyCall.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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/RemoveRedundantLdar.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/StoreGlobal.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/Throw.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: string
execute: yes
wrap: no
test function name: f
......
test/cctest/interpreter/bytecode_expectations/UnaryOperators.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/WideRegisters.golden
View file @ b28b7e13
......@@ -3,7 +3,6 @@
#
---
pool type: number
execute: yes
wrap: yes
......
test/cctest/interpreter/bytecode_expectations/WithStatement.golden
View file @ b28b7e13
......@@ -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
View file @ b28b7e13
......@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment