Merge remote-tracking branch 'origin/main' into dev

Author: NathanWalker

NativeScript/runtime/Helpers.h

@@ -158,6 +158,10 @@ inline bool IsNumber(const v8::Local<v8::Value>& value) {
     return !value.IsEmpty() && (value->IsNumber() || value->IsNumberObject());
 }
 
+inline bool IsBigInt(const v8::Local<v8::Value>& value) {
+    return !value.IsEmpty() && (value->IsBigInt() || value->IsBigIntObject());
+}
+
 inline bool IsBool(const v8::Local<v8::Value>& value) {
     return !value.IsEmpty() && (value->IsBoolean() || value->IsBooleanObject());
 }

NativeScript/runtime/Pointer.cpp

@@ -20,7 +20,7 @@ Local<Value> Pointer::NewInstance(Local<Context> context, void* handle) {
     Isolate* isolate = context->GetIsolate();
     intptr_t ptr = static_cast<intptr_t>(reinterpret_cast<size_t>(handle));
 
-    Local<Value> arg = Number::New(isolate, ptr);
+    Local<Value> arg = BigInt::NewFromUnsigned(isolate, ptr);
     Local<Value> args[1] { arg };
     Local<Value> result;
     Local<v8::Function> ctorFunc = Pointer::GetPointerCtorFunc(context);
@@ -61,6 +61,7 @@ Local<v8::Function> Pointer::GetPointerCtorFunc(Local<Context> context) {
     Pointer::RegisterToHexStringMethod(context, prototype);
     Pointer::RegisterToDecimalStringMethod(context, prototype);
     Pointer::RegisterToNumberMethod(context, prototype);
+    Pointer::RegisterToBigIntMethod(context, prototype);
 
     cache->PointerCtorFunc = std::make_unique<Persistent<v8::Function>>(isolate, ctorFunc);
     cache->PointerCtorFunc->SetWrapperClassId(Constants::ClassTypes::DataWrapper);
@@ -75,12 +76,12 @@ void Pointer::PointerConstructorCallback(const FunctionCallbackInfo<Value>& info
         void* ptr = nullptr;
 
         if (info.Length() == 1) {
-            if (!tns::IsNumber(info[0])) {
+            bool isBigInt = tns::IsBigInt(info[0]);
+            bool isNumber = !isBigInt && tns::IsNumber(info[0]);
+            if (!isBigInt && !isNumber) {
                 throw NativeScriptException("Pointer constructor's first arg must be an integer.");
             }
 
-            Local<Number> arg = info[0].As<Number>();
-
     #if __SIZEOF_POINTER__ == 8
             // JSC stores 64-bit integers as doubles in JSValue.
             // Caution: This means that pointers with more than 54 significant bits
@@ -89,12 +90,28 @@ void Pointer::PointerConstructorCallback(const FunctionCallbackInfo<Value>& info
             // so we're safe at the time being.
             // See https://en.wikipedia.org/wiki/X86-64#Virtual_address_space_details
             // and https://en.wikipedia.org/wiki/ARM_architecture#ARMv8-A
+            
+            // The future is here, and turns out the OS is using more than 54 bits.
+            // as a result,
             int64_t value;
-            tns::Assert(arg->IntegerValue(context).To(&value), isolate);
+            if (isBigInt) {
+                value = info[0].As<BigInt>()->Int64Value();
+            } else {
+// TODO: Maybe log this?
+//#ifdef DEBUG
+//                syslog(LOG_WARNING, "Using JS Number to represent a pointer. Result might be wrong.");
+//#endif
+                tns::Assert(info[0].As<Number>()->IntegerValue(context).To(&value), isolate);
+            }
+
             ptr = reinterpret_cast<void*>(value);
     #else
             int32_t value;
-            tns::Assert(arg->Int32Value(context).To(&value), isolate);
+            if (isBigInt) {
+                value = (int32_t)info[0].As<BigInt>()->Int64Value();
+            } else {
+                tns::Assert(info[0].As<Number>()->Int32Value    (context).To(&value), isolate);
+            }
             ptr = reinterpret_cast<void*>(value);
     #endif
         }
@@ -255,4 +272,22 @@ void Pointer::RegisterToNumberMethod(Local<Context> context, Local<Object> proto
     tns::Assert(success, isolate);
 }
 
+void Pointer::RegisterToBigIntMethod(Local<Context> context, Local<Object> prototype) {
+    Isolate* isolate = context->GetIsolate();
+    Local<FunctionTemplate> funcTemplate = FunctionTemplate::New(isolate, [](const FunctionCallbackInfo<Value>& info) {
+        Isolate* isolate = info.GetIsolate();
+        PointerWrapper* wrapper = static_cast<PointerWrapper*>(info.This()->GetInternalField(0).As<External>()->Value());
+        const void* value = wrapper->Data();
+        size_t number = reinterpret_cast<size_t>(value);
+        Local<BigInt> result = BigInt::NewFromUnsigned(isolate, number);
+        info.GetReturnValue().Set(result);
+    });
+
+    Local<v8::Function> func;
+    tns::Assert(funcTemplate->GetFunction(context).ToLocal(&func), isolate);
+
+    bool success = prototype->Set(context, tns::ToV8String(isolate, "toBigInt"), func).FromMaybe(false);
+    tns::Assert(success, isolate);
+}
+
 }

NativeScript/runtime/Pointer.h

@@ -19,6 +19,7 @@ class Pointer {
     static void RegisterToHexStringMethod(v8::Local<v8::Context> context, v8::Local<v8::Object> prototype);
     static void RegisterToDecimalStringMethod(v8::Local<v8::Context> context, v8::Local<v8::Object> prototype);
     static void RegisterToNumberMethod(v8::Local<v8::Context> context, v8::Local<v8::Object> prototype);
+    static void RegisterToBigIntMethod(v8::Local<v8::Context> context, v8::Local<v8::Object> prototype);
 };
 
 }

README.md

@@ -10,10 +10,10 @@ brew install cmake
 sudo ln -s /usr/local/bin/cmake $(which cmake)
 
 # Clone repo
-git clone https://github.com/NativeScript/ns-v8ios-runtime.git
+git clone https://github.com/NativeScript/ios.git
 
 # Initialize and clone the submodules
-cd ns-v8ios-runtime
+cd ios
 git submodule update --init
 
 # Ensure that you have the required llvm binaries for building the metadata generator
@@ -73,7 +73,7 @@ Add the `Nativescript.framework` from the v8ios workspace:
 If you encounter vague errors like this when building your app with the runtime included (This has been observed sometimes while Profiling apps in Xcode):
 
 ```
-/path/to/ns-v8ios-runtime/NativeScript/inspector/src/base/atomicops.h:311:11: No matching function for call to 'Relaxed_Load'
+/path/to/ios/NativeScript/inspector/src/base/atomicops.h:311:11: No matching function for call to 'Relaxed_Load'
 ```
 
 This is most likely related to `Build Active Architecture Only` setting in Xcode for various targets (your app and the included v8ios runtime). You should check to make sure your app `Build Settings` and the v8ios targets `NativeScript` and `TKLiveSync` Build Settings are set to YES for both Debug and Release. See this reference:
@@ -101,8 +101,8 @@ In order to build the V8 engine for iOS and produce the static libraries used in
 **Prerequisites:**
 
 ```
-git clone https://github.com/NativeScript/ns-v8ios-runtime.git
-cd ns-v8ios-runtime
+git clone https://github.com/NativeScript/ios.git
+cd ios
 ```
 
 You will need Google [depot_tools](https://www.chromium.org/developers/how-tos/install-depot-tools)
@@ -122,7 +122,7 @@ export PATH=`pwd`/depot_tools:"$PATH"
 
 ```
 // IMPORTANT: Make sure you are inside the clone of this repo...
-cd ns-v8ios-runtime
+cd ios
 
 // Fetch v8 source:
 fetch v8
@@ -158,7 +158,7 @@ error: patch failed: BUILD.gn:538
 error: BUILD.gn: patch does not apply
 error: patch failed: src/inspector/inspector_protocol_config.json:21
 error: src/inspector/inspector_protocol_config.json: patch does not apply
-~/Documents/ns-v8ios-runtime/v8/build ~/Documents/ns-v8ios-runtime/v8 ~/Documents/ns-v8ios-runtime
+~/Documents/ios/v8/build ~/Documents/ios/v8 ~/Documents/ios
 error: patch failed: config/ios/ios_sdk.gni:32
 error: config/ios/ios_sdk.gni: patch does not apply
 ```
@@ -176,12 +176,12 @@ npm run build-v8-source
 * Example failure 1:
 
 ```
-@Mac ns-v8ios-runtime % npm run build-v8-source
+@Mac ios % npm run build-v8-source
 
 > @nativescript/[email protected] build-v8-source
 > ./build_v8_source.sh
 
-~/Documents/ns-v8ios-runtime/v8 ~/Documents/ns-v8ios-runtime
+~/Documents/ios/v8 ~/Documents/ios
 Building for out.gn/x64-release (simulator)
 Done. Made 212 targets from 92 files in 4004ms
 ninja: Entering directory `out.gn/x64-release'

TestRunner/app/tests/Marshalling/PointerTests.js

@@ -18,6 +18,27 @@ describe(module.id, function () {
         expect(pointer.toString()).toBe(`<Pointer: ${hexMinusOneForCurrentBitness}>`);
     });
 
+    it("Pointer from a BigInt", function () {
+        const number = 0x12abcdef;
+        var pointer = new interop.Pointer(BigInt(number));
+        expect(pointer instanceof interop.Pointer).toBe(true);
+        expect(pointer.toNumber()).toBe(number);
+        expect(pointer.toString()).toBe(`<Pointer: 0x${number.toString(16)}>`);
+        expect(pointer.toDecimalString()).toBe(number.toString());
+        expect(pointer.toBigInt()).toBe(BigInt(number));
+    });
+
+    it("Pointer from a really big BigInt", function () {
+        const number = BigInt("0x1fffffffffffffff");
+        var pointer = new interop.Pointer(number);
+        expect(pointer instanceof interop.Pointer).toBe(true);
+        // toNumber is no longer accurate
+        expect(pointer.toNumber()).toBeGreaterThan(Number.MAX_SAFE_INTEGER);
+        expect(pointer.toString()).toBe(`<Pointer: 0x${number.toString(16)}>`);
+        expect(pointer.toDecimalString()).toBe(number.toString());
+        expect(pointer.toBigInt()).toBe(BigInt(number));
+    });
+
     it("Pointer from a wrapped Number", function () {
         const number = 0x12abcdef;
         var pointer = new interop.Pointer(new Number(number));

metadata-generator/CMakeLists.txt

@@ -13,7 +13,7 @@ if (NOT LIBXML2_FOUND)
 endif ()
 
 get_filename_component(LLVM_ROOT "../../llvm/13.0.1" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}")
-set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
 
 set(LLVM_SYSTEM_LIBS "-lz -lcurses -lm -lxml2")
 set(LLVM_PREPROCESSOR_FLAGS "-I${LLVM_ROOT}/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS")