FS-11047: [build] support v8 6.6 fixes from Andrey Volk
This commit is contained in:
parent
2744c12812
commit
27389f2937
|
@ -127,7 +127,7 @@
|
||||||
|
|
||||||
/* Macro for basic script state check (to know if the script is being terminated), should be called before calling any callback actual code */
|
/* Macro for basic script state check (to know if the script is being terminated), should be called before calling any callback actual code */
|
||||||
#define JS_CHECK_SCRIPT_STATE() \
|
#define JS_CHECK_SCRIPT_STATE() \
|
||||||
if (v8::V8::IsExecutionTerminating(info.GetIsolate())) return;\
|
if (info.GetIsolate()->IsExecutionTerminating()) return;\
|
||||||
if (JSMain::GetScriptInstanceFromIsolate(info.GetIsolate()) && JSMain::GetScriptInstanceFromIsolate(info.GetIsolate())->GetForcedTermination()) return
|
if (JSMain::GetScriptInstanceFromIsolate(info.GetIsolate()) && JSMain::GetScriptInstanceFromIsolate(info.GetIsolate())->GetForcedTermination()) return
|
||||||
|
|
||||||
/* Macro for easy unlocking an isolate on a long running c call */
|
/* Macro for easy unlocking an isolate on a long running c call */
|
||||||
|
|
|
@ -645,7 +645,7 @@ static int v8_parse_and_execute(switch_core_session_t *session, const char *inpu
|
||||||
isolate->SetData(0, js);
|
isolate->SetData(0, js);
|
||||||
|
|
||||||
// New global template
|
// New global template
|
||||||
Handle<ObjectTemplate> global = ObjectTemplate::New();
|
Handle<ObjectTemplate> global = ObjectTemplate::New(isolate);
|
||||||
|
|
||||||
if (global.IsEmpty()) {
|
if (global.IsEmpty()) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create JS global object template\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create JS global object template\n");
|
||||||
|
@ -793,7 +793,7 @@ static int v8_parse_and_execute(switch_core_session_t *session, const char *inpu
|
||||||
free(path);
|
free(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
TryCatch try_catch;
|
TryCatch try_catch(isolate);
|
||||||
|
|
||||||
// Compile the source code.
|
// Compile the source code.
|
||||||
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
|
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
|
||||||
|
|
|
@ -153,16 +153,8 @@ void JSBase::CreateInstance(const v8::FunctionCallbackInfo<Value>& args)
|
||||||
autoDestroy = args[1]->BooleanValue();
|
autoDestroy = args[1]->BooleanValue();
|
||||||
} else {
|
} else {
|
||||||
// Create a new C++ instance
|
// Create a new C++ instance
|
||||||
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
|
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=6
|
||||||
Isolate *isolate = args.GetIsolate();
|
Handle<External> ex = Handle<External>::Cast(args.Data());
|
||||||
v8::Local<v8::Context> context = isolate->GetCurrentContext();
|
|
||||||
v8::Local<v8::String> key = String::NewFromUtf8(isolate, "constructor_method");
|
|
||||||
v8::Local<v8::Private> privateKey = v8::Private::ForApi(isolate, key);
|
|
||||||
Handle<External> ex;
|
|
||||||
v8::MaybeLocal<v8::Value> hiddenValue = args.Callee()->GetPrivate(context, privateKey);
|
|
||||||
if (!hiddenValue.IsEmpty()) {
|
|
||||||
ex = Handle<External>::Cast(hiddenValue.ToLocalChecked());
|
|
||||||
}
|
|
||||||
#else
|
#else
|
||||||
Handle<External> ex = Handle<External>::Cast(args.Callee()->GetHiddenValue(String::NewFromUtf8(args.GetIsolate(), "constructor_method")));
|
Handle<External> ex = Handle<External>::Cast(args.Callee()->GetHiddenValue(String::NewFromUtf8(args.GetIsolate(), "constructor_method")));
|
||||||
#endif
|
#endif
|
||||||
|
@ -232,13 +224,14 @@ void JSBase::Register(Isolate *isolate, const js_class_definition_t *desc)
|
||||||
void JSBase::RegisterInstance(Isolate *isolate, string name, bool autoDestroy)
|
void JSBase::RegisterInstance(Isolate *isolate, string name, bool autoDestroy)
|
||||||
{
|
{
|
||||||
// Get the context's global scope (that's where we'll put the constructor)
|
// Get the context's global scope (that's where we'll put the constructor)
|
||||||
Handle<Object> global = isolate->GetCurrentContext()->Global();
|
Local<Context> context = isolate->GetCurrentContext();
|
||||||
|
Handle<Object> global = context->Global();
|
||||||
|
|
||||||
Local<Function> func = Local<Function>::Cast(global->Get(v8::String::NewFromUtf8(isolate, this->GetJSClassName().c_str())));
|
Local<Function> func = Local<Function>::Cast(global->Get(v8::String::NewFromUtf8(isolate, this->GetJSClassName().c_str())));
|
||||||
|
|
||||||
// Add the C++ instance as an argument, so it won't try to create another one.
|
// Add the C++ instance as an argument, so it won't try to create another one.
|
||||||
Handle<Value> args[] = { External::New(isolate, this), Boolean::New(isolate, autoDestroy) };
|
Handle<Value> args[] = { External::New(isolate, this), Boolean::New(isolate, autoDestroy) };
|
||||||
Handle<Object> newObj = func->NewInstance(2, args);
|
Handle<Object> newObj = func->NewInstance(context, 2, args).ToLocalChecked();
|
||||||
|
|
||||||
// Add the instance to JavaScript.
|
// Add the instance to JavaScript.
|
||||||
if (name.size() > 0) {
|
if (name.size() > 0) {
|
||||||
|
|
|
@ -209,7 +209,7 @@ const string JSMain::GetExceptionInfo(Isolate* isolate, TryCatch* try_catch)
|
||||||
ss << " ";
|
ss << " ";
|
||||||
}
|
}
|
||||||
|
|
||||||
int end = message->GetEndColumn();
|
int32_t end = message->GetEndColumn(isolate->GetCurrentContext()).FromMaybe(0);
|
||||||
|
|
||||||
for (int i = start; i < end; i++) {
|
for (int i = start; i < end; i++) {
|
||||||
ss << "^";
|
ss << "^";
|
||||||
|
@ -292,7 +292,7 @@ const string JSMain::ExecuteString(const string& scriptData, const string& fileN
|
||||||
|
|
||||||
isolate->SetData(0, this);
|
isolate->SetData(0, this);
|
||||||
|
|
||||||
Handle<ObjectTemplate> global = ObjectTemplate::New();
|
Handle<ObjectTemplate> global = ObjectTemplate::New(isolate);
|
||||||
global->Set(String::NewFromUtf8(isolate, "include"), FunctionTemplate::New(isolate, Include));
|
global->Set(String::NewFromUtf8(isolate, "include"), FunctionTemplate::New(isolate, Include));
|
||||||
global->Set(String::NewFromUtf8(isolate, "require"), FunctionTemplate::New(isolate, Include));
|
global->Set(String::NewFromUtf8(isolate, "require"), FunctionTemplate::New(isolate, Include));
|
||||||
global->Set(String::NewFromUtf8(isolate, "log"), FunctionTemplate::New(isolate, Log));
|
global->Set(String::NewFromUtf8(isolate, "log"), FunctionTemplate::New(isolate, Log));
|
||||||
|
@ -323,7 +323,7 @@ const string JSMain::ExecuteString(const string& scriptData, const string& fileN
|
||||||
inst->obj->RegisterInstance(isolate, inst->name, inst->auto_destroy);
|
inst->obj->RegisterInstance(isolate, inst->name, inst->auto_destroy);
|
||||||
}
|
}
|
||||||
|
|
||||||
TryCatch try_catch;
|
TryCatch try_catch(isolate);
|
||||||
|
|
||||||
// Compile the source code.
|
// Compile the source code.
|
||||||
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
|
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
|
||||||
|
@ -583,7 +583,7 @@ void JSMain::ExitScript(Isolate *isolate, const char *msg)
|
||||||
js->forcedTerminationScriptFile = GetStackInfo(isolate, &js->forcedTerminationLineNumber);
|
js->forcedTerminationScriptFile = GetStackInfo(isolate, &js->forcedTerminationLineNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
V8::TerminateExecution(isolate);
|
isolate->TerminateExecution();
|
||||||
}
|
}
|
||||||
|
|
||||||
char *JSMain::GetStackInfo(Isolate *isolate, int *lineNumber)
|
char *JSMain::GetStackInfo(Isolate *isolate, int *lineNumber)
|
||||||
|
|
Loading…
Reference in New Issue