Merge pull request #1357 from NativeScript/darind/v8-7.4.288.25

Upgrade v8 to 7.4.288.25

Author: darind

.travis.yml

@@ -1,7 +1,7 @@
 env:
   global:
   - NODE_VERSION=10
-  - NDK_VERSION=r19b
+  - NDK_VERSION=r19c
   - DATE=$(date +%Y-%m-%d)
   - PACKAGE_VERSION=next-$DATE-$TRAVIS_BUILD_NUMBER
   - EMULATOR_API_LEVEL=21

build-artifacts/project-template-gradle/settings.json

@@ -1,4 +1,4 @@
 {
-    "v8Version": "7.3.492.25",
+    "v8Version": "7.4.288.25",
     "mksnapshotParams": "--profile_deserialization --turbo_instruction_scheduling"
 }

package.json

@@ -13,5 +13,5 @@
     "version": "5.1.1",
     "android": "3.4.0"
   },
-  "android_ndk_version": "19b"
+  "android_ndk_version": "19c"
 }

test-app/app/src/main/assets/app/modules/libCalc-arm.so

@@ -15,12 +15,13 @@ using namespace tns;
 
 void ArgConverter::Init(Isolate* isolate) {
     auto cache = GetTypeLongCache(isolate);
+    auto context = isolate->GetCurrentContext();
 
     auto ft = FunctionTemplate::New(isolate, ArgConverter::NativeScriptLongFunctionCallback);
     ft->SetClassName(V8StringConstants::GetLongNumber(isolate));
     ft->InstanceTemplate()->Set(V8StringConstants::GetValueOf(isolate), FunctionTemplate::New(isolate, ArgConverter::NativeScriptLongValueOfFunctionCallback));
     ft->InstanceTemplate()->Set(V8StringConstants::GetToString(isolate), FunctionTemplate::New(isolate, ArgConverter::NativeScriptLongToStringFunctionCallback));
-    cache->LongNumberCtorFunc = new Persistent<Function>(isolate, ft->GetFunction());
+    cache->LongNumberCtorFunc = new Persistent<Function>(isolate, ft->GetFunction(context).ToLocalChecked());
 
     auto nanObject = Number::New(isolate, numeric_limits<double>::quiet_NaN()).As<NumberObject>();
     cache->NanNumberObject = new Persistent<NumberObject>(isolate, nanObject);

test-app/app/src/main/assets/app/modules/libCalc-arm64.so

@@ -15,7 +15,8 @@ ArrayBufferHelper::ArrayBufferHelper()
 void ArrayBufferHelper::CreateConvertFunctions(Isolate* isolate, const Local<Object>& global, ObjectManager* objectManager) {
     m_objectManager = objectManager;
     auto extData = External::New(isolate, this);
-    auto fromFunc = FunctionTemplate::New(isolate, CreateFromCallbackStatic, extData)->GetFunction();
+    auto context = isolate->GetCurrentContext();
+    auto fromFunc = FunctionTemplate::New(isolate, CreateFromCallbackStatic, extData)->GetFunction(context).ToLocalChecked();
     auto ctx = isolate->GetCurrentContext();
     auto arrBufferCtorFunc = global->Get(ArgConverter::ConvertToV8String(isolate, "ArrayBuffer")).As<Function>();
     arrBufferCtorFunc->Set(ctx, ArgConverter::ConvertToV8String(isolate, "from"), fromFunc);

test-app/app/src/main/assets/app/modules/libCalc-x86.so

@@ -29,7 +29,7 @@ void ArrayHelper::Init(const Local<Context>& context) {
         auto success = arr.ToLocal(&arrVal);
         if (success) {
             auto arrayObj = arrVal.As<Object>();
-            arrayObj->Set(context, ArgConverter::ConvertToV8String(isolate, "create"), FunctionTemplate::New(isolate, CreateJavaArrayCallback)->GetFunction());
+            arrayObj->Set(context, ArgConverter::ConvertToV8String(isolate, "create"), FunctionTemplate::New(isolate, CreateJavaArrayCallback)->GetFunction(context).ToLocalChecked());
         }
     }
 }

test-app/runtime/src/main/cpp/ArgConverter.cpp

@@ -558,8 +558,9 @@ CallbackHandlers::GetImplementedInterfaces(JEnv& env, const Local<Object>& imple
     }
 
     vector<jstring> interfacesToImplement;
-    auto propNames = implementationObject->GetOwnPropertyNames();
     auto isolate = implementationObject->GetIsolate();
+    auto context = isolate->GetCurrentContext();
+    auto propNames = implementationObject->GetOwnPropertyNames(context).ToLocalChecked();
     for (int i = 0; i < propNames->Length(); i++) {
         auto name = propNames->Get(i).As<String>();
         auto prop = implementationObject->Get(name);
@@ -616,8 +617,9 @@ CallbackHandlers::GetMethodOverrides(JEnv& env, const Local<Object>& implementat
     }
 
     vector<jstring> methodNames;
-    auto propNames = implementationObject->GetOwnPropertyNames();
     auto isolate = implementationObject->GetIsolate();
+    auto context = isolate->GetCurrentContext();
+    auto propNames = implementationObject->GetOwnPropertyNames(context).ToLocalChecked();
     for (int i = 0; i < propNames->Length(); i++) {
         auto name = propNames->Get(i).As<String>();
         auto method = implementationObject->Get(name);
@@ -842,11 +844,13 @@ Local<Value> CallbackHandlers::CallJSMethod(Isolate* isolate, JNIEnv* _env,
             arguments[i] = jsArgs->Get(i);
         }
 
+        auto context = isolate->GetCurrentContext();
+
         TryCatch tc(isolate);
         Local<Value> jsResult;
         {
             SET_PROFILER_FRAME();
-            jsResult = jsMethod->Call(jsObject, argc, argc == 0 ? nullptr : arguments.data());
+            jsMethod->Call(context, jsObject, argc, argc == 0 ? nullptr : arguments.data()).ToLocal(&jsResult);
         }
 
         //TODO: if javaResult is a pure js object create a java object that represents this object in java land
@@ -1043,7 +1047,7 @@ void CallbackHandlers::WorkerGlobalOnMessageCallback(Isolate* isolate, jstring m
 
             auto func = callback.As<Function>();
 
-            func->Call(Undefined(isolate), 1, args1);
+            func->Call(context, Undefined(isolate), 1, args1);
         } else {
             DEBUG_WRITE(
                 "WORKER: WorkerGlobalOnMessageCallback couldn't fire a worker's `onmessage` callback because it isn't implemented!");
@@ -1154,7 +1158,7 @@ CallbackHandlers::WorkerObjectOnMessageCallback(Isolate* isolate, jint workerId,
 
             auto func = callback.As<Function>();
 
-            func->Call(Undefined(isolate), 1, args1);
+            func->Call(context, Undefined(isolate), 1, args1);
         } else {
             DEBUG_WRITE(
                 "MAIN: WorkerObjectOnMessageCallback couldn't fire a worker(id=%d) object's `onmessage` callback because it isn't implemented.",
@@ -1264,7 +1268,7 @@ void CallbackHandlers::WorkerGlobalCloseCallback(const v8::FunctionCallbackInfo<
             auto func = callback.As<Function>();
 
             DEBUG_WRITE("WORKER: WorketThreadCloseCallback onclose handle is being called.");
-            func->Call(Undefined(isolate), 0, args1);
+            func->Call(context, Undefined(isolate), 0, args1);
             DEBUG_WRITE("WORKER: WorketThreadCloseCallback onclose handle was called.");
         }
 
@@ -1309,7 +1313,8 @@ void CallbackHandlers::CallWorkerScopeOnErrorHandle(Isolate* isolate, TryCatch&
 
             auto func = callback.As<Function>();
 
-            auto result = func->Call(Undefined(isolate), 1, args1);
+            Local<Value> result;
+            func->Call(context, Undefined(isolate), 1, args1).ToLocal(&result);
 
             // return 'true'-like value, don't bubble up to main Worker.onerror
             if (!result.IsEmpty() && result->BooleanValue(context).ToChecked()) {
@@ -1404,9 +1409,11 @@ CallbackHandlers::CallWorkerObjectOnErrorHandle(Isolate* isolate, jint workerId,
 
             auto func = callback.As<Function>();
 
-            // Handle exceptions thrown in onmessage with the worker.onerror handler, if present
-            auto result = func->Call(Undefined(isolate), 1, args1);
             auto context = isolate->GetCurrentContext();
+
+            // Handle exceptions thrown in onmessage with the worker.onerror handler, if present
+            Local<Value> result;
+            func->Call(context, Undefined(isolate), 1, args1).ToLocal(&result);
             if (!result.IsEmpty() && result->BooleanValue(context).ToChecked()) {
                 // Do nothing, exception is handled and does not need to be raised to application level
                 return;