improve: use ctor when map string primitive to string object

Author: shiqimei

quickjs/CMakeLists.txt

@@ -15,7 +15,7 @@ set(MI_OVERRIDE OFF)
 # interprocedural optimization (IPO/LTO)
 include(CheckIPOSupported)
 check_ipo_supported(RESULT supported OUTPUT error)
-if( supported )
+if( supported AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 

quickjs/scripts/build.sh

@@ -5,4 +5,4 @@ set -x
 rm -rf build bin lib 
 mkdir build
 cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -B build -S .
-cmake --build ./build --target qjs -j 8
+cmake --build ./build --target qjs run-test262 -j 8

quickjs/scripts/test.sh

@@ -7,8 +7,8 @@ if [ ! -d test262 ]; then
 fi
 
 cd test262
-git checkout ac1c3546c393d89b37483c3a32eddfe7dd1903a7
-patch -p1 < ../tests/test262.patch
+# git checkout ac1c3546c393d89b37483c3a32eddfe7dd1903a7
+# patch -p1 < ../tests/test262.patch
 cd ..
 touch test262_errors.txt
 ./bin/run-test262 -m -c test262.conf -a

quickjs/src/core/builtins/js-object.c

@@ -30,6 +30,7 @@
 #include "../runtime.h"
 #include "../string.h"
 #include "js-operator.h"
+#include "js-string.h"
 
 void js_object_data_finalizer(JSRuntime* rt, JSValue val) {
   JSObject* p = JS_VALUE_GET_OBJ(val);
@@ -72,18 +73,7 @@ JSValue JS_ToObject(JSContext* ctx, JSValueConst val) {
       obj = JS_NewObjectClass(ctx, JS_CLASS_NUMBER);
       goto set_value;
     case JS_TAG_STRING:
-      /* XXX: should call the string constructor */
-      {
-        JSString* p1 = JS_VALUE_GET_STRING(val);
-        obj = JS_NewObjectClass(ctx, JS_CLASS_STRING);
-        JS_DefinePropertyValue(ctx, obj, JS_ATOM_length, JS_NewInt32(ctx, p1->len), 0);
-
-        // set u.array.count to make it array-like
-        // we check `idx` and `len` in JS_GetPropertyValue
-        JSObject*  p = JS_VALUE_GET_OBJ(obj);
-        p->u.array.count = p1->len;
-      }
-      goto set_value;
+        return js_string_constructor(ctx, ctx->string_ctor, 1, (JSValueConst *)&val);
     case JS_TAG_BOOL:
       obj = JS_NewObjectClass(ctx, JS_CLASS_BOOLEAN);
       goto set_value;

quickjs/src/core/builtins/js-string.c

@@ -139,6 +139,11 @@ JSValue js_string_constructor(JSContext* ctx, JSValueConst new_target, int argc,
     if (!JS_IsException(obj)) {
       JS_SetObjectData(ctx, obj, val);
       JS_DefinePropertyValue(ctx, obj, JS_ATOM_length, JS_NewInt32(ctx, p1->len), 0);
+
+      // set u.array.count to make it array-like
+      // See: `idx` and `len` in JS_GetPropertyValue
+      JSObject*  p = JS_VALUE_GET_OBJ(obj);
+      p->u.array.count = p1->len;
     }
     return obj;
   } else {

quickjs/src/core/runtime.c

@@ -2558,6 +2558,7 @@ void JS_AddIntrinsicBaseObjects(JSContext* ctx) {
   ctx->class_proto[JS_CLASS_STRING] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT], JS_CLASS_STRING);
   JS_SetObjectData(ctx, ctx->class_proto[JS_CLASS_STRING], JS_AtomToString(ctx, JS_ATOM_empty_string));
   obj = JS_NewGlobalCConstructor(ctx, "String", js_string_constructor, 1, ctx->class_proto[JS_CLASS_STRING]);
+  ctx->string_ctor = JS_DupValue(ctx, obj);
   JS_SetPropertyFunctionList(ctx, obj, js_string_funcs, countof(js_string_funcs));
   JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_STRING], js_string_proto_funcs, countof(js_string_proto_funcs));
 

quickjs/src/core/types.h

@@ -356,6 +356,7 @@ struct JSContext {
     JSValue *class_proto;
     JSValue function_proto;
     JSValue function_ctor;
+    JSValue string_ctor;
     JSValue array_ctor;
     JSValue regexp_ctor;
     JSValue promise_ctor;