Skip to content

V
V8
Commit 42bc9e8c authored by Sathya Gunasekaran's avatar Sathya Gunasekaran Committed by Commit Bot
Browse files
Options

[class] Expand bytecode expectations coverage for class fields 

Bug: v8:5367
Change-Id: Ib24190f6cfc0765794a1a5d9ac33cf1c1e2b6fba
Reviewed-on: https://chromium-review.googlesource.com/793150Reviewed-by: 's avatarMythri Alle <mythria@chromium.org>
Commit-Queue: Sathya Gunasekaran <gsathya@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49665}
parent 301bc628
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 74 deletions
test/cctest/interpreter/bytecode_expectations/ClassFields.golden
View file @ 42bc9e8c
...@@ -6,25 +6,155 @@ ...@@ -6,25 +6,155 @@
wrap: yes wrap: yes
public fields: yes public fields: yes
---
snippet: "
{
class A {
a;
['b'];
static c;
static ['d'];
}
class B {
a = 1;
['b'] = this.a;
static c = 3;
static ['d'] = this.c;
}
new A;
new B;
}
"
frame size: 11
parameter count: 1
bytecode array length: 193
bytecodes: [
/* 30 E> */ B(StackCheck),
B(Ldar), R(closure),
B(CreateBlockContext), U8(0),
B(PushContext), R(4),
B(LdaTheHole),
B(StaCurrentContextSlot), U8(4),
B(LdaTheHole),
B(StaCurrentContextSlot), U8(5),
B(LdaTheHole),
B(Star), R(8),
B(CreateClosure), U8(2), U8(0), U8(2),
B(Star), R(5),
B(LdaConstant), U8(1),
B(Star), R(6),
B(LdaConstant), U8(3),
B(StaCurrentContextSlot), U8(4),
B(Star), R(9),
B(LdaConstant), U8(4),
B(Star), R(10),
B(LdaConstant), U8(5),
B(TestEqualStrictNoFeedback), R(10),
B(Mov), R(5), R(7),
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowStaticPrototypeError), R(0), U8(0),
B(Ldar), R(10),
B(StaCurrentContextSlot), U8(5),
B(CallRuntime), U16(Runtime::kDefineClass), R(6), U8(5),
B(Star), R(6),
B(Mov), R(5), R(1),
B(CreateClosure), U8(6), U8(1), U8(2),
B(Star), R(7),
B(StaNamedProperty), R(5), U8(7), U8(2),
B(CreateClosure), U8(8), U8(4), U8(2),
B(Star), R(9),
B(CallProperty0), R(9), R(1), U8(5),
B(PopContext), R(4),
B(Mov), R(1), R(2),
B(Ldar), R(closure),
/* 38 E> */ B(CreateBlockContext), U8(9),
B(PushContext), R(4),
B(LdaTheHole),
B(StaCurrentContextSlot), U8(4),
B(LdaTheHole),
B(StaCurrentContextSlot), U8(5),
B(LdaTheHole),
B(Star), R(8),
B(CreateClosure), U8(11), U8(7), U8(2),
B(Star), R(5),
B(LdaConstant), U8(10),
B(Star), R(6),
B(LdaConstant), U8(3),
B(StaCurrentContextSlot), U8(4),
B(Star), R(9),
B(LdaConstant), U8(4),
B(Star), R(10),
B(LdaConstant), U8(5),
B(TestEqualStrictNoFeedback), R(10),
B(Mov), R(5), R(7),
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowStaticPrototypeError), R(0), U8(0),
B(Ldar), R(10),
B(StaCurrentContextSlot), U8(5),
B(CallRuntime), U16(Runtime::kDefineClass), R(6), U8(5),
B(Star), R(6),
B(Mov), R(5), R(0),
B(CreateClosure), U8(12), U8(8), U8(2),
B(Star), R(7),
B(StaNamedProperty), R(5), U8(7), U8(9),
B(CreateClosure), U8(13), U8(11), U8(2),
B(Star), R(9),
B(CallProperty0), R(9), R(0), U8(12),
B(PopContext), R(4),
B(Mov), R(0), R(3),
/* 197 S> */ B(Ldar), R(2),
/* 197 E> */ B(Construct), R(2), R(0), U8(0), U8(14),
/* 206 S> */ B(Ldar), R(0),
/* 206 E> */ B(Construct), R(0), R(0), U8(0), U8(16),
B(LdaUndefined),
/* 215 S> */ B(Return),
]
constant pool: [
FIXED_ARRAY_TYPE,
FIXED_ARRAY_TYPE,
SHARED_FUNCTION_INFO_TYPE,
ONE_BYTE_INTERNALIZED_STRING_TYPE ["b"],
ONE_BYTE_INTERNALIZED_STRING_TYPE ["d"],
ONE_BYTE_INTERNALIZED_STRING_TYPE ["prototype"],
SHARED_FUNCTION_INFO_TYPE,
SYMBOL_TYPE,
SHARED_FUNCTION_INFO_TYPE,
FIXED_ARRAY_TYPE,
FIXED_ARRAY_TYPE,
SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE,
]
handlers: [
]
--- ---
snippet: " snippet: "
{ {
class A extends class {} { class A extends class {} {
a; a;
['b'];
static c; static c;
static ['d'];
} }
class B extends class {} { class B extends class {} {
a = 1; a = 1;
['b'] = this.a;
static c = 3; static c = 3;
static ['d'] = this.c;
foo() { return 1; }
constructor() { constructor() {
super(); super();
} }
} }
class C extends class {} { class C extends B {
a = 1; a = 1;
['b'] = this.a;
static c = 3; static c = 3;
static ['d'] = super.foo();
constructor() { constructor() {
(() => super())(); (() => super())();
} }
...@@ -35,105 +165,163 @@ snippet: " ...@@ -35,105 +165,163 @@ snippet: "
new C; new C;
} }
" "
frame size: 14 frame size: 15
parameter count: 1 parameter count: 1
bytecode array length: 240 bytecode array length: 346
bytecodes: [ bytecodes: [
/* 30 E> */ B(StackCheck), /* 30 E> */ B(StackCheck),
B(Ldar), R(closure),
B(CreateBlockContext), U8(0),
B(PushContext), R(6),
B(LdaTheHole), B(LdaTheHole),
B(Star), R(13), B(StaCurrentContextSlot), U8(4),
B(CreateClosure), U8(2), U8(0), U8(2), B(LdaTheHole),
B(Star), R(10), B(StaCurrentContextSlot), U8(5),
B(LdaConstant), U8(1), B(LdaTheHole),
B(Star), R(11), B(Star), R(14),
B(Mov), R(10), R(12), B(CreateClosure), U8(3), U8(0), U8(2),
B(CallRuntime), U16(Runtime::kDefineClass), R(11), U8(3),
B(Star), R(11), B(Star), R(11),
B(CreateClosure), U8(3), U8(1), U8(2), B(LdaConstant), U8(2),
B(Star), R(6), B(Star), R(12),
B(LdaConstant), U8(0), B(Mov), R(11), R(13),
B(Star), R(7), B(CallRuntime), U16(Runtime::kDefineClass), R(12), U8(3),
B(Mov), R(6), R(8), B(Star), R(12),
B(Mov), R(12), R(9), B(CreateClosure), U8(4), U8(1), U8(2),
B(CallRuntime), U16(Runtime::kDefineClass), R(7), U8(3),
B(Star), R(7), B(Star), R(7),
B(Mov), R(8), R(2), B(LdaConstant), U8(1),
B(CreateClosure), U8(4), U8(2), U8(2),
B(Star), R(8), B(Star), R(8),
B(StaNamedProperty), R(6), U8(5), U8(3), B(LdaConstant), U8(5),
B(CreateClosure), U8(6), U8(5), U8(2), B(StaCurrentContextSlot), U8(4),
B(Star), R(10), B(Star), R(11),
B(CallProperty0), R(10), R(2), U8(6), B(LdaConstant), U8(6),
B(Star), R(12),
B(LdaConstant), U8(7),
B(TestEqualStrictNoFeedback), R(12),
B(Mov), R(13), R(10),
B(Mov), R(7), R(9),
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowStaticPrototypeError), R(0), U8(0),
B(Ldar), R(12),
B(StaCurrentContextSlot), U8(5),
B(CallRuntime), U16(Runtime::kDefineClass), R(8), U8(5),
B(Star), R(8),
B(Mov), R(7), R(2),
B(CreateClosure), U8(8), U8(2), U8(2),
B(Star), R(9),
B(StaNamedProperty), R(7), U8(9), U8(3),
B(CreateClosure), U8(10), U8(5), U8(2),
B(Star), R(11),
B(CallProperty0), R(11), R(2), U8(6),
B(PopContext), R(6),
B(Mov), R(2), R(3), B(Mov), R(2), R(3),
B(Ldar), R(closure),
/* 38 E> */ B(CreateBlockContext), U8(11),
B(PushContext), R(6),
B(LdaTheHole), B(LdaTheHole),
B(Star), R(13), B(StaCurrentContextSlot), U8(4),
/* 38 E> */ B(CreateClosure), U8(9), U8(8), U8(2), B(LdaTheHole),
B(Star), R(10), B(StaCurrentContextSlot), U8(5),
B(LdaConstant), U8(8), B(LdaTheHole),
B(Star), R(14),
B(CreateClosure), U8(14), U8(8), U8(2),
B(Star), R(11), B(Star), R(11),
B(Mov), R(10), R(12), B(LdaConstant), U8(13),
B(CallRuntime), U16(Runtime::kDefineClass), R(11), U8(3), B(Star), R(12),
B(Mov), R(11), R(13),
B(CallRuntime), U16(Runtime::kDefineClass), R(12), U8(3),
B(Star), R(12),
B(CreateClosure), U8(15), U8(9), U8(2),
B(Star), R(7),
B(LdaConstant), U8(12),
B(Star), R(8),
B(LdaConstant), U8(5),
B(StaCurrentContextSlot), U8(4),
B(Star), R(11), B(Star), R(11),
B(CreateClosure), U8(10), U8(9), U8(2), B(LdaConstant), U8(6),
B(Star), R(6), B(Star), R(12),
B(LdaConstant), U8(7), B(LdaConstant), U8(7),
B(Star), R(7), B(TestEqualStrictNoFeedback), R(12),
B(Mov), R(6), R(8), B(Mov), R(7), R(9),
B(Mov), R(12), R(9), B(Mov), R(13), R(10),
B(CallRuntime), U16(Runtime::kDefineClass), R(7), U8(3), B(JumpIfFalse), U8(7),
B(Star), R(7), B(CallRuntime), U16(Runtime::kThrowStaticPrototypeError), R(0), U8(0),
B(Mov), R(8), R(1), B(Ldar), R(12),
B(CreateClosure), U8(11), U8(10), U8(2), B(StaCurrentContextSlot), U8(5),
B(CreateClosure), U8(16), U8(10), U8(2),
B(Star), R(13),
B(CallRuntime), U16(Runtime::kDefineClass), R(8), U8(6),
B(Star), R(8), B(Star), R(8),
B(StaNamedProperty), R(6), U8(5), U8(11), B(Mov), R(7), R(1),
B(CreateClosure), U8(12), U8(13), U8(2), B(CreateClosure), U8(17), U8(11), U8(2),
B(Star), R(10), B(Star), R(9),
B(CallProperty0), R(10), R(1), U8(14), B(StaNamedProperty), R(7), U8(9), U8(12),
B(CreateClosure), U8(18), U8(14), U8(2),
B(Star), R(11),
B(CallProperty0), R(11), R(1), U8(15),
B(PopContext), R(6),
B(Mov), R(1), R(4), B(Mov), R(1), R(4),
B(Ldar), R(closure),
/* 122 E> */ B(CreateBlockContext), U8(19),
B(PushContext), R(6),
B(LdaTheHole), B(LdaTheHole),
B(Star), R(13), B(StaCurrentContextSlot), U8(4),
/* 93 E> */ B(CreateClosure), U8(15), U8(16), U8(2), B(LdaTheHole),
B(Star), R(10), B(StaCurrentContextSlot), U8(5),
B(LdaConstant), U8(14), /* 313 E> */ B(CreateClosure), U8(21), U8(17), U8(2),
B(Star), R(11),
B(Mov), R(10), R(12),
B(CallRuntime), U16(Runtime::kDefineClass), R(11), U8(3),
B(Star), R(11),
B(CreateClosure), U8(16), U8(17), U8(2),
B(Star), R(6),
B(LdaConstant), U8(13),
B(Star), R(7),
B(Mov), R(6), R(8),
B(Mov), R(12), R(9),
B(CallRuntime), U16(Runtime::kDefineClass), R(7), U8(3),
B(Star), R(7), B(Star), R(7),
B(Mov), R(8), R(0), B(LdaConstant), U8(20),
B(CreateClosure), U8(17), U8(18), U8(2),
B(Star), R(8), B(Star), R(8),
B(StaNamedProperty), R(6), U8(5), U8(19), B(LdaConstant), U8(5),
B(CreateClosure), U8(18), U8(21), U8(2), B(StaCurrentContextSlot), U8(4),
B(Star), R(10), B(Star), R(11),
B(CallProperty0), R(10), R(0), U8(22), B(LdaConstant), U8(6),
B(Star), R(12),
B(LdaConstant), U8(7),
B(TestEqualStrictNoFeedback), R(12),
B(Mov), R(1), R(10),
B(Mov), R(7), R(9),
B(JumpIfFalse), U8(7),
B(CallRuntime), U16(Runtime::kThrowStaticPrototypeError), R(0), U8(0),
B(Ldar), R(12),
B(StaCurrentContextSlot), U8(5),
B(CallRuntime), U16(Runtime::kDefineClass), R(8), U8(5),
B(Star), R(8),
B(Mov), R(7), R(0),
B(CreateClosure), U8(22), U8(18), U8(2),
B(Star), R(9),
B(StaNamedProperty), R(7), U8(9), U8(19),
B(CreateClosure), U8(23), U8(21), U8(2),
B(Star), R(11),
B(Ldar), R(0),
B(StaNamedProperty), R(11), U8(24), U8(22),
B(CallProperty0), R(11), R(0), U8(24),
B(PopContext), R(6),
B(Mov), R(0), R(5), B(Mov), R(0), R(5),
/* 311 S> */ B(Ldar), R(2), /* 456 S> */ B(Ldar), R(3),
/* 311 E> */ B(Construct), R(2), R(0), U8(0), U8(24), /* 456 E> */ B(Construct), R(3), R(0), U8(0), U8(26),
/* 320 S> */ B(Ldar), R(1), /* 465 S> */ B(Ldar), R(4),
/* 320 E> */ B(Construct), R(1), R(0), U8(0), U8(26), /* 465 E> */ B(Construct), R(4), R(0), U8(0), U8(28),
/* 329 S> */ B(Ldar), R(0), /* 474 S> */ B(Ldar), R(0),
/* 329 E> */ B(Construct), R(0), R(0), U8(0), U8(28), /* 474 E> */ B(Construct), R(0), R(0), U8(0), U8(30),
B(LdaUndefined), B(LdaUndefined),
/* 338 S> */ B(Return), /* 483 S> */ B(Return),
] ]
constant pool: [ constant pool: [
FIXED_ARRAY_TYPE,
FIXED_ARRAY_TYPE, FIXED_ARRAY_TYPE,
FIXED_ARRAY_TYPE, FIXED_ARRAY_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
ONE_BYTE_INTERNALIZED_STRING_TYPE ["b"],
ONE_BYTE_INTERNALIZED_STRING_TYPE ["d"],
ONE_BYTE_INTERNALIZED_STRING_TYPE ["prototype"],
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
SYMBOL_TYPE, SYMBOL_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
FIXED_ARRAY_TYPE, FIXED_ARRAY_TYPE,
FIXED_ARRAY_TYPE, FIXED_ARRAY_TYPE,
FIXED_ARRAY_TYPE,
SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
...@@ -143,7 +331,7 @@ constant pool: [ ...@@ -143,7 +331,7 @@ constant pool: [
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE, SHARED_FUNCTION_INFO_TYPE,
SHARED_FUNCTION_INFO_TYPE, SYMBOL_TYPE,
] ]
handlers: [ handlers: [
] ]
......
test/cctest/interpreter/generate-bytecode-expectations.cc
View file @ 42bc9e8c
...@@ -278,8 +278,8 @@ void ProgramOptions::UpdateFromHeader(std::istream& stream) { ...@@ -278,8 +278,8 @@ void ProgramOptions::UpdateFromHeader(std::istream& stream) {
do_expressions_ = ParseBoolean(line.c_str() + 16); do_expressions_ = ParseBoolean(line.c_str() + 16);
} else if (line.compare(0, 17, "async iteration: ") == 0) { } else if (line.compare(0, 17, "async iteration: ") == 0) {
async_iteration_ = ParseBoolean(line.c_str() + 17); async_iteration_ = ParseBoolean(line.c_str() + 17);
} else if (line.compare(0, 14, "public fields: ") == 0) { } else if (line.compare(0, 15, "public fields: ") == 0) {
public_fields_ = ParseBoolean(line.c_str() + 14); public_fields_ = ParseBoolean(line.c_str() + 15);
} else if (line == "---") { } else if (line == "---") {
break; break;
} else if (line.empty()) { } else if (line.empty()) {
......
test/cctest/interpreter/test-bytecode-generator.cc
View file @ 42bc9e8c
...@@ -2240,23 +2240,48 @@ TEST(ClassFields) { ...@@ -2240,23 +2240,48 @@ TEST(ClassFields) {
BytecodeExpectationsPrinter printer(CcTest::isolate()); BytecodeExpectationsPrinter printer(CcTest::isolate());
const char* snippets[] = { const char* snippets[] = {
"{\n"
" class A {\n"
" a;\n"
" ['b'];\n"
" static c;\n"
" static ['d'];\n"
" }\n"
"\n"
" class B {\n"
" a = 1;\n"
" ['b'] = this.a;\n"
" static c = 3;\n"
" static ['d'] = this.c;\n"
" }\n"
" new A;\n"
" new B;\n"
"}\n",
"{\n" "{\n"
" class A extends class {} {\n" " class A extends class {} {\n"
" a;\n" " a;\n"
" ['b'];\n"
" static c;\n" " static c;\n"
" static ['d'];\n"
" }\n" " }\n"
"\n" "\n"
" class B extends class {} {\n" " class B extends class {} {\n"
" a = 1;\n" " a = 1;\n"
" ['b'] = this.a;\n"
" static c = 3;\n" " static c = 3;\n"
" static ['d'] = this.c;\n"
" foo() { return 1; }\n"
" constructor() {\n" " constructor() {\n"
" super();\n" " super();\n"
" }\n" " }\n"
" }\n" " }\n"
"\n" "\n"
" class C extends class {} {\n" " class C extends B {\n"
" a = 1;\n" " a = 1;\n"
" ['b'] = this.a;\n"
" static c = 3;\n" " static c = 3;\n"
" static ['d'] = super.foo();\n"
" constructor() {\n" " constructor() {\n"
" (() => super())();\n" " (() => super())();\n"
" }\n" " }\n"
......
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