Reviewers: Kevin Millikin,
Message:
Could please take a look?
Description:
Do not ignore an empty context with extension when creating a scope object.
Runtime_DebugEvaluate creates an empty context which is not correctly
handled in
FullCodeGenerator::ContextSlotOperandCheckExtensions because the
corresponding
scope indicates that it has no context.
BUG=crbug.com/107996
TEST=test/mjsunit/regress/regress-crbug-107996.js
Please review this at https://chromiumcodereview.appspot.com/9310027/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/scopes.h
M src/scopes.cc
A test/mjsunit/regress/regress-crbug-107996.js
Index: src/scopes.cc
diff --git a/src/scopes.cc b/src/scopes.cc
index
d0ee8ec7f21af11758a2cb3c49dcf9f8a2aa6b18..b03ea3d00777a93b3366365d611c1b325abb7c9f
100644
--- a/src/scopes.cc
+++ b/src/scopes.cc
@@ -137,7 +137,8 @@ Scope::Scope(Scope* outer_scope, ScopeType type)
Scope::Scope(Scope* inner_scope,
ScopeType type,
- Handle<ScopeInfo> scope_info)
+ Handle<ScopeInfo> scope_info,
+ bool has_context_with_extension)
: isolate_(Isolate::Current()),
inner_scopes_(4),
variables_(),
@@ -147,12 +148,10 @@ Scope::Scope(Scope* inner_scope,
decls_(4),
already_resolved_(true) {
SetDefaults(type, NULL, scope_info);
- if (!scope_info.is_null()) {
+ if (!scope_info.is_null() && *scope_info != ScopeInfo::Empty()) {
num_heap_slots_ = scope_info_->ContextLength();
- if (*scope_info != ScopeInfo::Empty()) {
- language_mode_ = scope_info->language_mode();
- }
- } else if (is_with_scope()) {
+ language_mode_ = scope_info->language_mode();
+ } else if (is_with_scope() || has_context_with_extension) {
num_heap_slots_ = Context::MIN_CONTEXT_SLOTS;
}
AddInnerScope(inner_scope);
@@ -235,7 +234,8 @@ Scope* Scope::DeserializeScopeChain(Context* context,
Scope* global_scope) {
ScopeInfo* scope_info = context->closure()->shared()->scope_info();
current_scope = new Scope(current_scope,
FUNCTION_SCOPE,
- Handle<ScopeInfo>(scope_info));
+ Handle<ScopeInfo>(scope_info),
+ context->extension() != NULL);
} else if (context->IsBlockContext()) {
ScopeInfo* scope_info = ScopeInfo::cast(context->extension());
current_scope = new Scope(current_scope,
Index: src/scopes.h
diff --git a/src/scopes.h b/src/scopes.h
index
af0449e93c7dea6895f06d42cf7a95ca7624071c..72a05b11fd910cfe9d9dcf6b16a5740a48340e15
100644
--- a/src/scopes.h
+++ b/src/scopes.h
@@ -543,7 +543,10 @@ class Scope: public ZoneObject {
private:
// Construct a scope based on the scope info.
- Scope(Scope* inner_scope, ScopeType type, Handle<ScopeInfo> scope_info);
+ Scope(Scope* inner_scope,
+ ScopeType type,
+ Handle<ScopeInfo> scope_info,
+ bool has_context_with_extension = false);
// Construct a catch scope with a binding for the name.
Scope(Scope* inner_scope, Handle<String> catch_variable_name);
Index: test/mjsunit/regress/regress-crbug-107996.js
diff --git a/test/mjsunit/regress/regress-crbug-107996.js
b/test/mjsunit/regress/regress-crbug-107996.js
new file mode 100644
index
0000000000000000000000000000000000000000..dfe07e59de5ef31fca7949a90ddb06a3d0dfc70c
--- /dev/null
+++ b/test/mjsunit/regress/regress-crbug-107996.js
@@ -0,0 +1,64 @@
+// Copyright 2012 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
+
+Debug = debug.Debug;
+
+Debug.setListener(listener);
+
+var fourteen;
+var four_in_debugger = [];
+
+function listener(event, exec_state, event_data, data) {
+ if (event == Debug.DebugEvent.Break) {
+ for (var i = 0; i < exec_state.frameCount(); i++) {
+ var frame = exec_state.frame(i);
+ four_in_debugger[i] = frame.evaluate("four", false).value();
+ }
+ }
+}
+
+function f1() {
+ var three = 3;
+ var four = 4;
+ (function f2() {
+ var seven = 7;
+ (function f3() {
+ debugger;
+ fourteen = three + four + seven;
+ })();
+ })();
+}
+
+f1();
+assertEquals(14, fourteen);
+assertEquals(4, four_in_debugger[0]);
+assertEquals(4, four_in_debugger[1]);
+assertEquals(4, four_in_debugger[2]);
+
+Debug.setListener(null);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
