Skip to content

V
V8
Commit 2ac6dae6 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot
Browse files
Options

Revert "Enable StringConcat bytecode." 

This reverts commit 189c8263.

Reason for revert: Lots of layout test changes:
https://build.chromium.org/p/client.v8.fyi/builders/V8-Blink%20Linux%2064/builds/16607

Original change's description:
> Enable StringConcat bytecode.
> 
> BUG=v8:6243
> 
> Change-Id: Idb9aa8221248cc493c8f5ba4bd50fa712a57f5f8
> Reviewed-on: https://chromium-review.googlesource.com/541221
> Commit-Queue: Ross McIlroy <rmcilroy@chromium.org>
> Reviewed-by: Leszek Swirski <leszeks@chromium.org>
> Reviewed-by: Jakob Gruber <jgruber@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#46249}

TBR=rmcilroy@chromium.org,jgruber@chromium.org,leszeks@chromium.org

Change-Id: I3ce96264d8c0e183b02c0344b90275e207683f7a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:6243
Reviewed-on: https://chromium-review.googlesource.com/550157Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46261}
parent f0485efb
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 35 deletions
src/debug/debug-evaluate.cc
View file @ 2ac6dae6
......@@ -440,7 +440,6 @@ bool BytecodeHasNoSideEffect(interpreter::Bytecode bytecode) {
case Bytecode::kToObject:
case Bytecode::kToNumber:
case Bytecode::kToName:
case Bytecode::kToPrimitiveToString:
// Misc.
case Bytecode::kStringConcat:
case Bytecode::kForInPrepare:
......
src/flag-definitions.h
View file @ 2ac6dae6
......@@ -314,7 +314,7 @@ DEFINE_BOOL(ignition_elide_noneffectful_bytecodes, true,
DEFINE_BOOL(ignition_reo, true, "use ignition register equivalence optimizer")
DEFINE_BOOL(ignition_filter_expression_positions, true,
"filter expression positions before the bytecode pipeline")
DEFINE_BOOL(ignition_string_concat, true,
DEFINE_BOOL(ignition_string_concat, false,
"translate string add chains into string concatenations")
DEFINE_BOOL(print_bytecode, false,
"print bytecode generated by ignition interpreter")
......
test/cctest/interpreter/bytecode_expectations/StringConcat.golden
View file @ 2ac6dae6
......@@ -39,9 +39,9 @@ snippet: "
var b = 2;
return 'string' + a + b;
"
frame size: 5
frame size: 3
parameter count: 1
bytecode array length: 27
bytecode array length: 26
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(LdaSmi), I8(1),
......@@ -51,10 +51,10 @@ bytecodes: [
/* 56 S> */ B(LdaConstant), U8(0),
B(Star), R(2),
B(Ldar), R(0),
/* 72 E> */ B(ToPrimitiveToString), R(3), U8(3),
/* 72 E> */ B(Add), R(2), U8(3),
B(Star), R(2),
B(Ldar), R(1),
/* 76 E> */ B(ToPrimitiveToString), R(4), U8(4),
B(StringConcat), R(2), U8(3),
/* 76 E> */ B(Add), R(2), U8(4),
/* 81 S> */ B(Return),
]
constant pool: [
......@@ -69,9 +69,9 @@ snippet: "
var b = 2;
return a + 'string' + b;
"
frame size: 5
frame size: 3
parameter count: 1
bytecode array length: 27
bytecode array length: 22
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(LdaSmi), I8(1),
......@@ -79,12 +79,10 @@ bytecodes: [
/* 53 S> */ B(LdaSmi), I8(2),
B(Star), R(1),
/* 56 S> */ B(LdaConstant), U8(0),
B(Star), R(3),
B(Ldar), R(0),
/* 65 E> */ B(ToPrimitiveToString), R(2), U8(3),
/* 65 E> */ B(Add), R(0), U8(3),
B(Star), R(2),
B(Ldar), R(1),
/* 76 E> */ B(ToPrimitiveToString), R(4), U8(4),
B(StringConcat), R(2), U8(3),
/* 76 E> */ B(Add), R(2), U8(4),
/* 81 S> */ B(Return),
]
constant pool: [
......@@ -99,9 +97,9 @@ snippet: "
var b = 2;
return 'foo' + a + 'bar' + b + 'baz' + 1;
"
frame size: 7
frame size: 3
parameter count: 1
bytecode array length: 38
bytecode array length: 43
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(LdaSmi), I8(1),
......@@ -111,14 +109,16 @@ bytecodes: [
/* 56 S> */ B(LdaConstant), U8(0),
B(Star), R(2),
B(Ldar), R(0),
/* 69 E> */ B(ToPrimitiveToString), R(3), U8(3),
/* 69 E> */ B(Add), R(2), U8(3),
B(Star), R(2),
B(LdaConstant), U8(1),
B(Star), R(4),
/* 73 E> */ B(Add), R(2), U8(4),
B(Star), R(2),
B(Ldar), R(1),
/* 81 E> */ B(ToPrimitiveToString), R(5), U8(5),
/* 81 E> */ B(Add), R(2), U8(5),
B(Star), R(2),
B(LdaConstant), U8(2),
B(Star), R(6),
/* 85 E> */ B(StringConcat), R(2), U8(5),
/* 85 E> */ B(Add), R(2), U8(6),
/* 93 E> */ B(AddSmi), I8(1), U8(7),
/* 98 S> */ B(Return),
]
......@@ -136,9 +136,9 @@ snippet: "
var b = 2;
return (a + 'string') + ('string' + b);
"
frame size: 6
frame size: 4
parameter count: 1
bytecode array length: 31
bytecode array length: 29
bytecodes: [
/* 30 E> */ B(StackCheck),
/* 42 S> */ B(LdaSmi), I8(1),
......@@ -146,14 +146,13 @@ bytecodes: [
/* 53 S> */ B(LdaSmi), I8(2),
B(Star), R(1),
/* 56 S> */ B(LdaConstant), U8(0),
B(Star), R(3),
B(Ldar), R(0),
/* 66 E> */ B(ToPrimitiveToString), R(2), U8(3),
/* 66 E> */ B(Add), R(0), U8(3),
B(Star), R(2),
B(LdaConstant), U8(0),
B(Star), R(4),
B(Star), R(3),
B(Ldar), R(1),
/* 90 E> */ B(ToPrimitiveToString), R(5), U8(4),
/* 78 E> */ B(StringConcat), R(2), U8(4),
/* 90 E> */ B(Add), R(3), U8(4),
/* 78 E> */ B(Add), R(2), U8(5),
/* 96 S> */ B(Return),
]
constant pool: [
......@@ -169,9 +168,9 @@ snippet: "
function foo(a, b) { };
return 'string' + foo(a, b) + a + b;
"
frame size: 7
frame size: 4
parameter count: 1
bytecode array length: 41
bytecode array length: 42
bytecodes: [
B(CreateClosure), U8(0), U8(3), U8(2),
B(Star), R(2),
......@@ -183,12 +182,13 @@ bytecodes: [
/* 80 S> */ B(LdaConstant), U8(1),
B(Star), R(3),
/* 98 E> */ B(CallUndefinedReceiver2), R(2), R(0), R(1), U8(4),
/* 96 E> */ B(ToPrimitiveToString), R(4), U8(6),
/* 96 E> */ B(Add), R(3), U8(6),
B(Star), R(3),
B(Ldar), R(0),
/* 108 E> */ B(ToPrimitiveToString), R(5), U8(7),
/* 108 E> */ B(Add), R(3), U8(7),
B(Star), R(3),
B(Ldar), R(1),
/* 112 E> */ B(ToPrimitiveToString), R(6), U8(8),
B(StringConcat), R(3), U8(4),
/* 112 E> */ B(Add), R(3), U8(8),
/* 117 S> */ B(Return),
]
constant pool: [
......
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