src/scopes.cc - Issue 71163006: Merge bleeding_edge r17376:17693.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/scopes.cc

Issue 71163006: Merge bleeding_edge r17376:17693. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/parser

Patch Set: Fix all.gyp Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/scopes.cc

diff --git a/src/scopes.cc b/src/scopes.cc

index ee327fb79f7dee73aebd932cc092e373e13ba055..137ab68b2c0f8a753ea872a04a051e0e74416e78 100644

--- a/src/scopes.cc

+++ b/src/scopes.cc

@@ -1302,7 +1302,7 @@ void Scope::AllocateParameterLocals() {

void Scope::AllocateNonParameterLocal(Variable* var) {

ASSERT(var->scope() == this);

- ASSERT(!var->IsVariable(isolate_->factory()->result_string()) ||

+ ASSERT(!var->IsVariable(isolate_->factory()->dot_result_string()) ||

!var->IsStackLocal());

if (var->IsUnallocated() && MustAllocate(var)) {

if (MustAllocateInContext(var)) {

« no previous file with comments | « src/scopeinfo.cc ('k') | src/serialize.cc » ('j') | no next file with comments »