Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Unified Diff: src/factory.cc

Issue 1478303002: Revert of [runtime] Replace global object link with native context link in all contexts. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/crankshaft/x64/lithium-codegen-x64.cc ('k') | src/full-codegen/arm/full-codegen-arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/factory.cc
diff --git a/src/factory.cc b/src/factory.cc
index 1ba8f7ec0705029ae7b08649a343be044e8912ea..45c6c1c6036b28614b2f12d9795616968a404c60 100644
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -726,7 +726,6 @@
NewFixedArray(Context::NATIVE_CONTEXT_SLOTS, TENURED);
array->set_map_no_write_barrier(*native_context_map());
Handle<Context> context = Handle<Context>::cast(array);
- context->set_native_context(*context);
context->set_js_array_maps(*undefined_value());
context->set_errors_thrown(Smi::FromInt(0));
DCHECK(context->IsNativeContext());
@@ -743,7 +742,7 @@
context->set_closure(*function);
context->set_previous(function->context());
context->set_extension(*scope_info);
- context->set_native_context(function->native_context());
+ context->set_global_object(function->context()->global_object());
DCHECK(context->IsScriptContext());
return context;
}
@@ -779,7 +778,7 @@
context->set_closure(*function);
context->set_previous(function->context());
context->set_extension(Smi::FromInt(0));
- context->set_native_context(function->native_context());
+ context->set_global_object(function->context()->global_object());
return context;
}
@@ -795,7 +794,7 @@
context->set_closure(*function);
context->set_previous(*previous);
context->set_extension(*name);
- context->set_native_context(previous->native_context());
+ context->set_global_object(previous->global_object());
context->set(Context::THROWN_OBJECT_INDEX, *thrown_object);
return context;
}
@@ -810,7 +809,7 @@
context->set_closure(*function);
context->set_previous(*previous);
context->set_extension(*extension);
- context->set_native_context(previous->native_context());
+ context->set_global_object(previous->global_object());
return context;
}
@@ -825,7 +824,7 @@
context->set_closure(*function);
context->set_previous(*previous);
context->set_extension(*scope_info);
- context->set_native_context(previous->native_context());
+ context->set_global_object(previous->global_object());
return context;
}
« no previous file with comments | « src/crankshaft/x64/lithium-codegen-x64.cc ('k') | src/full-codegen/arm/full-codegen-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698