Update v8 to 5.2.361

runtime/build.gradle

@@ -59,7 +59,7 @@ model {
 
  ldLibs.addAll(["android", "dl", "log", "atomic", "z"])
 
- stl = "stlport_static"
+ stl = "c++_static"
 
  abiFilters.addAll(["armeabi-v7a", "x86", "arm64-v8a"])
  }

runtime/src/main/jni/ArgConverter.cpp

@@ -83,8 +83,8 @@ void ArgConverter::NativeScriptLongFunctionCallback(const v8::FunctionCallbackIn
  auto isolate = args.GetIsolate();
  auto thiz = args.This();
  auto cache = GetCache(isolate);
- thiz->SetHiddenValue(V8StringConstants::GetJavaLong(), Boolean::New(isolate, true));
- NumericCasts::MarkAsLong(thiz, args[0]);
+ thiz->SetPrivate(isolate->GetCurrentContext(), Private::New(isolate, V8StringConstants::GetJavaLong()), Boolean::New(isolate, true));
+ NumericCasts::MarkAsLong(isolate, thiz, args[0]);
  thiz->SetPrototype(Local<NumberObject>::New(isolate, *cache->NanNumberObject));
  }
  catch (NativeScriptException& e)

runtime/src/main/jni/JsArgConverter.cpp

@@ -175,13 +175,15 @@ bool JsArgConverter::ConvertArg(const Local<Value>& arg, int index)
  jlong javaLongValue;
  auto jsObject = arg->ToObject();
 
- auto castType = NumericCasts::GetCastType(jsObject);
+ auto castType = NumericCasts::GetCastType(m_isolate, jsObject);
 
  Local<Value> castValue;
  JniLocalRef obj;
 
  auto runtime = Runtime::GetRuntime(m_isolate);
  auto objectManager = runtime->GetObjectManager();
+ MaybeLocal<Value> maybeCastValue;
+ Local<Value> valFromMaybe;
 
  switch (castType)
  {
@@ -267,11 +269,17 @@ bool JsArgConverter::ConvertArg(const Local<Value>& arg, int index)
  case CastType::None:
  obj = objectManager->GetJavaObjectByJsObject(jsObject);
 
- castValue = jsObject->GetHiddenValue(ConvertToV8String(V8StringConstants::NULL_NODE_NAME));
- if(!castValue.IsEmpty()) {
- SetConvertedObject(index, nullptr);
- success = true;
- break;
+ maybeCastValue = jsObject->GetPrivate(m_isolate->GetCurrentContext(), Private::New(m_isolate, ConvertToV8String(V8StringConstants::NULL_NODE_NAME)));
+
+ if(!maybeCastValue.IsEmpty()) {
+ maybeCastValue.FromMaybe(valFromMaybe);
+
+ if(!valFromMaybe.IsEmpty())
+ {
+ SetConvertedObject(index, nullptr);
+ success = true;
+ break;
+ }
  }
 
  success = !obj.IsNull();

runtime/src/main/jni/JsArgConverter.h

@@ -6,6 +6,7 @@
 #include "JEnv.h"
 #include "v8.h"
 #include "MetadataEntry.h"
+#include "include/v8.h"
 
 namespace tns
 {

runtime/src/main/jni/JsArgToArrayConverter.cpp

@@ -182,7 +182,7 @@ bool JsArgToArrayConverter::ConvertArg(const Local<Value>& arg, int index)
  {
  auto jsObj = arg->ToObject();
 
- auto castType = NumericCasts::GetCastType(jsObj);
+ auto castType = NumericCasts::GetCastType(m_isolate, jsObj);
  Local<Value> castValue;
  jchar charValue;
  jbyte byteValue;
@@ -196,6 +196,10 @@ bool JsArgToArrayConverter::ConvertArg(const Local<Value>& arg, int index)
  auto runtime = Runtime::GetRuntime(m_isolate);
  auto objectManager = runtime->GetObjectManager();
 
+ // TODO: Pete:
+ MaybeLocal<Value> maybeCastValue;
+ Local<Value> valFromMaybe;
+
  switch (castType)
  {
  case CastType::Char:
@@ -294,38 +298,42 @@ bool JsArgToArrayConverter::ConvertArg(const Local<Value>& arg, int index)
 
  case CastType::None:
  obj = objectManager->GetJavaObjectByJsObject(jsObj);
-
- castValue = jsObj->GetHiddenValue(V8StringConstants::GetNullNodeName());
 
- if(!castValue.IsEmpty()) {
- auto node = reinterpret_cast<MetadataNode*>(castValue.As<External>()->Value());
+ maybeCastValue = jsObj->GetPrivate(m_isolate->GetCurrentContext(), Private::New(m_isolate, V8StringConstants::GetNullNodeName()));
 
- if(node == nullptr) {
- s << "Cannot get type of the null argument at index " << index;
- success = false;
- break;
- }
+ if(!maybeCastValue.IsEmpty()) {
+ maybeCastValue.FromMaybe(valFromMaybe);
 
- auto type = node->GetName();
- auto nullObjName = "com/tns/NullObject";
- auto nullObjCtorSig = "(Ljava/lang/Class;)V";
+ if(!valFromMaybe.IsEmpty()) {
+ auto node = reinterpret_cast<MetadataNode*>(valFromMaybe.As<External>()->Value());
 
- jclass nullClazz = env.FindClass(nullObjName);
- jmethodID ctor = env.GetMethodID(nullClazz, "<init>", nullObjCtorSig);
- jclass clazzToNull = env.FindClass(type.c_str());
- jobject nullObjType = env.NewObject(nullClazz, ctor, clazzToNull);
+ if(node == nullptr) {
+ s << "Cannot get type of the null argument at index " << index;
+ success = false;
+ break;
+ }
 
- if(nullObjType != nullptr)
- {
- SetConvertedObject(env, index, nullObjType, false);
- }
- else
- {
- SetConvertedObject(env, index, nullptr);
- }
+ auto type = node->GetName();
+ auto nullObjName = "com/tns/NullObject";
+ auto nullObjCtorSig = "(Ljava/lang/Class;)V";
 
- success = true;
- return success;
+ jclass nullClazz = env.FindClass(nullObjName);
+ jmethodID ctor = env.GetMethodID(nullClazz, "<init>", nullObjCtorSig);
+ jclass clazzToNull = env.FindClass(type.c_str());
+ jobject nullObjType = env.NewObject(nullClazz, ctor, clazzToNull);
+
+ if(nullObjType != nullptr)
+ {
+ SetConvertedObject(env, index, nullObjType, false);
+ }
+ else
+ {
+ SetConvertedObject(env, index, nullptr);
+ }
+
+ success = true;
+ return success;
+ }
  }
 
  success = !obj.IsNull();

runtime/src/main/jni/LRUCache.h

@@ -43,7 +43,7 @@ namespace tns
  typedef std::list<key_type> key_tracker_type;
 
  // Key to value and key history iterator
- typedef std::tr1::unordered_map< key_type, std::pair<value_type, typename key_tracker_type::iterator> > key_to_value_type;
+ typedef std::unordered_map< key_type, std::pair<value_type, typename key_tracker_type::iterator> > key_to_value_type;
 
  // Constuctor specifies the cached function and
  // the maximum number of records to be stored