Skip to content

V
V8
Commit 9664e48e authored by keuchel@chromium.org's avatar keuchel@chromium.org
Browse files
Options

Revert r10076 due to arm build failures. 

Review URL: http://codereview.chromium.org/8716005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10077 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 8866d63c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 645 deletions
src/ast.h
View file @ 9664e48e
......@@ -1176,7 +1176,6 @@ class VariableProxy: public Expression {
bool is_this,
int position = RelocInfo::kNoPosition);
friend class Rewriter;
friend class Scope;
};
......
src/parser.cc
View file @ 9664e48e
......@@ -5541,7 +5541,7 @@ static ScriptDataImpl* DoPreParse(UC16CharacterStream* source,
// Preparse, but only collect data that is immediately useful,
// even if the preparser data is only used once.
ScriptDataImpl* ParserApi::PartialPreParse(Handle<String> source,
ScriptDataImpl* ParserApi::PartialPreParse(UC16CharacterStream* source,
v8::Extension* extension,
int flags) {
bool allow_lazy = FLAG_lazy && (extension == NULL);
......@@ -5552,15 +5552,7 @@ ScriptDataImpl* ParserApi::PartialPreParse(Handle<String> source,
}
flags |= kAllowLazy;
PartialParserRecorder recorder;
int source_length = source->length();
if (source->IsExternalTwoByteString()) {
ExternalTwoByteStringUC16CharacterStream stream(
Handle<ExternalTwoByteString>::cast(source), 0, source_length);
return DoPreParse(&stream, flags, &recorder);
} else {
GenericStringUC16CharacterStream stream(source, 0, source_length);
return DoPreParse(&stream, flags, &recorder);
}
return DoPreParse(source, flags, &recorder);
}
......
src/parser.h
View file @ 9664e48e
......@@ -178,7 +178,7 @@ class ParserApi {
// Preparser that only does preprocessing that makes sense if only used
// immediately after.
static ScriptDataImpl* PartialPreParse(Handle<String> source,
static ScriptDataImpl* PartialPreParse(UC16CharacterStream* source,
v8::Extension* extension,
int flags);
};
......
src/rewriter.cc
View file @ 9664e48e
......@@ -236,22 +236,10 @@ bool Rewriter::Rewrite(CompilationInfo* info) {
if (processor.HasStackOverflow()) return false;
if (processor.result_assigned()) {
ASSERT(function->end_position() != RelocInfo::kNoPosition);
Isolate* isolate = info->isolate();
Zone* zone = isolate->zone();
// Set the position of the assignment statement one character past the
// source code, such that it definitely is not in the source code range
// of an immediate inner scope. For example in
// eval('with ({x:1}) x = 1');
// the end position of the function generated for executing the eval code
// coincides with the end of the with scope which is the position of '1'.
int position = function->end_position();
VariableProxy* result_proxy = new(zone) VariableProxy(
isolate, result->name(), false, position);
result_proxy->BindTo(result);
Statement* result_statement = new(zone) ReturnStatement(result_proxy);
result_statement->set_statement_pos(position);
body->Add(result_statement);
VariableProxy* result_proxy = new(zone) VariableProxy(isolate, result);
body->Add(new(zone) ReturnStatement(result_proxy));
}
}
......
src/runtime.cc
View file @ 9664e48e
This diff is collapsed.
src/scopes.cc
View file @ 9664e48e
......@@ -661,14 +661,14 @@ Handle<ScopeInfo> Scope::GetScopeInfo() {
void Scope::GetNestedScopeChain(
List<Handle<ScopeInfo> >* chain,
int position) {
if (!is_eval_scope()) chain->Add(Handle<ScopeInfo>(GetScopeInfo()));
chain->Add(Handle<ScopeInfo>(GetScopeInfo()));
for (int i = 0; i < inner_scopes_.length(); i++) {
Scope* scope = inner_scopes_[i];
int beg_pos = scope->start_position();
int end_pos = scope->end_position();
ASSERT(beg_pos >= 0 && end_pos >= 0);
if (beg_pos <= position && position < end_pos) {
if (beg_pos <= position && position <= end_pos) {
scope->GetNestedScopeChain(chain, position);
return;
}
......
test/cctest/test-parsing.cc
View file @ 9664e48e
......@@ -349,10 +349,10 @@ TEST(Regress928) {
"try { } catch (e) { var foo = function () { /* first */ } }"
"var bar = function () { /* second */ }";
v8::HandleScope handles;
i::Handle<i::String> source(
FACTORY->NewStringFromAscii(i::CStrVector(program)));
i::ScriptDataImpl* data = i::ParserApi::PartialPreParse(source, NULL, false);
i::Utf8ToUC16CharacterStream stream(reinterpret_cast<const i::byte*>(program),
static_cast<unsigned>(strlen(program)));
i::ScriptDataImpl* data =
i::ParserApi::PartialPreParse(&stream, NULL, false);
CHECK(!data->HasError());
data->Initialize();
......
test/mjsunit/debug-stepout-scope.js deleted 100644 → 0
View file @ 8866d63c
// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Flags: --expose-debug-as debug --expose-natives-as=builtins
// Check that the ScopeIterator can properly recreate the scope at
// every point when stepping through functions.
var Debug = debug.Debug;
function listener(event, exec_state, event_data, data) {
if (event == Debug.DebugEvent.Break) {
// Access scope details.
var scope_count = exec_state.frame().scopeCount();
for (var i = 0; i < scope_count; i++) {
var scope = exec_state.frame().scope(i);
// assertTrue(scope.isScope());
scope.scopeType();
scope.scopeObject();
}
// Do steps until we reach the global scope again.
if (true) {
exec_state.prepareStep(Debug.StepAction.StepInMin, 1);
}
}
}
Debug.setListener(listener);
function test1() {
debugger;
with ({x:1}) {
x = 2;
}
}
test1();
function test2() {
if (true) {
with ({}) {
debugger;
}
} else {
with ({}) {
return 10;
}
}
}
test2();
function test3() {
if (true) {
debugger;
} else {
with ({}) {
return 10;
}
}
}
test3();
function test4() {
debugger;
with ({x:1}) x = 1
}
test4();
function test5() {
debugger;
var dummy = 1;
with ({}) {
with ({}) {
dummy = 2;
}
}
dummy = 3;
}
test5();
function test6() {
debugger;
try {
throw 'stuff';
} catch (e) {
e = 1;
}
}
test6();
function test7() {
debugger;
function foo() {}
}
test7();
function test8() {
debugger;
(function foo() {})();
}
test8();
var q = 42;
var prefixes = [ "debugger; ",
"if (false) { try { throw 0; } catch(x) { return x; } }; debugger; " ];
var bodies = [ "1",
"1 ",
"1;",
"1; ",
"q",
"q ",
"q;",
"q; ",
"try { throw 'stuff' } catch (e) { e = 1; }",
"try { throw 'stuff' } catch (e) { e = 1; } ",
"try { throw 'stuff' } catch (e) { e = 1; };",
"try { throw 'stuff' } catch (e) { e = 1; }; " ];
var with_bodies = [ "with ({}) {}",
"with ({x:1}) x",
"with ({x:1}) x = 1",
"with ({x:1}) x ",
"with ({x:1}) x = 1 ",
"with ({x:1}) x;",
"with ({x:1}) x = 1;",
"with ({x:1}) x; ",
"with ({x:1}) x = 1; " ];
function test9() {
debugger;
for (var i = 0; i < prefixes.length; ++i) {
var pre = prefixes[i];
for (var j = 0; j < bodies.length; ++j) {
var body = bodies[j];
eval(pre + body);
eval("'use strict'; " + pre + body);
}
for (var j = 0; j < with_bodies.length; ++j) {
var body = with_bodies[j];
eval(pre + body);
}
}
}
test9();
function test10() {
debugger;
with ({}) {
return 10;
}
}
test10();
function test11() {
debugger;
try {
throw 'stuff';
} catch (e) {
return 10;
}
}
test11();
// Test global eval and function constructor.
for (var i = 0; i < prefixes.length; ++i) {
var pre = prefixes[i];
for (var j = 0; j < bodies.length; ++j) {
var body = bodies[j];
eval(pre + body);
eval("'use strict'; " + pre + body);
Function(pre + body)();
}
for (var j = 0; j < with_bodies.length; ++j) {
var body = with_bodies[j];
eval(pre + body);
Function(pre + body)();
}
}
try {
with({}) {
debugger;
eval("{}$%:^");
}
} catch(e) {
nop();
}
// Return from function constructed with Function constructor.
var anon = 12;
for (var i = 0; i < prefixes.length; ++i) {
var pre = prefixes[i];
Function(pre + "return 42")();
Function(pre + "return 42 ")();
Function(pre + "return 42;")();
Function(pre + "return 42; ")();
Function(pre + "return anon")();
Function(pre + "return anon ")();
Function(pre + "return anon;")();
Function(pre + "return anon; ")();
}
function nop() {}
function stress() {
debugger;
L: with ({x:12}) {
break L;
}
with ({x: 'outer'}) {
label: {
with ({x: 'inner'}) {
break label;
}
}
}
with ({x: 'outer'}) {
label: {
with ({x: 'inner'}) {
break label;
}
}
nop();
}
with ({x: 'outer'}) {
label: {
with ({x: 'middle'}) {
with ({x: 'inner'}) {
break label;
}
}
}
}
with ({x: 'outer'}) {
label: {
with ({x: 'middle'}) {
with ({x: 'inner'}) {
break label;
}
}
}
nop();
}
with ({x: 'outer'}) {
for (var i = 0; i < 3; ++i) {
with ({x: 'inner' + i}) {
continue;
}
}
}
with ({x: 'outer'}) {
label: for (var i = 0; i < 3; ++i) {
with ({x: 'middle' + i}) {
for (var j = 0; j < 3; ++j) {
with ({x: 'inner' + j}) {
continue label;
}
}
}
}
}
with ({x: 'outer'}) {
try {
with ({x: 'inner'}) {
throw 0;
}
} catch (e) {
}
}
with ({x: 'outer'}) {
try {
with ({x: 'inner'}) {
throw 0;
}
} catch (e) {
nop();
}
}
with ({x: 'outer'}) {
try {
with ({x: 'middle'}) {
with ({x: 'inner'}) {
throw 0;
}
}
} catch (e) {
}
}
try {
with ({x: 'outer'}) {
try {
with ({x: 'inner'}) {
throw 0;
}
} finally {
}
}
} catch (e) {
}
try {
with ({x: 'outer'}) {
try {
with ({x: 'inner'}) {
throw 0;
}
} finally {
nop();
}
}
} catch (e) {
}
function stress1() {
with ({x:12}) {
return x;
}
}
stress1();
function stress2() {
with ({x: 'outer'}) {
with ({x: 'inner'}) {
return x;
}
}
}
stress2();
function stress3() {
try {
with ({x: 'inner'}) {
throw 0;
}
} catch (e) {
return e;
}
}
stress3();
function stress4() {
try {
with ({x: 'inner'}) {
throw 0;
}
} catch (e) {
with ({x: 'inner'}) {
return e;
}
}
}
stress4();
}
stress();
// With block as the last(!) statement in global code.
with ({}) { debugger; }
\ No newline at end of file
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