Merge pull request #1220 from NativeScript/bektchiev/webkit-13

Update WebKit to 13.2

Author: mbektchiev

CMakeLists.txt

@@ -55,7 +55,7 @@ set(MAIN_TEMPLATE "${CMAKE_SOURCE_DIR}/cmake/main.m")
 set(INFO_PLIST_TEMPLATE "${CMAKE_SOURCE_DIR}/cmake/Info.plist")
 
 #WTF uses unsigned short for UCHAR_TYPE and we need to match it
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14 -stdlib=libc++ -DUCHAR_TYPE=\"unsigned short\"")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17 -stdlib=libc++ -DUCHAR_TYPE=\"unsigned short\"")
 
 # Override RelWithDebInfo configuration's default optimization O2 to O3
 # because we've started releasing NativeScript.framework from it

src/NativeScript/Calling/CFunctionWrapper.h

@@ -25,7 +25,7 @@ class CFunctionCall : public FFICall {
 
     DECLARE_INFO;
 
-    template <typename CellType>
+    template <typename CellType, JSC::SubspaceAccess mode>
     static JSC::IsoSubspace* subspaceFor(JSC::VM& vm) {
         return &vm.tnsCFunctionWrapperSpace;
     }

src/NativeScript/Calling/FFICall.h

@@ -134,7 +134,7 @@ class FFICall {
         auto scope = DECLARE_THROW_SCOPE(vm);
 
         if (!this->_argumentCountValidator(this, execState)) {
-            WTF::String message = WTF::String::format("Actual arguments count: \"%lu\". Expected: \"%lu\".", execState->argumentCount(), this->parametersCount());
+            WTF::String message = makeString("Actual arguments count: \"", execState->argumentCount(), "\". Expected: \"", this->parametersCount(), "\".");
             throwException(execState, scope, JSC::createError(execState, message, defaultSourceAppender));
             return;
         }

src/NativeScript/Calling/FunctionWrapper.h

@@ -24,7 +24,7 @@ class FunctionWrapper : public JSC::InternalFunction {
 
     DECLARE_INFO;
 
-    template <typename CellType>
+    template <typename CellType, JSC::SubspaceAccess mode>
     static JSC::IsoSubspace* subspaceFor(JSC::VM& vm) {
         return &vm.tnsFunctionWrapperSpace;
     }

src/NativeScript/GlobalObject.mm

@@ -128,7 +128,7 @@ static EncodedJSValue JSC_HOST_CALL time(ExecState* execState) {
 static EncodedJSValue JSC_HOST_CALL releaseNativeCounterpart(ExecState* execState) {
     if (execState->argumentCount() != 1) {
         auto scope = DECLARE_THROW_SCOPE(execState->vm());
-        WTF::String message = WTF::String::format("Actual arguments count: \"%lu\". Expected: \"%lu\".", execState->argumentCount(), 1);
+        WTF::String message = makeString("Actual arguments count: \"", execState->argumentCount(), "\". Expected: \"", 1, "\".");
         return JSValue::encode(throwException(execState, scope, JSC::createError(execState, message, defaultSourceAppender)));
     }
 
@@ -412,8 +412,7 @@ static void runLoopBeforeWaitingPerformWork(CFRunLoopObserverRef observer, CFRun
     }
 
     if (!symbolWrapper) {
-        WTF::String errorMessage = WTF::String::format("Metadata for \"%s.%s\" found but symbol not available at runtime.",
-                                                       symbolMeta->topLevelModule()->getName(), symbolMeta->name(), symbolMeta->name());
+        WTF::String errorMessage = makeString("Metadata for \"", symbolMeta->topLevelModule()->getName(), ".", symbolMeta->name(), "\" found but symbol not available at runtime.");
         JSC::VM& vm = execState->vm();
         auto scope = DECLARE_THROW_SCOPE(vm);
 

src/NativeScript/GlobalObject.moduleLoader.mm

@@ -298,7 +298,7 @@ static mode_t stat(NSString* path) {
     }
 
     if (!absoluteFilePath) {
-        WTF::String errorMessage = WTF::String::format("Could not find module '%s'. Computed path '%s'.", keyValue.toWTFString(execState).utf8().data(), absolutePath.UTF8String);
+        WTF::String errorMessage = makeString("Could not find module '", keyValue.toWTFString(execState), "'. Computed path '", absolutePath.UTF8String, "'.");
         throwException(execState, scope, createError(execState, errorMessage, defaultSourceAppender));
         return Identifier();
     }
@@ -328,7 +328,7 @@ static mode_t stat(NSString* path) {
 
     String moduleContentStr = WTF::String::fromUTF8((const LChar*)moduleContent.bytes, moduleContent.length);
     if (moduleContentStr.isNull() && moduleContent.length > 0) {
-        return deferred->reject(execState, createTypeError(execState, WTF::String::format("Only UTF-8 character encoding is supported: %s", keyValue.toWTFString(execState).utf8().data())));
+        return deferred->reject(execState, createTypeError(execState, makeString("Only UTF-8 character encoding is supported: ", keyValue.toWTFString(execState))));
     }
 
     WTF::StringBuilder moduleUrl;

src/NativeScript/Interop.mm

@@ -165,7 +165,7 @@ static EncodedJSValue JSC_HOST_CALL interopFuncFree(ExecState* execState) {
 
     if (!pointerValue.inherits(vm, PointerInstance::info())) {
         const char* className = PointerInstance::info()->className;
-        return JSValue::encode(scope.throwException(execState, createError(execState, pointerValue, WTF::String::format("must be a %s.", className), defaultSourceAppender)));
+        return JSValue::encode(scope.throwException(execState, createError(execState, pointerValue, makeString("must be a ", className, "."), defaultSourceAppender)));
     }
 
     PointerInstance* pointer = jsCast<PointerInstance*>(pointerValue);
@@ -187,7 +187,7 @@ static EncodedJSValue JSC_HOST_CALL interopFuncAdopt(ExecState* execState) {
         auto scope = DECLARE_THROW_SCOPE(vm);
 
         const char* className = PointerInstance::info()->className;
-        return JSValue::encode(scope.throwException(execState, createError(execState, WTF::String::format("Argument must be a %s", className))));
+        return JSValue::encode(scope.throwException(execState, createError(execState, makeString("Argument must be a ", className, "."))));
     }
 
     PointerInstance* pointer = jsCast<PointerInstance*>(pointerValue);

src/NativeScript/JSClientData.cpp

@@ -33,7 +33,6 @@
 #include <heap/MarkingConstraint.h>
 #include <heap/SubspaceInlines.h>
 #include <runtime/JSDestructibleObjectHeapCellType.h>
-#include <runtime/JSSegmentedVariableObjectHeapCellType.h>
 #include <runtime/VM.h>
 #include <wtf/MainThread.h>
 

src/NativeScript/LiveEdit/ClearChangedCellsFunctor.cpp

@@ -55,8 +55,7 @@ void ClearChangedCellsFunctor::visit(JSC::HeapCell* heapCell) const {
             if (JSC::FunctionCodeBlock* functionCodeBlock = executable->codeBlockForCall()) {
                 functionCodeBlock->unlinkIncomingCalls();
             }
-            executable->clearNumParametersForCall();
-            auto& subspace = JSC::VM::ScriptExecutableSpaceAndSet::clearableCodeSetFor(*executable->subspace());
+            auto& subspace = JSC::VM::SpaceAndSet::setFor(*executable->subspace());
             executable->clearCode(subspace);
             executable->unlinkedExecutable()->clearCode(m_vm);
         }

src/NativeScript/Marshalling/FunctionReference/FunctionReferenceInstance.h

@@ -27,7 +27,7 @@ class FunctionReferenceInstance : public JSC::InternalFunction {
 
     DECLARE_INFO;
 
-    template <typename CellType>
+    template <typename CellType, JSC::SubspaceAccess mode>
     static JSC::IsoSubspace* subspaceFor(JSC::VM& vm) {
         return &vm.tnsFunctionReferenceInstanceSpace;
     }