Add duk_seal(), duk_freeze()

svaarala · svaarala · commit eb795ff35c91 · 2017-06-30T04:05:46.000+03:00
diff --git a/src-input/duk_api_internal.h b/src-input/duk_api_internal.h
@@ -303,6 +303,8 @@ DUK_INTERNAL_DECL void duk_pop_undefined(duk_context *ctx);
 
 DUK_INTERNAL_DECL void duk_compact_m1(duk_context *ctx);
 
+DUK_INTERNAL_DECL void duk_seal_freeze_raw(duk_context *ctx, duk_idx_t obj_idx, duk_bool_t is_freeze);
+
 DUK_INTERNAL_DECL void duk_insert_undefined(duk_context *ctx, duk_idx_t idx);
 DUK_INTERNAL_DECL void duk_insert_undefined_n(duk_context *ctx, duk_idx_t idx, duk_idx_t count);
 
diff --git a/src-input/duk_api_object.c b/src-input/duk_api_object.c
@@ -543,6 +543,67 @@ DUK_EXTERNAL duk_bool_t duk_next(duk_context *ctx, duk_idx_t enum_index, duk_boo
 	return duk_hobject_enumerator_next(ctx, get_value);
 }
 
+DUK_INTERNAL void duk_seal_freeze_raw(duk_context *ctx, duk_idx_t obj_idx, duk_bool_t is_freeze) {
+	duk_hthread *thr = (duk_hthread *) ctx;
+	duk_tval *tv;
+	duk_hobject *h;
+
+	tv = duk_require_tval(ctx, obj_idx);
+	DUK_ASSERT(tv != NULL);
+
+	/* Seal/freeze are quite rare in practice so it'd be nice to get the
+	 * correct behavior simply via automatic promotion (at the cost of some
+	 * memory churn).  However, the promoted objects don't behave the same,
+	 * e.g. promoted lightfuncs are extensible.
+	 */
+
+	switch (DUK_TVAL_GET_TAG(tv)) {
+	case DUK_TAG_BUFFER:
+		/* Plain buffer: already sealed, but not frozen (and can't be frozen
+		 * because index properties can't be made non-writable.
+		 */
+		if (is_freeze) {
+			goto fail_cannot_freeze;
+		}
+		break;
+	case DUK_TAG_LIGHTFUNC:
+		/* Lightfunc: already sealed and frozen, success. */
+		break;
+	case DUK_TAG_OBJECT:
+		h = DUK_TVAL_GET_OBJECT(tv);
+		DUK_ASSERT(h != NULL);
+		if (is_freeze && DUK_HOBJECT_IS_BUFOBJ(h)) {
+			/* Buffer objects cannot be frozen because there's no internal
+			 * support for making virtual array indices non-writable.
+			 */
+			DUK_DD(DUK_DDPRINT("cannot freeze a buffer object"));
+			goto fail_cannot_freeze;
+		}
+		duk_hobject_object_seal_freeze_helper(thr, h, is_freeze);
+
+		/* Sealed and frozen objects cannot gain any more properties,
+		 * so this is a good time to compact them.
+		 */
+		duk_hobject_compact_props(thr, h);
+		break;
+	default:
+		/* ES2015 Sections 19.1.2.5, 19.1.2.17 */
+		break;
+	}
+	return;
+
+ fail_cannot_freeze:
+	DUK_ERROR_TYPE_INVALID_ARGS(thr);  /* XXX: proper error message */
+}
+
+DUK_EXTERNAL void duk_seal(duk_context *ctx, duk_idx_t obj_idx) {
+	duk_seal_freeze_raw(ctx, obj_idx, 0 /*is_freeze*/);
+}
+
+DUK_EXTERNAL void duk_freeze(duk_context *ctx, duk_idx_t obj_idx) {
+	duk_seal_freeze_raw(ctx, obj_idx, 1 /*is_freeze*/);
+}
+
 /*
  *  Helpers for writing multiple properties
  */
diff --git a/src-input/duk_bi_object.c b/src-input/duk_bi_object.c
@@ -226,58 +226,10 @@ DUK_INTERNAL duk_ret_t duk_bi_object_constructor_define_properties(duk_context *
 
 #if defined(DUK_USE_OBJECT_BUILTIN)
 DUK_INTERNAL duk_ret_t duk_bi_object_constructor_seal_freeze_shared(duk_context *ctx) {
-	duk_hthread *thr = (duk_hthread *) ctx;
-	duk_hobject *h;
-	duk_bool_t is_freeze;
-
 	DUK_ASSERT_TOP(ctx, 1);
 
-	is_freeze = (duk_bool_t) duk_get_current_magic(ctx);
-	if (duk_is_buffer(ctx, 0)) {
-		/* Plain buffer: already sealed, but not frozen (and can't be frozen
-		 * because index properties can't be made non-writable.
-		 */
-		if (is_freeze) {
-			goto fail_cannot_freeze;
-		}
-		return 1;
-	} else if (duk_is_lightfunc(ctx, 0)) {
-		/* Lightfunc: already sealed and frozen, success. */
-		return 1;
-	}
-#if 0
-	/* Seal/freeze are quite rare in practice so it'd be nice to get the
-	 * correct behavior simply via automatic promotion (at the cost of some
-	 * memory churn).  However, the promoted objects don't behave the same,
-	 * e.g. promoted lightfuncs are extensible.
-	 */
-	h = duk_require_hobject_promote_mask(ctx, 0, DUK_TYPE_MASK_LIGHTFUNC | DUK_TYPE_MASK_BUFFER);
-#endif
-
-	h = duk_get_hobject(ctx, 0);
-	if (h == NULL) {
-		/* ES2015 Sections 19.1.2.5, 19.1.2.17 */
-		return 1;
-	}
-
-	if (is_freeze && DUK_HOBJECT_IS_BUFOBJ(h)) {
-		/* Buffer objects cannot be frozen because there's no internal
-		 * support for making virtual array indices non-writable.
-		 */
-		DUK_DD(DUK_DDPRINT("cannot freeze a buffer object"));
-		goto fail_cannot_freeze;
-	}
-
-	duk_hobject_object_seal_freeze_helper(thr, h, is_freeze);
-
-	/* Sealed and frozen objects cannot gain any more properties,
-	 * so this is a good time to compact them.
-	 */
-	duk_hobject_compact_props(thr, h);
+	duk_seal_freeze_raw(ctx, 0, (duk_bool_t) duk_get_current_magic(ctx) /*is_freeze*/);
 	return 1;
-
- fail_cannot_freeze:
-	DUK_DCERROR_TYPE_INVALID_ARGS(thr);  /* XXX: proper error message */
 }
 #endif  /* DUK_USE_OBJECT_BUILTIN */
 
diff --git a/src-input/duktape.h.in b/src-input/duktape.h.in
@@ -914,6 +914,8 @@ DUK_EXTERNAL_DECL void duk_put_number_list(duk_context *ctx, duk_idx_t obj_idx,
 DUK_EXTERNAL_DECL void duk_compact(duk_context *ctx, duk_idx_t obj_idx);
 DUK_EXTERNAL_DECL void duk_enum(duk_context *ctx, duk_idx_t obj_idx, duk_uint_t enum_flags);
 DUK_EXTERNAL_DECL duk_bool_t duk_next(duk_context *ctx, duk_idx_t enum_idx, duk_bool_t get_value);
+DUK_EXTERNAL_DECL void duk_seal(duk_context *ctx, duk_idx_t obj_idx);
+DUK_EXTERNAL_DECL void duk_freeze(duk_context *ctx, duk_idx_t obj_idx);
 
 /*
  *  String manipulation
