diff --git a/AUTHORS b/AUTHORS
index c544b7fa63..b5f3b1f69b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -76,6 +76,7 @@ Gwang Yoon Hwang <ryumiel@company100.net>
 Henrique Ferreiro <henrique.ferreiro@gmail.com>
 Hirofumi Mako <mkhrfm@gmail.com>
 Honggyu Kim <honggyu.kp@gmail.com>
+Ingvar Stepanyan <me@rreverser.com>
 Ioseb Dzmanashvili <ioseb.dzmanashvili@gmail.com>
 Isiah Meadows <impinball@gmail.com>
 Jaime Bernardo <jaime@janeasystems.com>
diff --git a/src/compiler.cc b/src/compiler.cc
index f4dcffb181..1e457f0356 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1957,6 +1957,12 @@ void Compiler::PostInstantiation(Handle<JSFunction> function,
       function->set_code(code);
     }
   }
+
+  if (shared->is_toplevel() || shared->is_wrapped()) {
+    // If it's a top-level script, report compilation to the debugger.
+    Handle<Script> script(handle(Script::cast(shared->script())));
+    script->GetIsolate()->debug()->OnAfterCompile(script);
+  }
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/heap/factory.cc b/src/heap/factory.cc
index 533bb67c4a..d56c80f263 100644
--- a/src/heap/factory.cc
+++ b/src/heap/factory.cc
@@ -2137,17 +2137,15 @@ DEFINE_ERROR(WasmRuntimeError, wasm_runtime_error)
 
 Handle<JSFunction> Factory::NewFunction(Handle<Map> map,
                                         Handle<SharedFunctionInfo> info,
-                                        Handle<Object> context_or_undefined,
+                                        Handle<Context> context,
                                         PretenureFlag pretenure) {
   Handle<JSFunction> function(JSFunction::cast(New(map, pretenure)), isolate());
-  DCHECK(context_or_undefined->IsContext() ||
-         context_or_undefined->IsUndefined(isolate()));
 
   function->initialize_properties();
   function->initialize_elements();
   function->set_shared(*info);
   function->set_code(info->GetCode());
-  function->set_context(*context_or_undefined);
+  function->set_context(*context);
   function->set_feedback_cell(*many_closures_cell());
   int header_size;
   if (map->has_prototype_slot()) {
@@ -2298,31 +2296,24 @@ Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
 
 Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
     Handle<Map> initial_map, Handle<SharedFunctionInfo> info,
-    Handle<Object> context_or_undefined, PretenureFlag pretenure) {
+    Handle<Context> context, PretenureFlag pretenure) {
   DCHECK_EQ(JS_FUNCTION_TYPE, initial_map->instance_type());
   Handle<JSFunction> result =
-      NewFunction(initial_map, info, context_or_undefined, pretenure);
+      NewFunction(initial_map, info, context, pretenure);
 
-  if (context_or_undefined->IsContext()) {
-    // Give compiler a chance to pre-initialize.
-    Compiler::PostInstantiation(result, pretenure);
-  }
-
-  if (info->is_toplevel() || info->is_wrapped()) {
-    // Report script compilation to debugger.
-    isolate()->debug()->OnAfterCompile(handle(Script::cast(info->script())));
-  }
+  // Give compiler a chance to pre-initialize.
+  Compiler::PostInstantiation(result, pretenure);
 
   return result;
 }
 
 Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
     Handle<Map> initial_map, Handle<SharedFunctionInfo> info,
-    Handle<Object> context_or_undefined, Handle<FeedbackCell> feedback_cell,
+    Handle<Context> context, Handle<FeedbackCell> feedback_cell,
     PretenureFlag pretenure) {
   DCHECK_EQ(JS_FUNCTION_TYPE, initial_map->instance_type());
   Handle<JSFunction> result =
-      NewFunction(initial_map, info, context_or_undefined, pretenure);
+      NewFunction(initial_map, info, context, pretenure);
 
   // Bump the closure count that is encoded in the feedback cell's map.
   if (feedback_cell->map() == *no_closures_cell_map()) {
@@ -2342,15 +2333,8 @@ Handle<JSFunction> Factory::NewFunctionFromSharedFunctionInfo(
   }
   result->set_feedback_cell(*feedback_cell);
 
-  if (context_or_undefined->IsContext()) {
-    // Give compiler a chance to pre-initialize.
-    Compiler::PostInstantiation(result, pretenure);
-  }
-
-  if (info->is_toplevel() || info->is_wrapped()) {
-    // Report script compilation to debugger.
-    isolate()->debug()->OnAfterCompile(handle(Script::cast(info->script())));
-  }
+  // Give compiler a chance to pre-initialize.
+  Compiler::PostInstantiation(result, pretenure);
 
   return result;
 }
diff --git a/src/heap/factory.h b/src/heap/factory.h
index 5cdf484af9..ec4ae275d3 100644
--- a/src/heap/factory.h
+++ b/src/heap/factory.h
@@ -682,7 +682,7 @@ class V8_EXPORT_PRIVATE Factory {
 
   Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
       Handle<Map> initial_map, Handle<SharedFunctionInfo> function_info,
-      Handle<Object> context_or_undefined, Handle<FeedbackCell> feedback_cell,
+      Handle<Context> context, Handle<FeedbackCell> feedback_cell,
       PretenureFlag pretenure = TENURED);
 
   Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
@@ -691,7 +691,7 @@ class V8_EXPORT_PRIVATE Factory {
 
   Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
       Handle<Map> initial_map, Handle<SharedFunctionInfo> function_info,
-      Handle<Object> context_or_undefined, PretenureFlag pretenure = TENURED);
+      Handle<Context> context, PretenureFlag pretenure = TENURED);
 
   Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
       Handle<SharedFunctionInfo> function_info, Handle<Context> context,
@@ -701,7 +701,7 @@ class V8_EXPORT_PRIVATE Factory {
   // initialization. All other utility methods call into this.
   Handle<JSFunction> NewFunction(Handle<Map> map,
                                  Handle<SharedFunctionInfo> info,
-                                 Handle<Object> context_or_undefined,
+                                 Handle<Context> context,
                                  PretenureFlag pretenure = TENURED);
 
   // Create a serialized scope info.