diff --git a/static_core/plugins/ets/runtime/interop_js/interop_context.cpp b/static_core/plugins/ets/runtime/interop_js/interop_context.cpp index e33c9d5cad9ebbb8fb626d3c5a8dbd2e44f85caf..4c0d6c1a01070f709081b6bad00b022bd5875bd2 100644 --- a/static_core/plugins/ets/runtime/interop_js/interop_context.cpp +++ b/static_core/plugins/ets/runtime/interop_js/interop_context.cpp @@ -298,7 +298,6 @@ void InteropCtx::SharedEtsVmState::CacheClasses(EtsClassLinker *etsClassLinker) boxLongClass = CacheClass(etsClassLinker, descriptors::BOX_LONG); arrayClass = CacheClass(etsClassLinker, descriptors::ARRAY); - arraybufClass = CacheClass(etsClassLinker, descriptors::ARRAY_BUFFER); arrayAsListIntClass = CacheClass(etsClassLinker, descriptors::ARRAY_AS_LIST_INT); diff --git a/static_core/plugins/ets/runtime/interop_js/interop_context.h b/static_core/plugins/ets/runtime/interop_js/interop_context.h index cb152449025bf6449ea682aee9b8e7fa4cc13b1c..2d5b2fdcb04f29efbe4c2ec7ff4afb73a07e0be3 100644 --- a/static_core/plugins/ets/runtime/interop_js/interop_context.h +++ b/static_core/plugins/ets/runtime/interop_js/interop_context.h @@ -369,11 +369,6 @@ public: return sharedEtsVmState_->arrayClass; } - Class *GetArrayBufferClass() const - { - return sharedEtsVmState_->arraybufClass; - } - bool IsFunctionalInterface(Class *klass) const { return sharedEtsVmState_->functionalInterfaces.count(klass) > 0; @@ -536,7 +531,6 @@ private: Class *exceptionClass {}; Class *typeClass {}; Class *arrayClass {}; - Class *arraybufClass {}; Class *boxIntClass {}; Class *boxLongClass {}; PandaSet functionalInterfaces {}; diff --git a/static_core/plugins/ets/runtime/interop_js/js_convert.h b/static_core/plugins/ets/runtime/interop_js/js_convert.h index 6ad6be56d33a6c59940cbc6b75cc7f4e9becd924..4b2250bb7f67ddbb8f45e9429a8826108abd3d62 100644 --- a/static_core/plugins/ets/runtime/interop_js/js_convert.h +++ b/static_core/plugins/ets/runtime/interop_js/js_convert.h @@ -368,40 +368,6 @@ JSCONVERT_UNWRAP(Promise) return hpromise.GetPtr(); } -JSCONVERT_DEFINE_TYPE(ArrayBuffer, EtsEscompatArrayBuffer *); - -JSCONVERT_WRAP(ArrayBuffer) -{ - napi_value buf; - void *data; - // NOTE(dslynko, #23919): finalize semantics of resizable ArrayBuffers - NAPI_CHECK_FATAL(napi_create_arraybuffer(env, etsVal->GetByteLength(), &data, &buf)); - std::copy_n(reinterpret_cast(etsVal->GetData()), etsVal->GetByteLength(), - reinterpret_cast(data)); - return buf; -} - -JSCONVERT_UNWRAP(ArrayBuffer) -{ - bool isArraybuf = false; - NAPI_CHECK_FATAL(napi_is_arraybuffer(env, jsVal, &isArraybuf)); - if (!isArraybuf) { - InteropCtx::Fatal("Passed object is not an ArrayBuffer!"); - UNREACHABLE(); - } - void *data = nullptr; - size_t byteLength = 0; - // NOTE(dslynko, #23919): finalize semantics of resizable ArrayBuffers - NAPI_CHECK_FATAL(napi_get_arraybuffer_info(env, jsVal, &data, &byteLength)); - auto *currentCoro = EtsCoroutine::GetCurrent(); - [[maybe_unused]] EtsHandleScope s(currentCoro); - void *etsData = nullptr; - auto *arrayBuffer = EtsEscompatArrayBuffer::Create(currentCoro, byteLength, &etsData); - EtsHandle hbuffer(currentCoro, arrayBuffer); - std::copy_n(reinterpret_cast(data), byteLength, reinterpret_cast(etsData)); - return hbuffer.GetPtr(); -} - JSCONVERT_DEFINE_TYPE(EtsNull, EtsObject *); JSCONVERT_WRAP(EtsNull) { diff --git a/static_core/plugins/ets/runtime/interop_js/js_refconvert_builtin.cpp b/static_core/plugins/ets/runtime/interop_js/js_refconvert_builtin.cpp index 9d7d59b00c042fd88752137a04bb3fed47ea76e9..559050de2f2fe51ff36d6c9ac78f19c1822c61c6 100644 --- a/static_core/plugins/ets/runtime/interop_js/js_refconvert_builtin.cpp +++ b/static_core/plugins/ets/runtime/interop_js/js_refconvert_builtin.cpp @@ -372,14 +372,6 @@ private: if (isInstanceof) { return MArray(ctxx, jsValue); } - NAPI_CHECK_FATAL(napi_is_arraybuffer(env, jsValue, &isInstanceof)); - if (isInstanceof) { - return BuiltinConvert(ctxx, env, jsValue); - } - NAPI_CHECK_FATAL(napi_is_typedarray(env, jsValue, &isInstanceof)); - if (isInstanceof) { - NotImplemented("TypedArray"); - } NAPI_CHECK_FATAL(napi_is_map(env, jsValue, &isInstanceof)); if (isInstanceof) { return MMap(ctxx, jsValue); @@ -400,10 +392,6 @@ private: if (isInstanceof) { return MDate(ctxx, jsValue); } - NAPI_CHECK_FATAL(napi_is_dataview(env, jsValue, &isInstanceof)); - if (isInstanceof) { - NotImplemented("DataView"); - } if (IsConstructor(env, jsValue, CONSTRUCTOR_NAME_NUMBER)) { return BuiltinConvert(ctxx, env, jsValue); } @@ -551,7 +539,6 @@ void RegisterBuiltinJSRefConvertors(InteropCtx *ctx) RegisterBuiltinRefConvertor(cache, ctx->GetStringClass()); RegisterBuiltinRefConvertor(cache, ctx->GetBigIntClass()); RegisterBuiltinRefConvertor(cache, ctx->GetPromiseClass()); - RegisterBuiltinRefConvertor(cache, ctx->GetArrayBufferClass()); RegisterBuiltinRefConvertor(cache, ctx->GetNullValueClass()); RegisterBuiltinRefConvertor(cache, ptypes->coreBoolean->GetRuntimeClass()); diff --git a/static_core/plugins/ets/tests/interop_js/tests/escompat/escompat_array_buffer.cpp b/static_core/plugins/ets/tests/interop_js/tests/escompat/escompat_array_buffer.cpp index c766832bf56449504ca988ea4a60d441a2787bef..811a39d605f8348db5e40ddd0ec1acfce2225c59 100644 --- a/static_core/plugins/ets/tests/interop_js/tests/escompat/escompat_array_buffer.cpp +++ b/static_core/plugins/ets/tests/interop_js/tests/escompat/escompat_array_buffer.cpp @@ -19,22 +19,22 @@ namespace ark::ets::interop::js::testing { class ESCompatArrayBufferTest : public EtsInteropTest {}; -TEST_F(ESCompatArrayBufferTest, compat_array_buffer_length) +TEST_F(ESCompatArrayBufferTest, DISABLED_compat_array_buffer_length) { ASSERT_EQ(true, RunJsTestSuite("array_buffer_js_suites/test_length.js")); } -TEST_F(ESCompatArrayBufferTest, compat_array_buffer_is_view) +TEST_F(ESCompatArrayBufferTest, DISABLED_compat_array_buffer_is_view) { ASSERT_EQ(true, RunJsTestSuite("array_buffer_js_suites/test_is_view.js")); } -TEST_F(ESCompatArrayBufferTest, compat_array_buffer_slice) +TEST_F(ESCompatArrayBufferTest, DISABLED_compat_array_buffer_slice) { ASSERT_EQ(true, RunJsTestSuite("array_buffer_js_suites/test_slice.js")); } -TEST_F(ESCompatArrayBufferTest, compat_array_buffer_resize) +TEST_F(ESCompatArrayBufferTest, DISABLED_compat_array_buffer_resize) { ASSERT_EQ(true, RunJsTestSuite("array_buffer_js_suites/test_resize.js")); } diff --git a/static_core/plugins/ets/tests/interop_js/tests/scenarios/js_to_ets/conflict_types.cpp b/static_core/plugins/ets/tests/interop_js/tests/scenarios/js_to_ets/conflict_types.cpp index 90d89a5d028bdd15fae08c220e8c29e4efd835b1..812bff216f1f683d3afa07b51f422d50aa2e65e2 100644 --- a/static_core/plugins/ets/tests/interop_js/tests/scenarios/js_to_ets/conflict_types.cpp +++ b/static_core/plugins/ets/tests/interop_js/tests/scenarios/js_to_ets/conflict_types.cpp @@ -27,7 +27,7 @@ TEST_F(EtsInteropScenariosJsToEtsConflictTypes, DISABLED_Test_function_arg_type_ ASSERT_EQ(ret, true); } -TEST_F(EtsInteropScenariosJsToEtsConflictTypes, Test_function_arg_type_conflict_arraybuffer) +TEST_F(EtsInteropScenariosJsToEtsConflictTypes, DISABLED_Test_function_arg_type_conflict_arraybuffer) { auto ret = CallEtsFunction(GetPackageName(), "TestFunctionArgTypeConflictArraybuffer"); ASSERT_EQ(ret, true); diff --git a/static_core/plugins/ets/tests/interop_js/tests/setter/ts_to_ets/setter_ts.cpp b/static_core/plugins/ets/tests/interop_js/tests/setter/ts_to_ets/setter_ts.cpp index 48e830f07ace9a951a2a921dcd5ade6bb38574bd..9f2710720fd397f2da38b76385039b137d778f49 100644 --- a/static_core/plugins/ets/tests/interop_js/tests/setter/ts_to_ets/setter_ts.cpp +++ b/static_core/plugins/ets/tests/interop_js/tests/setter/ts_to_ets/setter_ts.cpp @@ -20,7 +20,7 @@ namespace ark::ets::interop::js::testing { class EtsSetterTsToEtsTest : public EtsInteropTest {}; -TEST_F(EtsSetterTsToEtsTest, check_abstract_сlass_setter) +TEST_F(EtsSetterTsToEtsTest, check_abstract_class_setter) { ASSERT_EQ(true, CallEtsFunction(GetPackageName(), "checkAbstractClassSetter")); }