src/bootstrapper.cc - Issue 6606002: Merge revision 6500-6600 from bleeding_edge to the isolates branch.

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/bootstrapper.cc

Issue 6606002: Merge revision 6500-6600 from bleeding_edge to the isolates branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/isolates/

Patch Set: '' Created 9 years, 10 months ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/bootstrapper.cc

===================================================================

--- src/bootstrapper.cc (revision 7030)

+++ src/bootstrapper.cc (working copy)

@@ -1018,7 +1018,6 @@

INSTALL_NATIVE(JSFunction, "Instantiate", instantiate_fun);

INSTALL_NATIVE(JSFunction, "ConfigureTemplateInstance",

configure_instance_fun);

- INSTALL_NATIVE(JSFunction, "MakeMessage", make_message_fun);

INSTALL_NATIVE(JSFunction, "GetStackTraceLine", get_stack_trace_line_fun);

INSTALL_NATIVE(JSObject, "functionCache", function_cache);

}

@@ -1783,9 +1782,8 @@

AddToWeakGlobalContextList(*global_context_);

isolate->set_context(*global_context_);

isolate->counters()->contexts_created_by_snapshot()->Increment();

- result_ = global_context_;

JSFunction* empty_function =

- JSFunction::cast(result_->function_map()->prototype());

+ JSFunction::cast(global_context_->function_map()->prototype());

empty_function_ = Handle<JSFunction>(empty_function);

Handle<GlobalObject> inner_global;

Handle<JSGlobalProxy> global_proxy =

« src/ast.cc ('K') | « src/ast.cc ('k') | src/builtins.cc » ('j') | no next file with comments »