AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[interpreter] DYNAMIC_GLOBAL needs to walk the context chain starting from current_scope, not closure_scope

Browse Source 
The main reason why we currently don't see this fail is that block-scopes always appear to have an extension: the scope info object is stored there.

Bug: 
Change-Id: I38f0c15387e235eeea9a57c95af0d9eb185dad2a
Reviewed-on: https://chromium-review.googlesource.com/785951
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49585}
This commit is contained in:
Toon Verwaest 2017-11-22 17:40:24 +01:00 committed by Commit Bot
parent 4379533ca4
commit da0af28545
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interpreter/bytecode-generator.cc
View File

@ -2370,7 +2370,7 @@ void BytecodeGenerator::BuildVariableLoad(Variable* variable,
} }
case DYNAMIC_GLOBAL: { case DYNAMIC_GLOBAL: {
int depth = int depth =
closure_scope()->ContextChainLengthUntilOutermostSloppyEval(); current_scope()->ContextChainLengthUntilOutermostSloppyEval();
FeedbackSlot slot = GetCachedLoadGlobalICSlot(typeof_mode, variable); FeedbackSlot slot = GetCachedLoadGlobalICSlot(typeof_mode, variable);
builder()->LoadLookupGlobalSlot(variable->raw_name(), typeof_mode, builder()->LoadLookupGlobalSlot(variable->raw_name(), typeof_mode,
feedback_index(slot), depth); feedback_index(slot), depth);

2
test/cctest/interpreter/bytecode_expectations/ForOfLoop.golden
View File

@ -208,7 +208,7 @@ bytecodes: [
B(StaCurrentContextSlot), U8(4), B(StaCurrentContextSlot), U8(4),
B(Ldar), R(4), B(Ldar), R(4),
B(StaCurrentContextSlot), U8(4), B(StaCurrentContextSlot), U8(4),
/* 41 S> */ B(LdaLookupGlobalSlot), U8(6), U8(12), U8(1), /* 41 S> */ B(LdaLookupGlobalSlot), U8(6), U8(12), U8(3),
B(Star), R(15), B(Star), R(15),
B(LdaConstant), U8(7), B(LdaConstant), U8(7),
B(Star), R(16), B(Star), R(16),

2
test/cctest/interpreter/bytecode_expectations/StandardForLoop.golden
View File

@ -99,7 +99,7 @@ bytecodes: [
B(TestEqual), R(2), U8(3), B(TestEqual), R(2), U8(3),
B(JumpIfFalse), U8(54), B(JumpIfFalse), U8(54),
/* 17 E> */ B(StackCheck), /* 17 E> */ B(StackCheck),
/* 48 S> */ B(LdaLookupGlobalSlot), U8(2), U8(4), U8(1), /* 48 S> */ B(LdaLookupGlobalSlot), U8(2), U8(4), U8(3),
B(Star), R(7), B(Star), R(7),
B(LdaConstant), U8(3), B(LdaConstant), U8(3),
B(Star), R(8), B(Star), R(8),

11
test/mjsunit/ignition/dynamic-global-inside-block.js Normal file
View File

@ -0,0 +1,11 @@
// Copyright 2017 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Verifies that DYNAMIC_GLOBAL variables walk the correct context-chain length
// to reach the sloppy-eval calling function context, including block contexts.
function test() {
return eval('var x = 100; { function z() {z}; x }')
}
test();