Index: src/api-natives.cc |
diff --git a/src/api-natives.cc b/src/api-natives.cc |
index d8dd1510417641197da707cf27f79e51586886d3..e99b8d7f69a949f5d5271039d0368d21dc02150e 100644 |
--- a/src/api-natives.cc |
+++ b/src/api-natives.cc |
@@ -438,7 +438,14 @@ void ApiNatives::AddNativeDataProperty(Isolate* isolate, |
Handle<JSFunction> ApiNatives::CreateApiFunction( |
Isolate* isolate, Handle<FunctionTemplateInfo> obj, |
Handle<Object> prototype, ApiInstanceType instance_type) { |
- Handle<Code> code = isolate->builtins()->HandleApiCall(); |
+ |
+ Handle<Code> code; |
+ if (obj->call_code()->IsCallHandlerInfo() && |
+ handle(CallHandlerInfo::cast(obj->call_code()))->callback()->IsCode()) { |
+ code = isolate->builtins()->HandleJSApiCall(); |
+ } else { |
+ code = isolate->builtins()->HandleApiCall(); |
+ } |
Handle<Code> construct_stub = isolate->builtins()->JSConstructStubApi(); |
obj->set_instantiated(true); |