Apply quickjspp patches on latest QuickJS

Author: DarcJC

quickjs.c

@@ -277,6 +277,9 @@ struct JSRuntime {
 
  JSHostPromiseRejectionTracker *host_promise_rejection_tracker;
  void *host_promise_rejection_tracker_opaque;
+
+ JSHostPromiseRejectionTracker *host_unhandled_promise_rejection_tracker;
+ void *host_unhandled_promise_rejection_tracker_opaque;
 
  struct list_head job_list; /* list of JSJobEntry.link */
 
@@ -3398,6 +3401,16 @@ JSClassID JS_NewClassID(JSClassID *pclass_id)
  return class_id;
 }
 
+JSClassID JS_GetClassID(JSValueConst v)
+{
+ JSObject* obj;
+ if (JS_VALUE_GET_TAG(v) != JS_TAG_OBJECT) 
+ return 0;
+ obj = JS_VALUE_GET_OBJ(v);
+ assert(obj != NULL);
+ return obj->class_id;
+}
+
 BOOL JS_IsRegisteredClass(JSRuntime *rt, JSClassID class_id)
 {
  return (class_id < rt->class_count &&
@@ -7898,6 +7911,9 @@ static JSValue JS_GetPropertyValue(JSContext *ctx, JSValueConst this_obj,
  uint32_t idx;
  /* fast path for array access */
  p = JS_VALUE_GET_OBJ(this_obj);
+ if (unlikely(p->fast_array)) {
+ goto slow_path;
+ }
  idx = JS_VALUE_GET_INT(prop);
  switch(p->class_id) {
  case JS_CLASS_ARRAY:
@@ -47663,6 +47679,7 @@ typedef struct JSPromiseData {
  struct list_head promise_reactions[2];
  BOOL is_handled; /* Note: only useful to debug */
  JSValue promise_result;
+ JSContext *ctx;
 } JSPromiseData;
 
 typedef struct JSPromiseFunctionDataResolved {
@@ -47759,6 +47776,12 @@ void JS_SetHostPromiseRejectionTracker(JSRuntime *rt,
  rt->host_promise_rejection_tracker_opaque = opaque;
 }
 
+void JS_SetHostUnhandledPromiseRejectionTracker(JSRuntime * rt, JSHostPromiseRejectionTracker * cb, void * opaque)
+{
+ rt->host_unhandled_promise_rejection_tracker = cb;
+ rt->host_unhandled_promise_rejection_tracker_opaque = opaque;
+}
+
 static void fulfill_or_reject_promise(JSContext *ctx, JSValueConst promise,
  JSValueConst value, BOOL is_reject)
 {
@@ -47963,6 +47986,11 @@ static void js_promise_finalizer(JSRuntime *rt, JSValue val)
 
  if (!s)
  return;
+ if (s->promise_state == JS_PROMISE_REJECTED && !s->is_handled) {
+ if (rt->host_unhandled_promise_rejection_tracker) {
+ rt->host_unhandled_promise_rejection_tracker(s->ctx, val, s->promise_result, FALSE, rt->host_unhandled_promise_rejection_tracker_opaque);
+ }
+ }
  for(i = 0; i < 2; i++) {
  list_for_each_safe(el, el1, &s->promise_reactions[i]) {
  JSPromiseReactionData *rd =
@@ -48013,6 +48041,7 @@ static JSValue js_promise_constructor(JSContext *ctx, JSValueConst new_target,
  s = js_mallocz(ctx, sizeof(*s));
  if (!s)
  goto fail;
+ s->ctx = ctx;
  s->promise_state = JS_PROMISE_PENDING;
  s->is_handled = FALSE;
  for(i = 0; i < 2; i++)

quickjs.h

@@ -500,6 +500,7 @@ typedef struct JSClassDef {
 } JSClassDef;
 
 JSClassID JS_NewClassID(JSClassID *pclass_id);
+JSClassID JS_GetClassID(JSValueConst v);
 int JS_NewClass(JSRuntime *rt, JSClassID class_id, const JSClassDef *class_def);
 int JS_IsRegisteredClass(JSRuntime *rt, JSClassID class_id);
 
@@ -849,6 +850,7 @@ typedef void JSHostPromiseRejectionTracker(JSContext *ctx, JSValueConst promise,
  JSValueConst reason,
  JS_BOOL is_handled, void *opaque);
 void JS_SetHostPromiseRejectionTracker(JSRuntime *rt, JSHostPromiseRejectionTracker *cb, void *opaque);
+void JS_SetHostUnhandledPromiseRejectionTracker(JSRuntime *rt, JSHostPromiseRejectionTracker *cb, void *opaque);
 
 /* return != 0 if the JS code needs to be interrupted */
 typedef int JSInterruptHandler(JSRuntime *rt, void *opaque);