From 31f8a9fc695eae266be493b0a16222b50c6079f6 Mon Sep 17 00:00:00 2001 From: Templin Konstantin Date: Wed, 10 Sep 2025 12:58:53 +0300 Subject: [PATCH] Move Set to core Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICX6Y8 Description: - move set to core All required pre-merge tests passed. Results are available in the internal CI. Signed-off-by: Templin Konstantin --- .../plugins/ets/runtime/CMakeLists.txt | 2 +- .../ets/runtime/ets_libbase_runtime.yaml | 6 +- .../ets/runtime/ets_panda_file_items.h | 4 +- .../{escompat_Set.cpp => std_core_Set.cpp} | 0 .../ets/stdlib/escompat/TypedArrays.ets | 12 +- .../ets/stdlib/escompat/TypedUArrays.ets | 10 +- .../ets/stdlib/{escompat => std/core}/Set.ets | 11 +- static_core/plugins/ets/subproject_sources.gn | 2 +- .../ets/templates/stdlib/typedArray.ets.j2 | 2 +- .../ets/templates/stdlib/typedUArray.ets.j2 | 2 +- .../checked/ets_escompat_set_intrinsics.ets | 152 +++++++++--------- ...to_get_type_via_reflection_ext.params.yaml | 6 +- 12 files changed, 108 insertions(+), 101 deletions(-) rename static_core/plugins/ets/runtime/intrinsics/{escompat_Set.cpp => std_core_Set.cpp} (100%) rename static_core/plugins/ets/stdlib/{escompat => std/core}/Set.ets (96%) diff --git a/static_core/plugins/ets/runtime/CMakeLists.txt b/static_core/plugins/ets/runtime/CMakeLists.txt index be56e23fe0..184a79b973 100644 --- a/static_core/plugins/ets/runtime/CMakeLists.txt +++ b/static_core/plugins/ets/runtime/CMakeLists.txt @@ -55,7 +55,7 @@ set(ETS_RUNTIME_SOURCES ${ETS_EXT_SOURCES}/intrinsics/escompat_taskpool.cpp ${ETS_EXT_SOURCES}/intrinsics/escompat_Reflect.cpp ${ETS_EXT_SOURCES}/intrinsics/escompat_Map.cpp - ${ETS_EXT_SOURCES}/intrinsics/escompat_Set.cpp + ${ETS_EXT_SOURCES}/intrinsics/std_core_Set.cpp ${ETS_EXT_SOURCES}/intrinsics/compiler_intrinsics.cpp ${ETS_EXT_SOURCES}/intrinsics/debugger_api.cpp ${ETS_EXT_SOURCES}/intrinsics/std_core_AniHelpers.cpp diff --git a/static_core/plugins/ets/runtime/ets_libbase_runtime.yaml b/static_core/plugins/ets/runtime/ets_libbase_runtime.yaml index 37557a9960..596f5b1acc 100644 --- a/static_core/plugins/ets/runtime/ets_libbase_runtime.yaml +++ b/static_core/plugins/ets/runtime/ets_libbase_runtime.yaml @@ -84,6 +84,9 @@ coretypes: - managed_class: std.core.RWLock mirror_class: ark::ets::EtsRWLock +- managed_class: std.core.Set + mirror_class: ark::ets::EtsEscompatSet + - managed_class: escompat.Array mirror_class: ark::ets::EtsEscompatArray @@ -141,9 +144,6 @@ coretypes: - managed_class: escompat.MapEntry mirror_class: ark::ets::EtsEscompatMapEntry -- managed_class: escompat.Set - mirror_class: ark::ets::EtsEscompatSet - intrinsics_namespace: ark::ets::intrinsics intrinsics: diff --git a/static_core/plugins/ets/runtime/ets_panda_file_items.h b/static_core/plugins/ets/runtime/ets_panda_file_items.h index abbda9808c..d559ac1d42 100644 --- a/static_core/plugins/ets/runtime/ets_panda_file_items.h +++ b/static_core/plugins/ets/runtime/ets_panda_file_items.h @@ -235,9 +235,9 @@ static constexpr std::string_view ARRAY_VALUES_ITERATOR_T = "Lescom static constexpr std::string_view MAP = "Lescompat/Map;"; static constexpr std::string_view MAPENTRY = "Lescompat/MapEntry;"; static constexpr std::string_view MAPITERATOR = "Lescompat/MapIterator;"; -static constexpr std::string_view SETITERATOR = "Lescompat/SetIterator;"; +static constexpr std::string_view SETITERATOR = "Lstd/core/SetIterator;"; static constexpr std::string_view EMPTYMAPITERATOR = "Lescompat/EmptyMapIterator;"; -static constexpr std::string_view SET = "Lescompat/Set;"; +static constexpr std::string_view SET = "Lstd/core/Set;"; static constexpr std::string_view RECORD = "Lescompat/Record;"; static constexpr std::string_view PROCESS = "Lescompat/StdProcess;"; static constexpr std::string_view INT8_ARRAY = "Lescompat/Int8Array;"; diff --git a/static_core/plugins/ets/runtime/intrinsics/escompat_Set.cpp b/static_core/plugins/ets/runtime/intrinsics/std_core_Set.cpp similarity index 100% rename from static_core/plugins/ets/runtime/intrinsics/escompat_Set.cpp rename to static_core/plugins/ets/runtime/intrinsics/std_core_Set.cpp diff --git a/static_core/plugins/ets/stdlib/escompat/TypedArrays.ets b/static_core/plugins/ets/stdlib/escompat/TypedArrays.ets index 12c6a68fb2..8d1d3f9b53 100644 --- a/static_core/plugins/ets/stdlib/escompat/TypedArrays.ets +++ b/static_core/plugins/ets/stdlib/escompat/TypedArrays.ets @@ -617,7 +617,7 @@ export final class Int8Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -2118,7 +2118,7 @@ export final class Int16Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -3608,7 +3608,7 @@ export final class Int32Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -5106,7 +5106,7 @@ export final class BigInt64Array implements Iterable, ArrayLike } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -6573,7 +6573,7 @@ export final class Float32Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -7980,7 +7980,7 @@ export final class Float64Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * diff --git a/static_core/plugins/ets/stdlib/escompat/TypedUArrays.ets b/static_core/plugins/ets/stdlib/escompat/TypedUArrays.ets index 78476e9666..b41a958234 100644 --- a/static_core/plugins/ets/stdlib/escompat/TypedUArrays.ets +++ b/static_core/plugins/ets/stdlib/escompat/TypedUArrays.ets @@ -621,7 +621,7 @@ export final class Uint8ClampedArray implements Iterable, ArrayLike. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -2116,7 +2116,7 @@ export final class Uint8Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -3607,7 +3607,7 @@ export final class Uint16Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -5132,7 +5132,7 @@ export final class Uint32Array implements Iterable, ArrayLike { } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * @@ -6659,7 +6659,7 @@ export final class BigUint64Array implements Iterable, ArrayLike } /** - * Creates an array from a set of type escompat.Set. + * Creates an array from a set of type std.core.Set. * * @param set A set object to convert to an array. * diff --git a/static_core/plugins/ets/stdlib/escompat/Set.ets b/static_core/plugins/ets/stdlib/std/core/Set.ets similarity index 96% rename from static_core/plugins/ets/stdlib/escompat/Set.ets rename to static_core/plugins/ets/stdlib/std/core/Set.ets index b3dce143b4..6e6a6a002f 100644 --- a/static_core/plugins/ets/stdlib/escompat/Set.ets +++ b/static_core/plugins/ets/stdlib/std/core/Set.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -package escompat; +package std.core; export interface ReadonlySet extends Iterable { /** @@ -226,7 +226,14 @@ export class Set implements ReadonlySet { * @param callbackfn to apply */ override forEach(callbackfn: (k: K, v: K, set: Set) => void): void { - iteratorForEach(this.keys(), (x: K): void => callbackfn(x, x, this)) + let it = this.keys(); + while (true) { + const v = it.next() + if (v.done) { + return + } + callbackfn(v.value as K, v.value as K, this) + } } } diff --git a/static_core/plugins/ets/subproject_sources.gn b/static_core/plugins/ets/subproject_sources.gn index 3030854f15..6057a35cf2 100644 --- a/static_core/plugins/ets/subproject_sources.gn +++ b/static_core/plugins/ets/subproject_sources.gn @@ -135,7 +135,7 @@ srcs_runtime = [ "runtime/intrinsics/escompat_RegExp.cpp", "runtime/intrinsics/escompat_TypedArrays.cpp", "runtime/intrinsics/escompat_Map.cpp", - "runtime/intrinsics/escompat_Set.cpp", + "runtime/intrinsics/std_core_Set.cpp", "runtime/intrinsics/compiler_intrinsics.cpp", "runtime/intrinsics/debugger_api.cpp", "runtime/intrinsics/escompat_Date.cpp", diff --git a/static_core/plugins/ets/templates/stdlib/typedArray.ets.j2 b/static_core/plugins/ets/templates/stdlib/typedArray.ets.j2 index dd8983c1e8..d36d43dcf7 100644 --- a/static_core/plugins/ets/templates/stdlib/typedArray.ets.j2 +++ b/static_core/plugins/ets/templates/stdlib/typedArray.ets.j2 @@ -788,7 +788,7 @@ export final class {{N}}Array implements Iterable<{{subsetTypeValues}}>, ArrayLi } /** - * Creates an array from a set of type escompat.Set<{{updatedElementCompat}}>. + * Creates an array from a set of type std.core.Set<{{updatedElementCompat}}>. * * @param set A set object to convert to an array. * diff --git a/static_core/plugins/ets/templates/stdlib/typedUArray.ets.j2 b/static_core/plugins/ets/templates/stdlib/typedUArray.ets.j2 index e53cd8a93c..32964e0696 100644 --- a/static_core/plugins/ets/templates/stdlib/typedUArray.ets.j2 +++ b/static_core/plugins/ets/templates/stdlib/typedUArray.ets.j2 @@ -777,7 +777,7 @@ export final class {{element['name']}}Array implements Iterable<{{element['subse } /** - * Creates an array from a set of type escompat.Set<{{updatedSubsetType}}>. + * Creates an array from a set of type std.core.Set<{{updatedSubsetType}}>. * * @param set A set object to convert to an array. * diff --git a/static_core/plugins/ets/tests/checked/ets_escompat_set_intrinsics.ets b/static_core/plugins/ets/tests/checked/ets_escompat_set_intrinsics.ets index 44cd4a2ec0..32b7a4ceb0 100644 --- a/static_core/plugins/ets/tests/checked/ets_escompat_set_intrinsics.ets +++ b/static_core/plugins/ets/tests/checked/ets_escompat_set_intrinsics.ets @@ -19,11 +19,11 @@ //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::__noinline__SetHas_bool" //! PASS_AFTER "Inline" //! INST_NOT "Intrinsic.SetHas" -//! INST /CallVirtual.*escompat\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::has/ //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::__noinline__SetDelete_bool" //! PASS_AFTER "Inline" //! INST_NOT "Intrinsic.SetDelete" -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! CHECKER AOT PGO: Set overrided intrinsics //! SKIP_IF @architecture == "arm32" @@ -32,11 +32,11 @@ //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::__noinline__SetHas_bool" //! PASS_AFTER "Inline" //! INST_NOT "Intrinsic.SetHas" -//! INST /CallVirtual.*escompat\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::has/ //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::__noinline__SetDelete_bool" //! PASS_AFTER "Inline" //! INST_NOT "Intrinsic.SetDelete" -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! CHECKER JIT: Set overrided intrinsics //! RUN force_jit: true, options: "--compiler-regex='.*(test_set|SetHas|SetDelete)_.*'", entry: "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_bool_double_overrided1" @@ -68,75 +68,75 @@ function __noinline__SetDelete_bool(set: Set): boolean { //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_bool" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_char" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_byte" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_short" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_int" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_long" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_float" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_double" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_string" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! CHECKER AOT PGO: Set intrinsics //! SKIP_IF @architecture == "arm32" @@ -145,75 +145,75 @@ function __noinline__SetDelete_bool(set: Set): boolean { //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_bool" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_char" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_byte" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_short" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_int" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_long" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_float" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_double" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! //! METHOD "ets_escompat_set_intrinsics.ETSGLOBAL::test_set_string" //! PASS_AFTER "IrBuilder" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! PASS_AFTER "Inline" -//! INST /CallVirtual.*escompat\.Set::has/ -//! INST /CallVirtual.*escompat\.Set::delete/ +//! INST /CallVirtual.*std\.core\.Set::has/ +//! INST /CallVirtual.*std\.core\.Set::delete/ //! CHECKER JIT: Set intrinsics //! RUN force_jit: true, options: "--compiler-regex='.*test_set_.*'", entry: "ets_escompat_set_intrinsics.ETSGLOBAL::main" diff --git a/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml b/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml index 370c88a068..ba23a45131 100644 --- a/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml +++ b/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml @@ -60,7 +60,7 @@ cases: - desc: How to get Set via reflection. logic: |- let type_of_set: Type = Type.from>(); - arktest.assertEQ(type_of_set.toString(), "escompat.Set"); + arktest.assertEQ(type_of_set.toString(), "std.core.Set"); - desc: How to get Map via reflection. logic: |- let type_of_map: Type = Type.from>(); @@ -101,7 +101,7 @@ cases: - desc: How to get Set via reflection. logic: |- let type_of_Set: Type = Type.from>(); - arktest.assertEQ(type_of_Set.toString(), "escompat.Set"); + arktest.assertEQ(type_of_Set.toString(), "std.core.Set"); - desc: How to get string via reflection. logic: |- let type_of_string: Type = Type.from(); @@ -138,7 +138,7 @@ cases: - desc: How to get Set via reflection. logic: |- let type_of_Array_set: Type = Type.from>(); - arktest.assertEQ(type_of_Array_set.toString(), "escompat.Set"); + arktest.assertEQ(type_of_Array_set.toString(), "std.core.Set"); - desc: How to get int[] via reflection. logic: |- let type_of_Array_int: Type = Type.from(); -- Gitee