From 364a99bcef001b650eceea300454f54ab78b222a Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Sat, 13 Sep 2025 17:18:23 +0800 Subject: [PATCH] Remove the toolchain pass chain Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICXUC1?from=project-issue Signed-off-by: qianyong325 --- BUILD.gn | 1 + common_components/base/atomic_spin_lock.h | 2 +- common_components/base/c_string.h | 2 +- common_components/base/globals.h | 2 +- common_components/base/spin_lock.h | 2 +- common_components/base/time_utils.h | 2 +- common_components/base/utf_helper.h | 2 +- common_components/common/base_object.h | 2 +- common_components/common/work_stack.h | 2 +- .../common_runtime/base_runtime_param.h | 4 ++-- common_components/common_runtime/hooks.h | 4 ++-- common_components/heap/allocator/memory_map.h | 2 +- common_components/heap/allocator/regional_heap.h | 2 +- common_components/heap/ark_collector/ark_collector.h | 2 +- common_components/heap/collector/collector.h | 4 ++-- common_components/heap/collector/gc_request.h | 2 +- common_components/heap/collector/gc_stats.h | 2 +- .../heap/collector/heuristic_gc_policy.h | 2 +- common_components/heap/heap.h | 6 +++--- common_components/heap/heap_manager.h | 2 +- common_components/heap/space/regional_space.h | 2 +- common_components/log/log_base.h | 2 +- common_components/mutator/mutator.h | 4 ++-- common_components/mutator/mutator.inline.h | 2 +- .../objects/string_table/hashtriemap-inl.h | 4 ++-- common_components/objects/string_table/hashtriemap.h | 4 ++-- .../objects/string_table/integer_cache.h | 2 +- common_components/objects/string_table_internal.h | 4 ++-- common_components/platform/mutex.h | 2 +- common_components/taskpool/runner.h | 2 +- common_components/taskpool/task.h | 2 +- common_components/taskpool/task_queue.h | 2 +- common_components/taskpool/taskpool.h | 2 +- ecmascript/base/block_hook_scope.h | 2 +- ecmascript/base/config.h | 2 +- ecmascript/base/dtoa_helper.h | 2 +- ecmascript/base/gc_ring_buffer.h | 2 +- ecmascript/base/hash_combine.h | 2 +- ecmascript/base/json_helper.h | 2 +- ecmascript/base/string_helper.h | 2 +- ecmascript/common.h | 2 +- ecmascript/compiler/aot_compiler_preprocessor.h | 2 +- .../aot_snapshot/snapshot_constantpool_data.h | 2 +- ecmascript/compiler/binary_section.h | 2 +- ecmascript/compiler/bytecode_circuit_builder.h | 2 +- ecmascript/compiler/bytecode_info_collector.h | 2 +- ecmascript/compiler/bytecodes.h | 6 +++--- ecmascript/compiler/call_signature.h | 4 ++-- ecmascript/compiler/circuit.h | 2 +- ecmascript/compiler/gate.h | 2 +- ecmascript/compiler/gate_meta_data_builder.h | 2 +- ecmascript/compiler/hcr_gate_meta_data.h | 2 +- ecmascript/compiler/lcr_gate_meta_data.h | 2 +- ecmascript/compiler/mcr_gate_meta_data.h | 2 +- ecmascript/compiler/pgo_bc_info.h | 2 +- ecmascript/compiler/share_gate_meta_data.h | 2 +- ecmascript/compiler/type_info_accessors.h | 2 +- ecmascript/cross_vm/cross_vm_operator.h | 2 +- ecmascript/cross_vm/dynamic_object_accessor.h | 4 ++-- ecmascript/cross_vm/dynamic_object_descriptor.h | 4 ++-- ecmascript/cross_vm/dynamic_type_converter.h | 4 ++-- ecmascript/debugger/dropframe_manager.h | 2 +- ecmascript/debugger/js_debugger_manager.h | 2 +- ecmascript/debugger/js_pt_location.h | 4 ++-- ecmascript/debugger/js_pt_method.h | 4 ++-- ecmascript/dfx/cpu_profiler/sampling_processor.h | 2 +- ecmascript/dfx/hprof/heap_profiler_interface.h | 2 +- ecmascript/dfx/hprof/heap_tracker.h | 2 +- ecmascript/dfx/vm_thread_control.h | 2 +- ecmascript/dfx/vmstat/caller_stat.h | 2 +- ecmascript/ecma_param_configuration.h | 2 +- ecmascript/ecma_string-inl.h | 2 +- ecmascript/ecma_string.h | 12 ++++++------ ecmascript/ecma_string_table.h | 4 ++-- ecmascript/ecma_vm.h | 2 +- ecmascript/global_env_constants.h | 2 +- ecmascript/interpreter/interpreter.h | 2 +- ecmascript/js_api/js_api_deque.h | 2 +- ecmascript/js_api/js_api_deque_iterator.h | 2 +- ecmascript/js_handle.h | 2 +- ecmascript/js_hclass.h | 4 ++-- ecmascript/js_runtime_options.h | 6 +++--- ecmascript/js_thread.h | 6 +++--- ecmascript/jspandafile/bytecode_inst/instruction.h | 2 +- ecmascript/jspandafile/constpool_value.h | 2 +- ecmascript/jspandafile/debug_info_extractor.h | 6 +++--- ecmascript/jspandafile/js_pandafile.h | 6 +++--- ecmascript/jspandafile/literal_data_extractor.h | 2 +- ecmascript/jspandafile/method_literal.h | 2 +- ecmascript/jspandafile/panda_file_translator.h | 4 ++-- ecmascript/jspandafile/program_object.h | 4 ++-- ecmascript/mem/allocation_inspector.h | 2 +- ecmascript/mem/assert_scope.h | 2 +- ecmascript/mem/barriers.h | 4 ++-- ecmascript/mem/clock_scope.h | 2 +- ecmascript/mem/dynamic_object_operator.h | 6 +++--- ecmascript/mem/free_object_list.h | 2 +- ecmascript/mem/free_object_set.h | 2 +- ecmascript/mem/garbage_collector.h | 2 +- ecmascript/mem/gc_key_stats.h | 2 +- ecmascript/mem/gc_stats.h | 2 +- ecmascript/mem/heap-inl.h | 4 ++-- ecmascript/mem/idle_gc_trigger.h | 2 +- ecmascript/mem/machine_code.h | 2 +- ecmascript/mem/mark_word.h | 2 +- ecmascript/mem/object_xray.h | 2 +- ecmascript/mem/tagged_object.h | 4 ++-- ecmascript/mem/tagged_state_word.h | 4 ++-- ecmascript/mem/visitor.h | 2 +- ecmascript/method.h | 2 +- ecmascript/module/accessor/module_data_accessor.h | 4 ++-- ecmascript/napi/include/dfx_jsnapi.h | 2 +- ecmascript/napi/include/jsnapi.h | 2 +- ecmascript/napi/include/jsnapi_expo.h | 2 +- ecmascript/object_factory.h | 2 +- ecmascript/object_operator.h | 2 +- ecmascript/ohos/aot_runtime_info.h | 2 +- ecmascript/ohos/enable_aot_list_helper.h | 2 +- ecmascript/ohos/framework_helper.h | 2 +- ecmascript/ohos/ohos_preload_app_info.h | 2 +- ecmascript/pgo_profiler/ap_file/pgo_file_info.h | 4 ++-- .../pgo_profiler/ap_file/pgo_profile_type_pool.h | 2 +- .../ap_file/pgo_proto_transition_type_pool.h | 2 +- ecmascript/pgo_profiler/ap_file/pgo_record_pool.h | 2 +- ecmascript/pgo_profiler/pgo_context.h | 2 +- ecmascript/pgo_profiler/pgo_info.h | 2 +- ecmascript/pgo_profiler/pgo_profiler_encoder.h | 2 +- ecmascript/pgo_profiler/pgo_profiler_info.h | 2 +- ecmascript/pgo_profiler/pgo_utils.h | 2 +- ecmascript/pgo_profiler/types/pgo_profile_type.h | 4 ++-- ecmascript/pgo_profiler/types/pgo_profiler_type.h | 4 ++-- ecmascript/platform/mutex.h | 2 +- ecmascript/property_attributes.h | 2 +- ecmascript/runtime.h | 4 ++-- ecmascript/shared_objects/concurrent_api_scope.h | 2 +- ecmascript/snapshot/mem/encode_bit.h | 2 +- ecmascript/snapshot/mem/snapshot.h | 2 +- ecmascript/snapshot/mem/snapshot_processor.h | 2 +- ecmascript/stackmap/ark_stackmap_builder.h | 2 +- ecmascript/stackmap/llvm/llvm_stackmap_type.h | 2 +- ecmascript/ts_types/global_ts_type_ref.h | 2 +- 141 files changed, 186 insertions(+), 185 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index eeb318d6af..b14ae7b2bf 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1746,6 +1746,7 @@ ohos_shared_library("libark_jsruntime") { "icu:shared_icuuc", "runtime_core:arkplatform_header", "runtime_core:common_interfaces_header", + "runtime_core:runtime_core_header", ] } innerapi_tags = [ "platformsdk_indirect" ] diff --git a/common_components/base/atomic_spin_lock.h b/common_components/base/atomic_spin_lock.h index f267cd4465..777792b229 100755 --- a/common_components/base/atomic_spin_lock.h +++ b/common_components/base/atomic_spin_lock.h @@ -18,7 +18,7 @@ #include -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { class AtomicSpinLock { diff --git a/common_components/base/c_string.h b/common_components/base/c_string.h index 959607a29b..36a1e4817f 100755 --- a/common_components/base/c_string.h +++ b/common_components/base/c_string.h @@ -19,7 +19,7 @@ #include #include -#include "common_interfaces/base/common.h" +#include "base/common.h" #include "securec.h" namespace common { diff --git a/common_components/base/globals.h b/common_components/base/globals.h index 6321c95796..9ad5ec1e35 100755 --- a/common_components/base/globals.h +++ b/common_components/base/globals.h @@ -19,7 +19,7 @@ #include #include "common_components/base/ark_sanitizer.h" -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { // Time Factors diff --git a/common_components/base/spin_lock.h b/common_components/base/spin_lock.h index bfe8b71578..34fb539dd0 100755 --- a/common_components/base/spin_lock.h +++ b/common_components/base/spin_lock.h @@ -18,7 +18,7 @@ #include -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { class SpinLock { diff --git a/common_components/base/time_utils.h b/common_components/base/time_utils.h index 049ff029de..7335408ada 100755 --- a/common_components/base/time_utils.h +++ b/common_components/base/time_utils.h @@ -19,7 +19,7 @@ #include #include "common_components/base/c_string.h" -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { namespace TimeUtil { diff --git a/common_components/base/utf_helper.h b/common_components/base/utf_helper.h index b2c7e02494..d0dd8556ec 100644 --- a/common_components/base/utf_helper.h +++ b/common_components/base/utf_helper.h @@ -20,7 +20,7 @@ #include #include -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common::utf_helper { constexpr size_t HI_SURROGATE_MIN = 0xd800; diff --git a/common_components/common/base_object.h b/common_components/common/base_object.h index 51b818cd58..a8233de186 100755 --- a/common_components/common/base_object.h +++ b/common_components/common/base_object.h @@ -16,7 +16,7 @@ #ifndef COMMON_COMPONENTS_COMMON_BASE_OBJECT_H #define COMMON_COMPONENTS_COMMON_BASE_OBJECT_H -#include "common_interfaces/objects/base_object.h" +#include "objects/base_object.h" namespace common { using common::BaseObject; using ObjectPtr = BaseObject*; diff --git a/common_components/common/work_stack.h b/common_components/common/work_stack.h index b42928753e..5da721da7a 100644 --- a/common_components/common/work_stack.h +++ b/common_components/common/work_stack.h @@ -19,7 +19,7 @@ #include #include -#include "common_interfaces/base/common.h" +#include "base/common.h" #include "common_components/log/log.h" namespace common { diff --git a/common_components/common_runtime/base_runtime_param.h b/common_components/common_runtime/base_runtime_param.h index d8b68cd2e6..412b3efb02 100755 --- a/common_components/common_runtime/base_runtime_param.h +++ b/common_components/common_runtime/base_runtime_param.h @@ -17,8 +17,8 @@ #define COMMON_COMPONENTS_BASE_RUNTIME_BASE_RUNTIME_PARAM_H #include "common_components/base/globals.h" -#include "common_interfaces/base/common.h" -#include "common_interfaces/base/runtime_param.h" +#include "base/common.h" +#include "base/runtime_param.h" namespace common { class BaseRuntimeParam { diff --git a/common_components/common_runtime/hooks.h b/common_components/common_runtime/hooks.h index a59c64f5b8..d2fc9cecf1 100644 --- a/common_components/common_runtime/hooks.h +++ b/common_components/common_runtime/hooks.h @@ -18,8 +18,8 @@ #include -#include "common_interfaces/heap/heap_visitor.h" -#include "common_interfaces/thread/mutator_base.h" +#include "heap/heap_visitor.h" +#include "thread/mutator_base.h" // Visitor that iterate all `RefField`s in a TaggedObject and add them to // `LocalMarkStack` Should be moved to BaseRT and panda namespace later diff --git a/common_components/heap/allocator/memory_map.h b/common_components/heap/allocator/memory_map.h index b8ef429509..ec2c502c38 100755 --- a/common_components/heap/allocator/memory_map.h +++ b/common_components/heap/allocator/memory_map.h @@ -16,7 +16,7 @@ #ifndef COMMON_COMPONENTS_HEAP_ALLOCATOR_ALLOC_MEM_MAP_H #define COMMON_COMPONENTS_HEAP_ALLOCATOR_ALLOC_MEM_MAP_H -#include "common_interfaces/base/common.h" +#include "base/common.h" #ifdef _WIN64 #include #include diff --git a/common_components/heap/allocator/regional_heap.h b/common_components/heap/allocator/regional_heap.h index 2bc0cc98d5..6104a0da43 100755 --- a/common_components/heap/allocator/regional_heap.h +++ b/common_components/heap/allocator/regional_heap.h @@ -39,7 +39,7 @@ #if defined(COMMON_SANITIZER_SUPPORT) #include "common_components/sanitizer/sanitizer_interface.h" #endif -#include "common_interfaces/base_runtime.h" +#include "base_runtime.h" namespace common { class Taskpool; diff --git a/common_components/heap/ark_collector/ark_collector.h b/common_components/heap/ark_collector/ark_collector.h index a26e5786f1..5c7176a578 100755 --- a/common_components/heap/ark_collector/ark_collector.h +++ b/common_components/heap/ark_collector/ark_collector.h @@ -21,7 +21,7 @@ #include "common_components/heap/allocator/regional_heap.h" #include "common_components/heap/collector/copy_data_manager.h" #include "common_components/heap/collector/marking_collector.h" -#include "common_interfaces/base_runtime.h" +#include "base_runtime.h" namespace common { diff --git a/common_components/heap/collector/collector.h b/common_components/heap/collector/collector.h index fe65398193..d1c3cb2ff0 100755 --- a/common_components/heap/collector/collector.h +++ b/common_components/heap/collector/collector.h @@ -26,8 +26,8 @@ #include "common_components/common/base_object.h" #include "common_components/heap/collector/gc_request.h" #include "common_components/heap/collector/gc_stats.h" -#include "common_interfaces/thread/mutator_base.h" -#include "common_interfaces/base/runtime_param.h" +#include "thread/mutator_base.h" +#include "base/runtime_param.h" namespace common { enum CollectorType { diff --git a/common_components/heap/collector/gc_request.h b/common_components/heap/collector/gc_request.h index b3269ee6ce..58fdf86bf8 100755 --- a/common_components/heap/collector/gc_request.h +++ b/common_components/heap/collector/gc_request.h @@ -19,7 +19,7 @@ #include #include "common_components/base/globals.h" -#include "common_interfaces/base_runtime.h" +#include "base_runtime.h" namespace common { // Minimum time between async GC (heuristic, native). diff --git a/common_components/heap/collector/gc_stats.h b/common_components/heap/collector/gc_stats.h index ceb21991b8..40405b2743 100755 --- a/common_components/heap/collector/gc_stats.h +++ b/common_components/heap/collector/gc_stats.h @@ -25,7 +25,7 @@ #include "common_components/base/immortal_wrapper.h" #include "common_components/heap/collector/gc_request.h" #include "common_components/log/log.h" -#include "common_interfaces/base_runtime.h" +#include "base_runtime.h" namespace common { // statistics for previous gc. diff --git a/common_components/heap/collector/heuristic_gc_policy.h b/common_components/heap/collector/heuristic_gc_policy.h index 4b5ba71fb2..a539cdda40 100644 --- a/common_components/heap/collector/heuristic_gc_policy.h +++ b/common_components/heap/collector/heuristic_gc_policy.h @@ -17,7 +17,7 @@ #define COMMON_COMPONENTS_HEAP_HEURISTIC_GC_POLICY_H #include "common_components/base/globals.h" -#include "common_interfaces/base_runtime.h" +#include "base_runtime.h" #include "common_components/taskpool/taskpool.h" #include "common_components/log/log.h" diff --git a/common_components/heap/heap.h b/common_components/heap/heap.h index e3b548e9df..ddc6761bce 100755 --- a/common_components/heap/heap.h +++ b/common_components/heap/heap.h @@ -25,9 +25,9 @@ #include "common_components/heap/barrier/barrier.h" #include "common_components/heap/collector/collector.h" #include "common_components/heap/collector/heuristic_gc_policy.h" -#include "common_interfaces/base/runtime_param.h" -#include "common_interfaces/base_runtime.h" -#include "common_interfaces/profiler/heap_profiler_listener.h" +#include "base/runtime_param.h" +#include "base_runtime.h" +#include "profiler/heap_profiler_listener.h" namespace common { class Allocator; diff --git a/common_components/heap/heap_manager.h b/common_components/heap/heap_manager.h index cbb15c4b23..5a62313deb 100755 --- a/common_components/heap/heap_manager.h +++ b/common_components/heap/heap_manager.h @@ -18,7 +18,7 @@ #include "common_components/common/type_def.h" #include "common_components/heap/collector/gc_request.h" -#include "common_interfaces/base/runtime_param.h" +#include "base/runtime_param.h" namespace common { class BaseObject; diff --git a/common_components/heap/space/regional_space.h b/common_components/heap/space/regional_space.h index d8fcef3838..91c43e92c8 100644 --- a/common_components/heap/space/regional_space.h +++ b/common_components/heap/space/regional_space.h @@ -22,7 +22,7 @@ #include #include -#include "common_interfaces/base/common.h" +#include "base/common.h" #include "common_components/heap/allocator/alloc_util.h" #include "common_components/heap/allocator/allocator.h" #include "common_components/heap/allocator/region_manager.h" diff --git a/common_components/log/log_base.h b/common_components/log/log_base.h index 00806123cc..7f794cf5fc 100644 --- a/common_components/log/log_base.h +++ b/common_components/log/log_base.h @@ -20,7 +20,7 @@ #include #include -#include "common_interfaces/base/common.h" +#include "base/common.h" enum class Level: uint8_t { VERBOSE, diff --git a/common_components/mutator/mutator.h b/common_components/mutator/mutator.h index f534e1afef..385a4c90ba 100755 --- a/common_components/mutator/mutator.h +++ b/common_components/mutator/mutator.h @@ -22,8 +22,8 @@ #include "common_components/heap/collector/gc_infos.h" #include "common_components/mutator/thread_local.h" #include "common_components/mutator/satb_buffer.h" -#include "common_interfaces/thread/mutator_base.h" -#include "common_interfaces/thread/thread_holder.h" +#include "thread/mutator_base.h" +#include "thread/thread_holder.h" namespace common { class Mutator; diff --git a/common_components/mutator/mutator.inline.h b/common_components/mutator/mutator.inline.h index f84e79c417..07002acf73 100755 --- a/common_components/mutator/mutator.inline.h +++ b/common_components/mutator/mutator.inline.h @@ -17,7 +17,7 @@ #define COMMON_COMPONENTS_MUTATOR_MUTATOR_INLINE_H #include "common_components/mutator/mutator_manager.h" -#include "common_interfaces/thread/mutator_base-inl.h" +#include "thread/mutator_base-inl.h" namespace common { inline void Mutator::DoEnterSaferegion() diff --git a/common_components/objects/string_table/hashtriemap-inl.h b/common_components/objects/string_table/hashtriemap-inl.h index d6c89eb4a4..de6a1a6c89 100644 --- a/common_components/objects/string_table/hashtriemap-inl.h +++ b/common_components/objects/string_table/hashtriemap-inl.h @@ -17,8 +17,8 @@ #define COMMON_COMPONENTS_OBJECTS_STRING_TABLE_HASHTRIEMAP_INL_H #include "common_components/log/log.h" -#include "common_interfaces/objects/readonly_handle.h" -#include "common_interfaces/objects/base_string.h" +#include "objects/readonly_handle.h" +#include "objects/base_string.h" #include "common_components/objects/string_table/hashtriemap.h" #include "common_components/objects/string_table/integer_cache.h" diff --git a/common_components/objects/string_table/hashtriemap.h b/common_components/objects/string_table/hashtriemap.h index 4a51642851..b6c8a86a07 100644 --- a/common_components/objects/string_table/hashtriemap.h +++ b/common_components/objects/string_table/hashtriemap.h @@ -18,8 +18,8 @@ #include "common_components/heap/heap.h" #include "common_components/log/log.h" -#include "common_interfaces/objects/readonly_handle.h" -#include "common_interfaces/objects/base_string.h" +#include "objects/readonly_handle.h" +#include "objects/base_string.h" namespace panda::ecmascript { class TaggedObject; diff --git a/common_components/objects/string_table/integer_cache.h b/common_components/objects/string_table/integer_cache.h index 0c875414bb..e697ffe2c0 100644 --- a/common_components/objects/string_table/integer_cache.h +++ b/common_components/objects/string_table/integer_cache.h @@ -17,7 +17,7 @@ #define COMMON_COMPONENTS_OBJECTS_STRING_TABLE_INTEGER_CACHE_H #include -#include "common_interfaces/objects/base_string.h" +#include "objects/base_string.h" namespace common { diff --git a/common_components/objects/string_table_internal.h b/common_components/objects/string_table_internal.h index 0834bd1e47..d1921af0ef 100644 --- a/common_components/objects/string_table_internal.h +++ b/common_components/objects/string_table_internal.h @@ -18,8 +18,8 @@ #include "common_components/base/globals.h" #include "common_components/platform/mutex.h" -#include "common_interfaces/thread/thread_holder.h" -#include "common_interfaces/objects/base_string_table.h" +#include "thread/thread_holder.h" +#include "objects/base_string_table.h" #include "common_components/objects/string_table/hashtriemap.h" #include "common_components/taskpool/task.h" diff --git a/common_components/platform/mutex.h b/common_components/platform/mutex.h index 08ec3ec7e7..bddf551ced 100644 --- a/common_components/platform/mutex.h +++ b/common_components/platform/mutex.h @@ -16,7 +16,7 @@ #ifndef COMMON_COMPONENTS_PLATFORM_MUTEX_H #define COMMON_COMPONENTS_PLATFORM_MUTEX_H -#include "common_interfaces/base/common.h" +#include "base/common.h" #include "thread/thread_state_transition.h" #ifdef DEBUG diff --git a/common_components/taskpool/runner.h b/common_components/taskpool/runner.h index a9c1ad4e96..d25e684668 100644 --- a/common_components/taskpool/runner.h +++ b/common_components/taskpool/runner.h @@ -24,7 +24,7 @@ #include #include "common_components/taskpool/task_queue.h" -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { static constexpr uint32_t MIN_TASKPOOL_THREAD_NUM = 3; diff --git a/common_components/taskpool/task.h b/common_components/taskpool/task.h index 102439db1b..135b246401 100644 --- a/common_components/taskpool/task.h +++ b/common_components/taskpool/task.h @@ -20,7 +20,7 @@ #include #include -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { enum class TaskType : uint8_t { diff --git a/common_components/taskpool/task_queue.h b/common_components/taskpool/task_queue.h index bfdbe51096..562ff3750a 100644 --- a/common_components/taskpool/task_queue.h +++ b/common_components/taskpool/task_queue.h @@ -27,7 +27,7 @@ #include #include "common_components/taskpool/task.h" -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { using SteadyTimePoint = std::chrono::steady_clock::time_point; diff --git a/common_components/taskpool/taskpool.h b/common_components/taskpool/taskpool.h index 95b1f0420a..610d6b5751 100644 --- a/common_components/taskpool/taskpool.h +++ b/common_components/taskpool/taskpool.h @@ -20,7 +20,7 @@ #include #include "common_components/taskpool/runner.h" -#include "common_interfaces/base/common.h" +#include "base/common.h" namespace common { class PUBLIC_API Taskpool { diff --git a/ecmascript/base/block_hook_scope.h b/ecmascript/base/block_hook_scope.h index fe400d1c0a..5990113d0a 100644 --- a/ecmascript/base/block_hook_scope.h +++ b/ecmascript/base/block_hook_scope.h @@ -16,7 +16,7 @@ #ifndef BLOCK_HOOK_SCOPE_H #define BLOCK_HOOK_SCOPE_H -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::base { class BlockHookScope { diff --git a/ecmascript/base/config.h b/ecmascript/base/config.h index 612c9205e1..463d346365 100644 --- a/ecmascript/base/config.h +++ b/ecmascript/base/config.h @@ -17,7 +17,7 @@ #define ECMASCRIPT_BASE_CONFIG_H #include "common_components/base/config.h" -#include "common_interfaces/base/common.h" +#include "base/common.h" #include namespace panda::ecmascript { diff --git a/ecmascript/base/dtoa_helper.h b/ecmascript/base/dtoa_helper.h index c84a09b278..3bb11da718 100644 --- a/ecmascript/base/dtoa_helper.h +++ b/ecmascript/base/dtoa_helper.h @@ -22,7 +22,7 @@ #include #include "ecmascript/common.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::base { diff --git a/ecmascript/base/gc_ring_buffer.h b/ecmascript/base/gc_ring_buffer.h index 2bea5edc44..7d0a0da041 100644 --- a/ecmascript/base/gc_ring_buffer.h +++ b/ecmascript/base/gc_ring_buffer.h @@ -18,7 +18,7 @@ #include -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::base { // GC Ring Buffer is base tool class. It will be used to collect the data of the last N GCs. The max length is diff --git a/ecmascript/base/hash_combine.h b/ecmascript/base/hash_combine.h index e01bee63cc..1bec8a597b 100644 --- a/ecmascript/base/hash_combine.h +++ b/ecmascript/base/hash_combine.h @@ -18,7 +18,7 @@ #include #include -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::base { class HashCombiner { diff --git a/ecmascript/base/json_helper.h b/ecmascript/base/json_helper.h index d860523de9..2ca1e8982b 100644 --- a/ecmascript/base/json_helper.h +++ b/ecmascript/base/json_helper.h @@ -19,7 +19,7 @@ #include "ecmascript/js_handle.h" #include "ecmascript/mem/c_string.h" #include "ecmascript/property_attributes.h" -#include "libpandabase/utils/span.h" +#include "utils/span.h" namespace panda::ecmascript::base { constexpr int HEX_DIGIT_MASK = 0xF; diff --git a/ecmascript/base/string_helper.h b/ecmascript/base/string_helper.h index e029fe18b1..0e303ed572 100644 --- a/ecmascript/base/string_helper.h +++ b/ecmascript/base/string_helper.h @@ -27,7 +27,7 @@ #include "common_components/base/utf_helper.h" #include "ecmascript/mem/c_containers.h" #include "ecmascript/mem/c_string.h" -#include "libpandabase/utils/span.h" +#include "utils/span.h" #include "securec.h" #include "unicode/unistr.h" diff --git a/ecmascript/common.h b/ecmascript/common.h index 1c916b79dd..649ebc1ee5 100644 --- a/ecmascript/common.h +++ b/ecmascript/common.h @@ -20,7 +20,7 @@ #include #include -#include "common_interfaces/base/common.h" +#include "base/common.h" #include "ecmascript/common_enum.h" namespace panda { diff --git a/ecmascript/compiler/aot_compiler_preprocessor.h b/ecmascript/compiler/aot_compiler_preprocessor.h index 40023aa3cc..cef1f4bccc 100644 --- a/ecmascript/compiler/aot_compiler_preprocessor.h +++ b/ecmascript/compiler/aot_compiler_preprocessor.h @@ -19,7 +19,7 @@ #include "ecmascript/compiler/compiler_log.h" #include "ecmascript/pgo_profiler/pgo_profiler_decoder.h" #include "ecmascript/ecma_vm.h" -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/compiler/aot_compilation_env.h" #include "ecmascript/compiler/aot_file/aot_file_manager.h" #include "ecmascript/ohos/ohos_preload_app_info.h" diff --git a/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h b/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h index 43e00713ab..9a7686a91d 100644 --- a/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h +++ b/ecmascript/compiler/aot_snapshot/snapshot_constantpool_data.h @@ -20,7 +20,7 @@ #include "ecmascript/jspandafile/js_pandafile.h" #include "ecmascript/mem/c_containers.h" #include "ecmascript/pgo_profiler/pgo_profiler_decoder.h" -#include "libpandafile/bytecode_instruction.h" +#include "bytecode_instruction.h" namespace panda::ecmascript::kungfu { using ApEntityId = pgo::ApEntityId; diff --git a/ecmascript/compiler/binary_section.h b/ecmascript/compiler/binary_section.h index 347a9b20ec..a161323370 100644 --- a/ecmascript/compiler/binary_section.h +++ b/ecmascript/compiler/binary_section.h @@ -19,7 +19,7 @@ #include #include #include "ecmascript/common.h" -#include "libpandabase/macros.h" +#include "macros.h" #include "llvm/BinaryFormat/ELF.h" namespace panda::ecmascript { diff --git a/ecmascript/compiler/bytecode_circuit_builder.h b/ecmascript/compiler/bytecode_circuit_builder.h index 1f89290364..41a7216916 100644 --- a/ecmascript/compiler/bytecode_circuit_builder.h +++ b/ecmascript/compiler/bytecode_circuit_builder.h @@ -31,7 +31,7 @@ #include "ecmascript/jit/jit_profiler.h" #include "ecmascript/jspandafile/js_pandafile.h" #include "ecmascript/jspandafile/method_literal.h" -#include "libpandafile/index_accessor.h" +#include "index_accessor.h" namespace panda::ecmascript::kungfu { struct ExceptionItem { diff --git a/ecmascript/compiler/bytecode_info_collector.h b/ecmascript/compiler/bytecode_info_collector.h index c94c50594b..5527ed2036 100644 --- a/ecmascript/compiler/bytecode_info_collector.h +++ b/ecmascript/compiler/bytecode_info_collector.h @@ -23,7 +23,7 @@ #include "ecmascript/jspandafile/method_literal.h" #include "ecmascript/pgo_profiler/pgo_profiler_decoder.h" #include "ecmascript/compiler/compilation_env.h" -#include "libpandafile/bytecode_instruction-inl.h" +#include "bytecode_instruction-inl.h" namespace panda::ecmascript::kungfu { using PGOProfilerDecoder = pgo::PGOProfilerDecoder; diff --git a/ecmascript/compiler/bytecodes.h b/ecmascript/compiler/bytecodes.h index 533c340994..e2033e45e7 100644 --- a/ecmascript/compiler/bytecodes.h +++ b/ecmascript/compiler/bytecodes.h @@ -19,9 +19,9 @@ #include #include -#include "libpandabase/macros.h" -#include "libpandabase/utils/bit_field.h" -#include "libpandafile/bytecode_instruction-inl.h" +#include "macros.h" +#include "utils/bit_field.h" +#include "bytecode_instruction-inl.h" #include "ecmascript/common.h" #include "ecmascript/js_tagged_value.h" diff --git a/ecmascript/compiler/call_signature.h b/ecmascript/compiler/call_signature.h index a39c47be8a..61d7141b26 100644 --- a/ecmascript/compiler/call_signature.h +++ b/ecmascript/compiler/call_signature.h @@ -22,8 +22,8 @@ #include "ecmascript/compiler/variable_type.h" -#include "libpandabase/macros.h" -#include "libpandabase/utils/bit_field.h" +#include "macros.h" +#include "utils/bit_field.h" namespace panda::ecmascript::kungfu { class Circuit; diff --git a/ecmascript/compiler/circuit.h b/ecmascript/compiler/circuit.h index 9841712fa8..8b7f997885 100644 --- a/ecmascript/compiler/circuit.h +++ b/ecmascript/compiler/circuit.h @@ -30,7 +30,7 @@ #include "ecmascript/compiler/gate_meta_data_builder.h" #include "ecmascript/frames.h" -#include "libpandabase/macros.h" +#include "macros.h" #include "securec.h" namespace panda::ecmascript::kungfu { diff --git a/ecmascript/compiler/gate.h b/ecmascript/compiler/gate.h index e1f47a4070..8cbd3cc383 100644 --- a/ecmascript/compiler/gate.h +++ b/ecmascript/compiler/gate.h @@ -32,7 +32,7 @@ #include "ecmascript/compiler/lcr_gate_meta_data.h" #include "ecmascript/compiler/type.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::kungfu { using BitField = uint64_t; diff --git a/ecmascript/compiler/gate_meta_data_builder.h b/ecmascript/compiler/gate_meta_data_builder.h index 5db416c4ab..6c79cd4e07 100644 --- a/ecmascript/compiler/gate_meta_data_builder.h +++ b/ecmascript/compiler/gate_meta_data_builder.h @@ -28,7 +28,7 @@ #include "ecmascript/mem/chunk.h" #include "ecmascript/mem/chunk_containers.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::kungfu { diff --git a/ecmascript/compiler/hcr_gate_meta_data.h b/ecmascript/compiler/hcr_gate_meta_data.h index c4a802ed8d..089befc4cf 100644 --- a/ecmascript/compiler/hcr_gate_meta_data.h +++ b/ecmascript/compiler/hcr_gate_meta_data.h @@ -27,7 +27,7 @@ #include "ecmascript/elements.h" #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h" #include "ecmascript/on_heap.h" -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/compiler/share_gate_meta_data.h" diff --git a/ecmascript/compiler/lcr_gate_meta_data.h b/ecmascript/compiler/lcr_gate_meta_data.h index 8f1196cd46..8f36292744 100644 --- a/ecmascript/compiler/lcr_gate_meta_data.h +++ b/ecmascript/compiler/lcr_gate_meta_data.h @@ -19,7 +19,7 @@ #include #include "ecmascript/compiler/type.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::kungfu { diff --git a/ecmascript/compiler/mcr_gate_meta_data.h b/ecmascript/compiler/mcr_gate_meta_data.h index f9a8dd3e24..c231ae6e32 100644 --- a/ecmascript/compiler/mcr_gate_meta_data.h +++ b/ecmascript/compiler/mcr_gate_meta_data.h @@ -25,7 +25,7 @@ #include "ecmascript/elements.h" #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h" -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/compiler/share_gate_meta_data.h" diff --git a/ecmascript/compiler/pgo_bc_info.h b/ecmascript/compiler/pgo_bc_info.h index 6f4e8fc3cb..6754eb9735 100644 --- a/ecmascript/compiler/pgo_bc_info.h +++ b/ecmascript/compiler/pgo_bc_info.h @@ -18,7 +18,7 @@ #include "ecmascript/jspandafile/method_literal.h" #include "ecmascript/mem/c_containers.h" -#include "libpandafile/bytecode_instruction.h" +#include "bytecode_instruction.h" namespace panda::ecmascript::kungfu { class PGOBCInfo { diff --git a/ecmascript/compiler/share_gate_meta_data.h b/ecmascript/compiler/share_gate_meta_data.h index 13bfd51929..92b6e47322 100644 --- a/ecmascript/compiler/share_gate_meta_data.h +++ b/ecmascript/compiler/share_gate_meta_data.h @@ -28,7 +28,7 @@ #include "ecmascript/mem/chunk_containers.h" #include "ecmascript/mem/region.h" #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::kungfu { using ProfileType = pgo::ProfileType; diff --git a/ecmascript/compiler/type_info_accessors.h b/ecmascript/compiler/type_info_accessors.h index cdadaa822d..3b52a14ff4 100644 --- a/ecmascript/compiler/type_info_accessors.h +++ b/ecmascript/compiler/type_info_accessors.h @@ -24,7 +24,7 @@ #include "ecmascript/global_index.h" #include "ecmascript/jspandafile/program_object.h" #include "ecmascript/mem/chunk.h" -#include "libpandafile/index_accessor.h" +#include "index_accessor.h" namespace panda::ecmascript::kungfu { class TypeInfoAccessor { diff --git a/ecmascript/cross_vm/cross_vm_operator.h b/ecmascript/cross_vm/cross_vm_operator.h index 8d8af2be2c..c071b80921 100644 --- a/ecmascript/cross_vm/cross_vm_operator.h +++ b/ecmascript/cross_vm/cross_vm_operator.h @@ -18,7 +18,7 @@ #include -#include "libpandabase/macros.h" +#include "macros.h" #include "hybrid/ecma_vm_interface.h" #include "hybrid/sts_vm_interface.h" diff --git a/ecmascript/cross_vm/dynamic_object_accessor.h b/ecmascript/cross_vm/dynamic_object_accessor.h index 468cc0fbc0..6a0dce8dd1 100644 --- a/ecmascript/cross_vm/dynamic_object_accessor.h +++ b/ecmascript/cross_vm/dynamic_object_accessor.h @@ -16,8 +16,8 @@ #ifndef ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_ACCESSOR_H #define ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_ACCESSOR_H -#include "common_interfaces/objects/base_object.h" -#include "common_interfaces/objects/base_object_accessor.h" +#include "objects/base_object.h" +#include "objects/base_object_accessor.h" namespace panda::ecmascript { using common::ThreadHolder; diff --git a/ecmascript/cross_vm/dynamic_object_descriptor.h b/ecmascript/cross_vm/dynamic_object_descriptor.h index 053e9944b8..afd2e98be5 100644 --- a/ecmascript/cross_vm/dynamic_object_descriptor.h +++ b/ecmascript/cross_vm/dynamic_object_descriptor.h @@ -16,8 +16,8 @@ #ifndef ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_DESCRIPTOR_H #define ECMASCRIPT_CROSS_VM_DYNAMIC_OBJECT_DESCRIPTOR_H -#include "common_interfaces/objects/base_object.h" -#include "common_interfaces/objects/base_object_descriptor.h" +#include "objects/base_object.h" +#include "objects/base_object_descriptor.h" #include "ecmascript/ic/ic_handler.h" namespace panda::ecmascript { diff --git a/ecmascript/cross_vm/dynamic_type_converter.h b/ecmascript/cross_vm/dynamic_type_converter.h index 4e16b8ebbc..f2f17a7afb 100644 --- a/ecmascript/cross_vm/dynamic_type_converter.h +++ b/ecmascript/cross_vm/dynamic_type_converter.h @@ -16,8 +16,8 @@ #ifndef ECMASCRIPT_CROSS_VM_DYNAMIC_TYPE_CONVERTER_H #define ECMASCRIPT_CROSS_VM_DYNAMIC_TYPE_CONVERTER_H -#include "common_interfaces/objects/base_object.h" -#include "common_interfaces/objects/base_type_converter.h" +#include "objects/base_object.h" +#include "objects/base_type_converter.h" namespace panda::ecmascript { using common::BaseType; diff --git a/ecmascript/debugger/dropframe_manager.h b/ecmascript/debugger/dropframe_manager.h index 153366b919..ea4735b469 100644 --- a/ecmascript/debugger/dropframe_manager.h +++ b/ecmascript/debugger/dropframe_manager.h @@ -19,7 +19,7 @@ #include "ecmascript/js_handle.h" #include "ecmascript/js_thread.h" #include "ecmascript/method.h" -#include "libpandafile/bytecode_instruction.h" +#include "bytecode_instruction.h" namespace panda::ecmascript::tooling { enum class MethodType : uint8_t { diff --git a/ecmascript/debugger/js_debugger_manager.h b/ecmascript/debugger/js_debugger_manager.h index 9c5ace70d5..1d070b96f7 100644 --- a/ecmascript/debugger/js_debugger_manager.h +++ b/ecmascript/debugger/js_debugger_manager.h @@ -29,7 +29,7 @@ #include "ecmascript/napi/include/jsnapi.h" #include "ecmascript/global_handle_collection.h" -#include "libpandabase/os/library_loader.h" +#include "os/library_loader.h" namespace panda::ecmascript::tooling { class ProtocolHandler; diff --git a/ecmascript/debugger/js_pt_location.h b/ecmascript/debugger/js_pt_location.h index 762efe87d0..53705ba41d 100644 --- a/ecmascript/debugger/js_pt_location.h +++ b/ecmascript/debugger/js_pt_location.h @@ -19,8 +19,8 @@ #include #include "ecmascript/jspandafile/js_pandafile.h" -#include "libpandafile/file.h" -#include "libpandabase/macros.h" +#include "file.h" +#include "macros.h" namespace panda::ecmascript::tooling { class JSPtLocation { diff --git a/ecmascript/debugger/js_pt_method.h b/ecmascript/debugger/js_pt_method.h index 0441db8cea..5b7ce86813 100644 --- a/ecmascript/debugger/js_pt_method.h +++ b/ecmascript/debugger/js_pt_method.h @@ -18,8 +18,8 @@ #include "ecmascript/jspandafile/js_pandafile.h" -#include "libpandafile/code_data_accessor-inl.h" -#include "libpandafile/method_data_accessor-inl.h" +#include "code_data_accessor-inl.h" +#include "method_data_accessor-inl.h" namespace panda::ecmascript::tooling { class PtMethod { diff --git a/ecmascript/dfx/cpu_profiler/sampling_processor.h b/ecmascript/dfx/cpu_profiler/sampling_processor.h index a2a6d110b9..7ebb509d79 100644 --- a/ecmascript/dfx/cpu_profiler/sampling_processor.h +++ b/ecmascript/dfx/cpu_profiler/sampling_processor.h @@ -20,7 +20,7 @@ #include #include -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class SamplesRecord; diff --git a/ecmascript/dfx/hprof/heap_profiler_interface.h b/ecmascript/dfx/hprof/heap_profiler_interface.h index ca1aac2ea7..6970dfe16a 100644 --- a/ecmascript/dfx/hprof/heap_profiler_interface.h +++ b/ecmascript/dfx/hprof/heap_profiler_interface.h @@ -18,7 +18,7 @@ #include #include -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class EcmaVM; diff --git a/ecmascript/dfx/hprof/heap_tracker.h b/ecmascript/dfx/hprof/heap_tracker.h index cb105291a0..c14894351b 100644 --- a/ecmascript/dfx/hprof/heap_tracker.h +++ b/ecmascript/dfx/hprof/heap_tracker.h @@ -23,7 +23,7 @@ #include "ecmascript/dfx/hprof/file_stream.h" #include "ecmascript/mem/tagged_object.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class HeapSnapshot; diff --git a/ecmascript/dfx/vm_thread_control.h b/ecmascript/dfx/vm_thread_control.h index 27a4d80f91..ccd5758b93 100644 --- a/ecmascript/dfx/vm_thread_control.h +++ b/ecmascript/dfx/vm_thread_control.h @@ -18,7 +18,7 @@ #include "ecmascript/js_thread.h" #include "ecmascript/platform/mutex.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" namespace panda::ecmascript { class VmThreadControl { diff --git a/ecmascript/dfx/vmstat/caller_stat.h b/ecmascript/dfx/vmstat/caller_stat.h index ba765e3241..7fde3641cc 100644 --- a/ecmascript/dfx/vmstat/caller_stat.h +++ b/ecmascript/dfx/vmstat/caller_stat.h @@ -22,7 +22,7 @@ #include "ecmascript/mem/c_string.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class EcmaRuntimeStat; diff --git a/ecmascript/ecma_param_configuration.h b/ecmascript/ecma_param_configuration.h index ed3edbc9d6..1e698d1293 100644 --- a/ecmascript/ecma_param_configuration.h +++ b/ecmascript/ecma_param_configuration.h @@ -20,7 +20,7 @@ #include "ecmascript/log_wrapper.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { static constexpr size_t DEFAULT_HEAP_SIZE = 448_MB; // Recommended range: 128-448MB diff --git a/ecmascript/ecma_string-inl.h b/ecmascript/ecma_string-inl.h index df4380f88f..92c5fc36c7 100644 --- a/ecmascript/ecma_string-inl.h +++ b/ecmascript/ecma_string-inl.h @@ -24,7 +24,7 @@ #include "ecmascript/mem/space.h" #include "ecmascript/object_factory-inl.h" #include "ecmascript/debugger/js_debugger_manager.h" -#include "common_interfaces/objects/string/base_string-inl2.h" +#include "objects/string/base_string-inl2.h" namespace panda::ecmascript { /* static */ diff --git a/ecmascript/ecma_string.h b/ecmascript/ecma_string.h index c57e4c8550..239d6f8b37 100755 --- a/ecmascript/ecma_string.h +++ b/ecmascript/ecma_string.h @@ -21,11 +21,11 @@ #include #include "common_components/base/utf_helper.h" -#include "common_interfaces/objects/base_string.h" -#include "common_interfaces/objects/string/line_string.h" -#include "common_interfaces/objects/string/sliced_string.h" -#include "common_interfaces/objects/string/tree_string.h" -#include "common_interfaces/objects/string/base_string-inl1.h" +#include "objects/base_string.h" +#include "objects/string/line_string.h" +#include "objects/string/sliced_string.h" +#include "objects/string/tree_string.h" +#include "objects/string/base_string-inl1.h" #include "ecmascript/common.h" #include "ecmascript/ecma_macros.h" #include "ecmascript/js_hclass.h" @@ -33,7 +33,7 @@ #include "ecmascript/mem/barriers.h" #include "ecmascript/mem/space.h" #include "ecmascript/mem/tagged_object.h" -#include "libpandabase/macros.h" +#include "macros.h" #include "securec.h" #include "unicode/locid.h" diff --git a/ecmascript/ecma_string_table.h b/ecmascript/ecma_string_table.h index c9524bb1d9..5943d11400 100644 --- a/ecmascript/ecma_string_table.h +++ b/ecmascript/ecma_string_table.h @@ -27,8 +27,8 @@ #include "ecmascript/mem/visitor.h" #include "ecmascript/platform/mutex.h" #include "ecmascript/tagged_array.h" -#include "common_interfaces/objects/base_string_table.h" -#include "common_interfaces/objects/string/base_string_declare.h" +#include "objects/base_string_table.h" +#include "objects/string/base_string_declare.h" namespace panda::ecmascript { #if ENABLE_NEXT_OPTIMIZATION diff --git a/ecmascript/ecma_vm.h b/ecmascript/ecma_vm.h index f7eaf4961f..3d630aee89 100644 --- a/ecmascript/ecma_vm.h +++ b/ecmascript/ecma_vm.h @@ -41,7 +41,7 @@ #include "ecmascript/napi/include/jsnapi_expo.h" #include "ecmascript/platform/mutex.h" #include "ecmascript/waiter_list.h" -#include "libpandafile/bytecode_instruction-inl.h" +#include "bytecode_instruction-inl.h" namespace panda { class JSNApi; diff --git a/ecmascript/global_env_constants.h b/ecmascript/global_env_constants.h index 4f2e5e7bc9..59ac19c066 100644 --- a/ecmascript/global_env_constants.h +++ b/ecmascript/global_env_constants.h @@ -19,7 +19,7 @@ #include "ecmascript/compiler/builtins/builtins_call_signature_list.h" #include "ecmascript/js_tagged_value.h" #include "ecmascript/mem/visitor.h" -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/cross_vm/global_env_constants_hybrid.h" namespace panda::ecmascript { diff --git a/ecmascript/interpreter/interpreter.h b/ecmascript/interpreter/interpreter.h index 697ab00aaa..82f663dcf4 100644 --- a/ecmascript/interpreter/interpreter.h +++ b/ecmascript/interpreter/interpreter.h @@ -24,7 +24,7 @@ #include "ecmascript/method.h" #include "ecmascript/require/js_cjs_module.h" #include "ecmascript/object_factory.h" -#include "libpandafile/bytecode_instruction-inl.h" +#include "bytecode_instruction-inl.h" namespace panda::ecmascript { class ConstantPool; diff --git a/ecmascript/js_api/js_api_deque.h b/ecmascript/js_api/js_api_deque.h index 7bf010b4cc..ef5deccf34 100644 --- a/ecmascript/js_api/js_api_deque.h +++ b/ecmascript/js_api/js_api_deque.h @@ -24,7 +24,7 @@ #include "ecmascript/js_object.h" #include "ecmascript/js_tagged_value.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class JSThread; diff --git a/ecmascript/js_api/js_api_deque_iterator.h b/ecmascript/js_api/js_api_deque_iterator.h index 83972be235..9fbe54387f 100644 --- a/ecmascript/js_api/js_api_deque_iterator.h +++ b/ecmascript/js_api/js_api_deque_iterator.h @@ -23,7 +23,7 @@ #include "ecmascript/js_object.h" #include "ecmascript/js_tagged_value.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class TaggedObject; diff --git a/ecmascript/js_handle.h b/ecmascript/js_handle.h index be45f1da02..6a4efcb39b 100644 --- a/ecmascript/js_handle.h +++ b/ecmascript/js_handle.h @@ -22,7 +22,7 @@ #include "ecmascript/js_tagged_value.h" #include "ecmascript/mem/assert_scope.h" #include "ecmascript/mem/barriers.h" -#include "common_interfaces/objects/readonly_handle.h" +#include "objects/readonly_handle.h" /* * JSHandle: A JSHandle provides a reference to an object that survives relocation by the garbage collector. * diff --git a/ecmascript/js_hclass.h b/ecmascript/js_hclass.h index 13ae3dd9ad..57ef51fa20 100644 --- a/ecmascript/js_hclass.h +++ b/ecmascript/js_hclass.h @@ -26,9 +26,9 @@ #include "ecmascript/mem/slots.h" #include "ecmascript/mem/visitor.h" #include "ecmascript/property_attributes.h" -#include "common_interfaces/objects/composite_base_class.h" +#include "objects/composite_base_class.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" /* * JS Object and JS HClass Layout diff --git a/ecmascript/js_runtime_options.h b/ecmascript/js_runtime_options.h index da92db275b..da3adc99b9 100644 --- a/ecmascript/js_runtime_options.h +++ b/ecmascript/js_runtime_options.h @@ -24,14 +24,14 @@ #include "common_components/common_runtime/base_runtime_param.h" #include "common_components/log/log_base.h" -#include "common_interfaces/base/common.h" -#include "common_interfaces/base/runtime_param.h" +#include "base/common.h" +#include "base/runtime_param.h" #include "ecmascript/base/bit_helper.h" #include "ecmascript/base/config.h" #include "ecmascript/common.h" #include "ecmascript/mem/c_string.h" #include "ecmascript/mem/mem_common.h" -#include "libpandabase/os/file.h" +#include "os/file.h" namespace { constexpr size_t DEFAULT_OPT_LEVEL = 3; // 3: default opt level diff --git a/ecmascript/js_thread.h b/ecmascript/js_thread.h index 408779420d..2b77324e22 100644 --- a/ecmascript/js_thread.h +++ b/ecmascript/js_thread.h @@ -38,9 +38,9 @@ #include "ecmascript/napi/include/jsnapi_expo.h" #include "ecmascript/patch/patch_loader.h" #include "common_components/heap/collector/gc_request.h" -#include "common_interfaces/base_runtime.h" -#include "common_interfaces/thread/base_thread.h" -#include "common_interfaces/thread/thread_holder.h" +#include "base_runtime.h" +#include "thread/base_thread.h" +#include "thread/thread_holder.h" #include "ecmascript/cross_vm/js_thread_hybrid.h" #if defined(ENABLE_FFRT_INTERFACES) diff --git a/ecmascript/jspandafile/bytecode_inst/instruction.h b/ecmascript/jspandafile/bytecode_inst/instruction.h index 803fdb6eae..0c5106dfa5 100644 --- a/ecmascript/jspandafile/bytecode_inst/instruction.h +++ b/ecmascript/jspandafile/bytecode_inst/instruction.h @@ -18,7 +18,7 @@ #include -#include "libpandabase/utils/bit_helpers.h" +#include "utils/bit_helpers.h" #if !PANDA_TARGET_WINDOWS #include "securec.h" diff --git a/ecmascript/jspandafile/constpool_value.h b/ecmascript/jspandafile/constpool_value.h index 0eeed716e6..e60cedff0a 100644 --- a/ecmascript/jspandafile/constpool_value.h +++ b/ecmascript/jspandafile/constpool_value.h @@ -16,7 +16,7 @@ #ifndef ECMASCRIPT_JSPANDAFILE_CONSTPOOL_VALUE_H #define ECMASCRIPT_JSPANDAFILE_CONSTPOOL_VALUE_H -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" namespace panda::ecmascript { enum class ConstPoolType : uint8_t { diff --git a/ecmascript/jspandafile/debug_info_extractor.h b/ecmascript/jspandafile/debug_info_extractor.h index cbe8629952..7ed39437b8 100644 --- a/ecmascript/jspandafile/debug_info_extractor.h +++ b/ecmascript/jspandafile/debug_info_extractor.h @@ -24,9 +24,9 @@ #include "ecmascript/mem/c_containers.h" #include "ecmascript/mem/c_string.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/file.h" -#include "libpandabase/utils/utf.h" +#include "class_data_accessor-inl.h" +#include "file.h" +#include "utils/utf.h" namespace panda::ecmascript { class JSPandaFile; diff --git a/ecmascript/jspandafile/js_pandafile.h b/ecmascript/jspandafile/js_pandafile.h index 053416d153..fe9f54b6ad 100644 --- a/ecmascript/jspandafile/js_pandafile.h +++ b/ecmascript/jspandafile/js_pandafile.h @@ -25,9 +25,9 @@ #include "ecmascript/mem/c_containers.h" #include "ecmascript/platform/mutex.h" -#include "libpandafile/file-inl.h" -#include "libpandafile/file_items.h" -#include "libpandafile/literal_data_accessor.h" +#include "file-inl.h" +#include "file_items.h" +#include "literal_data_accessor.h" namespace panda { namespace ecmascript { diff --git a/ecmascript/jspandafile/literal_data_extractor.h b/ecmascript/jspandafile/literal_data_extractor.h index 727f4f5293..29532202d9 100644 --- a/ecmascript/jspandafile/literal_data_extractor.h +++ b/ecmascript/jspandafile/literal_data_extractor.h @@ -18,7 +18,7 @@ #include "ecmascript/jspandafile/js_pandafile.h" #include "ecmascript/js_tagged_value-inl.h" -#include "libpandafile/literal_data_accessor-inl.h" +#include "literal_data_accessor-inl.h" namespace panda::ecmascript { class LiteralDataExtractor { diff --git a/ecmascript/jspandafile/method_literal.h b/ecmascript/jspandafile/method_literal.h index f39d66a832..270e283f55 100644 --- a/ecmascript/jspandafile/method_literal.h +++ b/ecmascript/jspandafile/method_literal.h @@ -23,7 +23,7 @@ #include "ecmascript/js_function_kind.h" #include "ecmascript/js_tagged_value.h" #include "ecmascript/mem/c_string.h" -#include "libpandafile/file.h" +#include "file.h" static constexpr uint32_t CALL_TYPE_MASK = 0xF; // 0xF: the last 4 bits are used as callType diff --git a/ecmascript/jspandafile/panda_file_translator.h b/ecmascript/jspandafile/panda_file_translator.h index 60dd77793c..3288989467 100644 --- a/ecmascript/jspandafile/panda_file_translator.h +++ b/ecmascript/jspandafile/panda_file_translator.h @@ -21,8 +21,8 @@ #include "ecmascript/jspandafile/constpool_value.h" #include "ecmascript/jspandafile/js_pandafile.h" -#include "libpandabase/utils/bit_field.h" -#include "libpandafile/code_data_accessor-inl.h" +#include "utils/bit_field.h" +#include "code_data_accessor-inl.h" namespace panda::ecmascript { class Program; diff --git a/ecmascript/jspandafile/program_object.h b/ecmascript/jspandafile/program_object.h index ee0e275132..532e27fdc9 100644 --- a/ecmascript/jspandafile/program_object.h +++ b/ecmascript/jspandafile/program_object.h @@ -35,8 +35,8 @@ #include "ecmascript/pgo_profiler/pgo_profiler_manager.h" #include "ecmascript/pgo_profiler/pgo_utils.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/index_accessor.h" +#include "class_data_accessor-inl.h" +#include "index_accessor.h" namespace panda { namespace ecmascript { diff --git a/ecmascript/mem/allocation_inspector.h b/ecmascript/mem/allocation_inspector.h index 0fb626dadb..431e521d61 100644 --- a/ecmascript/mem/allocation_inspector.h +++ b/ecmascript/mem/allocation_inspector.h @@ -17,7 +17,7 @@ #define ECMASCRIPT_MEM_ALLOCATION_INSPECTOR_H #include "ecmascript/common.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class Heap; diff --git a/ecmascript/mem/assert_scope.h b/ecmascript/mem/assert_scope.h index fd9010b708..8fb7d0b41f 100644 --- a/ecmascript/mem/assert_scope.h +++ b/ecmascript/mem/assert_scope.h @@ -19,7 +19,7 @@ #include #include "ecmascript/common.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" namespace panda::ecmascript { diff --git a/ecmascript/mem/barriers.h b/ecmascript/mem/barriers.h index 478f965378..f03e5104d6 100644 --- a/ecmascript/mem/barriers.h +++ b/ecmascript/mem/barriers.h @@ -20,8 +20,8 @@ #include "ecmascript/js_tagged_value.h" #include "ecmascript/mem/mark_word.h" #include "ecmascript/mem/mem_common.h" -#include "common_interfaces/base_runtime.h" -#include "common_interfaces/thread/mutator_base.h" +#include "base_runtime.h" +#include "thread/mutator_base.h" namespace panda::ecmascript { class Region; diff --git a/ecmascript/mem/clock_scope.h b/ecmascript/mem/clock_scope.h index 1d4bd3f3aa..06c6b77c5c 100644 --- a/ecmascript/mem/clock_scope.h +++ b/ecmascript/mem/clock_scope.h @@ -19,7 +19,7 @@ #include #include -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class ClockScope { diff --git a/ecmascript/mem/dynamic_object_operator.h b/ecmascript/mem/dynamic_object_operator.h index b2983f6768..6e0ba65508 100644 --- a/ecmascript/mem/dynamic_object_operator.h +++ b/ecmascript/mem/dynamic_object_operator.h @@ -16,12 +16,12 @@ #ifndef ECMASCRIPT_MEM_DYNAMIC_OBJECT_OPERATOR_H #define ECMASCRIPT_MEM_DYNAMIC_OBJECT_OPERATOR_H -#include "common_interfaces/objects/base_object.h" -#include "common_interfaces/objects/base_object_operator.h" +#include "objects/base_object.h" +#include "objects/base_object_operator.h" #include "ecmascript/free_object.h" #include "ecmascript/js_hclass-inl.h" #include "ecmascript/mem/tagged_object.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class RefFieldObjectVisitor final : public BaseObjectVisitor { diff --git a/ecmascript/mem/free_object_list.h b/ecmascript/mem/free_object_list.h index 3f9f75e390..dbf7d0c2f9 100644 --- a/ecmascript/mem/free_object_list.h +++ b/ecmascript/mem/free_object_list.h @@ -21,7 +21,7 @@ #include "ecmascript/mem/free_object_set.h" #include "ecmascript/mem/mem_common.h" -#include "libpandabase/utils/span.h" +#include "utils/span.h" namespace panda::ecmascript { class JitFort; diff --git a/ecmascript/mem/free_object_set.h b/ecmascript/mem/free_object_set.h index 1313a7a8e7..825b049c37 100644 --- a/ecmascript/mem/free_object_set.h +++ b/ecmascript/mem/free_object_set.h @@ -18,7 +18,7 @@ #include -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/mem/jit_fort_memdesc.h" namespace panda::ecmascript { diff --git a/ecmascript/mem/garbage_collector.h b/ecmascript/mem/garbage_collector.h index c458f7240a..bc0d6e0035 100644 --- a/ecmascript/mem/garbage_collector.h +++ b/ecmascript/mem/garbage_collector.h @@ -16,7 +16,7 @@ #ifndef ECMASCRIPT_MEM_GARBAGE_COLLECTOR_H #define ECMASCRIPT_MEM_GARBAGE_COLLECTOR_H -#include "libpandabase/macros.h" +#include "macros.h" namespace panda { namespace ecmascript { diff --git a/ecmascript/mem/gc_key_stats.h b/ecmascript/mem/gc_key_stats.h index c8f49b0569..ec3d7dc1b4 100644 --- a/ecmascript/mem/gc_key_stats.h +++ b/ecmascript/mem/gc_key_stats.h @@ -24,7 +24,7 @@ #include "ecmascript/mem/mem_common.h" #include "ecmascript/log_wrapper.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { using Clock = std::chrono::high_resolution_clock; diff --git a/ecmascript/mem/gc_stats.h b/ecmascript/mem/gc_stats.h index a7aed23b81..2a433d7771 100644 --- a/ecmascript/mem/gc_stats.h +++ b/ecmascript/mem/gc_stats.h @@ -24,7 +24,7 @@ #include "ecmascript/mem/clock_scope.h" #include "ecmascript/mem/mem_common.h" #include "ecmascript/mem/long_gc_stats.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class Heap; diff --git a/ecmascript/mem/heap-inl.h b/ecmascript/mem/heap-inl.h index 1f53da3e0b..fadd64a876 100644 --- a/ecmascript/mem/heap-inl.h +++ b/ecmascript/mem/heap-inl.h @@ -18,7 +18,7 @@ #include "clang.h" #include "common_components/heap/heap_allocator-inl.h" -#include "common_interfaces/base_runtime.h" +#include "base_runtime.h" #include "ecmascript/base/config.h" #include "ecmascript/mem/heap.h" @@ -41,7 +41,7 @@ #include "ecmascript/mem/barriers-inl.h" #include "ecmascript/mem/mem_map_allocator.h" #include "ecmascript/runtime.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { #define CHECK_OBJ_AND_THROW_OOM_ERROR(object, size, space, message) \ diff --git a/ecmascript/mem/idle_gc_trigger.h b/ecmascript/mem/idle_gc_trigger.h index 1bb6c2540a..9be8e2d4e1 100644 --- a/ecmascript/mem/idle_gc_trigger.h +++ b/ecmascript/mem/idle_gc_trigger.h @@ -19,7 +19,7 @@ #include #include -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/common.h" #include "ecmascript/mem/mem_common.h" #include "ecmascript/base/gc_ring_buffer.h" diff --git a/ecmascript/mem/machine_code.h b/ecmascript/mem/machine_code.h index 43777264dc..b9cd882b96 100644 --- a/ecmascript/mem/machine_code.h +++ b/ecmascript/mem/machine_code.h @@ -26,7 +26,7 @@ #include "ecmascript/mem/jit_fort_memdesc.h" #include "ecmascript/deoptimizer/calleeReg.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { enum class MachineCodeType : uint8_t { diff --git a/ecmascript/mem/mark_word.h b/ecmascript/mem/mark_word.h index 76dcf353bf..87ede41bbb 100644 --- a/ecmascript/mem/mark_word.h +++ b/ecmascript/mem/mark_word.h @@ -20,7 +20,7 @@ #include #include "ecmascript/mem/tagged_state_word.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" namespace panda { namespace ecmascript { diff --git a/ecmascript/mem/object_xray.h b/ecmascript/mem/object_xray.h index b318501bf0..67265d5cc1 100644 --- a/ecmascript/mem/object_xray.h +++ b/ecmascript/mem/object_xray.h @@ -18,7 +18,7 @@ #include -#include "common_interfaces/objects/composite_base_class.h" +#include "objects/composite_base_class.h" #include "ecmascript/byte_array.h" #include "ecmascript/ecma_vm.h" #include "ecmascript/js_async_from_sync_iterator.h" diff --git a/ecmascript/mem/tagged_object.h b/ecmascript/mem/tagged_object.h index ca0701bc00..fea6cd1dc9 100644 --- a/ecmascript/mem/tagged_object.h +++ b/ecmascript/mem/tagged_object.h @@ -16,8 +16,8 @@ #ifndef ECMASCRIPT_TAGGED_OBJECT_HEADER_H #define ECMASCRIPT_TAGGED_OBJECT_HEADER_H -#include "common_interfaces/base/mem.h" -#include "common_interfaces/objects/base_object.h" +#include "base/mem.h" +#include "objects/base_object.h" #include "ecmascript/mem/mark_word.h" #include "ecmascript/mem/shared_heap/shared_value_helper.h" #include "ecmascript/mem/tagged_state_word.h" diff --git a/ecmascript/mem/tagged_state_word.h b/ecmascript/mem/tagged_state_word.h index 402a3158b8..f11c85f178 100644 --- a/ecmascript/mem/tagged_state_word.h +++ b/ecmascript/mem/tagged_state_word.h @@ -16,8 +16,8 @@ #ifndef ECMASCRIPT_TAGGED_OBJECT_STATE_WORD_H #define ECMASCRIPT_TAGGED_OBJECT_STATE_WORD_H -#include "common_interfaces/base/common.h" -#include "common_interfaces/objects/base_state_word.h" +#include "base/common.h" +#include "objects/base_state_word.h" #include using ClassWordType = uint64_t; diff --git a/ecmascript/mem/visitor.h b/ecmascript/mem/visitor.h index 3b69b1d0c1..034edc073d 100644 --- a/ecmascript/mem/visitor.h +++ b/ecmascript/mem/visitor.h @@ -18,7 +18,7 @@ #include -#include "common_interfaces/heap/heap_visitor.h" +#include "heap/heap_visitor.h" #include "ecmascript/mem/slots.h" #include "ecmascript/mem/tagged_object.h" diff --git a/ecmascript/method.h b/ecmascript/method.h index 01a0ddb7f7..37dc0de7d8 100644 --- a/ecmascript/method.h +++ b/ecmascript/method.h @@ -24,7 +24,7 @@ #include "ecmascript/mem/c_string.h" #include "ecmascript/mem/visitor.h" -#include "libpandafile/file.h" +#include "file.h" namespace panda::ecmascript { class JSPandaFile; diff --git a/ecmascript/module/accessor/module_data_accessor.h b/ecmascript/module/accessor/module_data_accessor.h index f8222e89fb..fd4462a808 100644 --- a/ecmascript/module/accessor/module_data_accessor.h +++ b/ecmascript/module/accessor/module_data_accessor.h @@ -23,8 +23,8 @@ #include "ecmascript/module/js_module_source_text.h" -#include "libpandabase/macros.h" -#include "libpandabase/utils/span.h" +#include "macros.h" +#include "utils/span.h" namespace panda::ecmascript { class ModuleDataAccessor { diff --git a/ecmascript/napi/include/dfx_jsnapi.h b/ecmascript/napi/include/dfx_jsnapi.h index 9bb41d4688..ca9c06e7a3 100644 --- a/ecmascript/napi/include/dfx_jsnapi.h +++ b/ecmascript/napi/include/dfx_jsnapi.h @@ -27,7 +27,7 @@ #include "ecmascript/dfx/hprof/file_stream.h" #include "ecmascript/dfx/hprof/heap_profiler_interface.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda { namespace ecmascript { diff --git a/ecmascript/napi/include/jsnapi.h b/ecmascript/napi/include/jsnapi.h index 5da4acae8a..d7203144a1 100644 --- a/ecmascript/napi/include/jsnapi.h +++ b/ecmascript/napi/include/jsnapi.h @@ -31,7 +31,7 @@ #include "ecmascript/base/config.h" #include "ecmascript/napi/include/jsnapi_expo.h" #ifndef NDEBUG -#include "libpandabase/utils/debug.h" +#include "utils/debug.h" #endif #ifdef ERROR diff --git a/ecmascript/napi/include/jsnapi_expo.h b/ecmascript/napi/include/jsnapi_expo.h index e899866f31..28512994b4 100644 --- a/ecmascript/napi/include/jsnapi_expo.h +++ b/ecmascript/napi/include/jsnapi_expo.h @@ -34,7 +34,7 @@ #include "ecmascript/napi/include/jsnapi_internals.h" #ifndef NDEBUG -#include "libpandabase/utils/debug.h" +#include "utils/debug.h" #endif #ifdef ERROR diff --git a/ecmascript/object_factory.h b/ecmascript/object_factory.h index a764282ca6..bcfdec15dc 100644 --- a/ecmascript/object_factory.h +++ b/ecmascript/object_factory.h @@ -16,7 +16,7 @@ #ifndef ECMASCRIPT_OBJECT_FACTORY_H #define ECMASCRIPT_OBJECT_FACTORY_H -#include "common_interfaces/objects/base_class.h" +#include "objects/base_class.h" #include "ecmascript/base/error_type.h" #include "ecmascript/base/number_helper.h" #include "ecmascript/cross_vm/object_factory_hybrid.h" diff --git a/ecmascript/object_operator.h b/ecmascript/object_operator.h index 57125792db..1672262888 100644 --- a/ecmascript/object_operator.h +++ b/ecmascript/object_operator.h @@ -22,7 +22,7 @@ #include "ecmascript/property_attributes.h" #include "ecmascript/ecma_string.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" namespace panda::ecmascript { class PropertyDescriptor; diff --git a/ecmascript/ohos/aot_runtime_info.h b/ecmascript/ohos/aot_runtime_info.h index 7d133bace9..28cb289cd2 100644 --- a/ecmascript/ohos/aot_runtime_info.h +++ b/ecmascript/ohos/aot_runtime_info.h @@ -24,7 +24,7 @@ #include "ecmascript/platform/directory.h" #include "ecmascript/platform/file.h" #include "ecmascript/platform/map.h" -#include "libpandafile/file.h" +#include "file.h" #include "llvm/BinaryFormat/ELF.h" #include "ohos_constants.h" #include "utils/json_parser.h" diff --git a/ecmascript/ohos/enable_aot_list_helper.h b/ecmascript/ohos/enable_aot_list_helper.h index fae3701ff6..e4e2f20e42 100644 --- a/ecmascript/ohos/enable_aot_list_helper.h +++ b/ecmascript/ohos/enable_aot_list_helper.h @@ -27,7 +27,7 @@ #include "ecmascript/log_wrapper.h" #include "ecmascript/platform/file.h" #include "ecmascript/ohos/aot_runtime_info.h" -#include "libpandabase/macros.h" +#include "macros.h" #ifdef AOT_ESCAPE_ENABLE #include "parameters.h" diff --git a/ecmascript/ohos/framework_helper.h b/ecmascript/ohos/framework_helper.h index c6f501245b..2c207bf557 100644 --- a/ecmascript/ohos/framework_helper.h +++ b/ecmascript/ohos/framework_helper.h @@ -21,7 +21,7 @@ #include #include "ecmascript/platform/file.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class FrameworkHelper { diff --git a/ecmascript/ohos/ohos_preload_app_info.h b/ecmascript/ohos/ohos_preload_app_info.h index f6b63fc969..c94e6d69e4 100644 --- a/ecmascript/ohos/ohos_preload_app_info.h +++ b/ecmascript/ohos/ohos_preload_app_info.h @@ -21,7 +21,7 @@ #include #include "ecmascript/platform/file.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class OhosPreloadAppInfo { diff --git a/ecmascript/pgo_profiler/ap_file/pgo_file_info.h b/ecmascript/pgo_profiler/ap_file/pgo_file_info.h index 3ba8439907..10d96f0bd3 100644 --- a/ecmascript/pgo_profiler/ap_file/pgo_file_info.h +++ b/ecmascript/pgo_profiler/ap_file/pgo_file_info.h @@ -19,8 +19,8 @@ #include #include "ecmascript/common.h" -#include "libpandafile/file.h" -#include "libpandabase/macros.h" +#include "file.h" +#include "macros.h" #include "ecmascript/base/file_header.h" #include "ecmascript/compiler/aot_file/aot_version.h" diff --git a/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h b/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h index 25ae25483a..3f874cf9e4 100644 --- a/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h +++ b/ecmascript/pgo_profiler/ap_file/pgo_profile_type_pool.h @@ -33,7 +33,7 @@ #include "ecmascript/pgo_profiler/pgo_utils.h" #include "ecmascript/pgo_profiler/types/pgo_profile_type.h" #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::pgo { class PGOProfileTypePool { diff --git a/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h b/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h index ddde0b1f88..7ae7ec70a8 100644 --- a/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h +++ b/ecmascript/pgo_profiler/ap_file/pgo_proto_transition_type_pool.h @@ -30,7 +30,7 @@ #include "ecmascript/pgo_profiler/pgo_utils.h" #include "ecmascript/pgo_profiler/types/pgo_profile_type.h" #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::pgo { class PGOProtoTransitionPool : public PGOFileSectionInterface { diff --git a/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h b/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h index 7b40cf612a..d66758c720 100644 --- a/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h +++ b/ecmascript/pgo_profiler/ap_file/pgo_record_pool.h @@ -29,7 +29,7 @@ #include "ecmascript/pgo_profiler/ap_file/pool_template.h" #include "ecmascript/pgo_profiler/pgo_utils.h" #include "ecmascript/pgo_profiler/types/pgo_profile_type.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::pgo { class PGOProfilerHeader; diff --git a/ecmascript/pgo_profiler/pgo_context.h b/ecmascript/pgo_profiler/pgo_context.h index 9af716e7d7..46a48e9685 100644 --- a/ecmascript/pgo_profiler/pgo_context.h +++ b/ecmascript/pgo_profiler/pgo_context.h @@ -23,7 +23,7 @@ #include #include "ecmascript/pgo_profiler/pgo_utils.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::pgo { class PGOAbcFilePool; diff --git a/ecmascript/pgo_profiler/pgo_info.h b/ecmascript/pgo_profiler/pgo_info.h index 43da5639e7..7dbdee1d8a 100644 --- a/ecmascript/pgo_profiler/pgo_info.h +++ b/ecmascript/pgo_profiler/pgo_info.h @@ -19,7 +19,7 @@ #include #include -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/mem/c_string.h" #include "ecmascript/pgo_profiler/pgo_utils.h" diff --git a/ecmascript/pgo_profiler/pgo_profiler_encoder.h b/ecmascript/pgo_profiler/pgo_profiler_encoder.h index da37a4481d..da290653bc 100644 --- a/ecmascript/pgo_profiler/pgo_profiler_encoder.h +++ b/ecmascript/pgo_profiler/pgo_profiler_encoder.h @@ -20,7 +20,7 @@ #include #include -#include "libpandabase/macros.h" +#include "macros.h" #include "ecmascript/pgo_profiler/pgo_info.h" #include "ecmascript/pgo_profiler/pgo_profiler_info.h" diff --git a/ecmascript/pgo_profiler/pgo_profiler_info.h b/ecmascript/pgo_profiler/pgo_profiler_info.h index 8365496610..e465471647 100644 --- a/ecmascript/pgo_profiler/pgo_profiler_info.h +++ b/ecmascript/pgo_profiler/pgo_profiler_info.h @@ -44,7 +44,7 @@ #include "ecmascript/pgo_profiler/types/pgo_profiler_type.h" #include "ecmascript/property_attributes.h" #include "ecmascript/ts_types/global_type_info.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::pgo { class PGOContext; diff --git a/ecmascript/pgo_profiler/pgo_utils.h b/ecmascript/pgo_profiler/pgo_utils.h index cf709d8373..6deba1f86a 100644 --- a/ecmascript/pgo_profiler/pgo_utils.h +++ b/ecmascript/pgo_profiler/pgo_utils.h @@ -21,7 +21,7 @@ #include #include -#include "libpandafile/file.h" +#include "file.h" #include "ecmascript/common.h" #include "ecmascript/log_wrapper.h" diff --git a/ecmascript/pgo_profiler/types/pgo_profile_type.h b/ecmascript/pgo_profiler/types/pgo_profile_type.h index fa5c27cd97..1ed16b4ccb 100644 --- a/ecmascript/pgo_profiler/types/pgo_profile_type.h +++ b/ecmascript/pgo_profiler/types/pgo_profile_type.h @@ -30,8 +30,8 @@ #include "ecmascript/pgo_profiler/pgo_context.h" #include "ecmascript/pgo_profiler/pgo_utils.h" #include "ecmascript/on_heap.h" -#include "libpandabase/utils/bit_field.h" -#include "libpandabase/macros.h" +#include "utils/bit_field.h" +#include "macros.h" namespace panda::ecmascript::pgo { class ProfileTypeRef; diff --git a/ecmascript/pgo_profiler/types/pgo_profiler_type.h b/ecmascript/pgo_profiler/types/pgo_profiler_type.h index 0db8eeaa1b..28ef6f2b60 100644 --- a/ecmascript/pgo_profiler/types/pgo_profiler_type.h +++ b/ecmascript/pgo_profiler/types/pgo_profiler_type.h @@ -29,8 +29,8 @@ #include "ecmascript/log_wrapper.h" #include "ecmascript/pgo_profiler/pgo_utils.h" #include "ecmascript/pgo_profiler/types/pgo_profile_type.h" -#include "libpandabase/utils/bit_field.h" -#include "libpandabase/macros.h" +#include "utils/bit_field.h" +#include "macros.h" namespace panda::ecmascript::pgo { class PGOContext; diff --git a/ecmascript/platform/mutex.h b/ecmascript/platform/mutex.h index a1f0ca2e15..722685e6e5 100644 --- a/ecmascript/platform/mutex.h +++ b/ecmascript/platform/mutex.h @@ -20,7 +20,7 @@ #include #include "ecmascript/common.h" -#include "libpandabase/macros.h" +#include "macros.h" #if defined(PANDA_USE_FUTEX) #include "ecmascript/platform/unix/futex.h" diff --git a/ecmascript/property_attributes.h b/ecmascript/property_attributes.h index 8bea89d1b1..d233445ceb 100644 --- a/ecmascript/property_attributes.h +++ b/ecmascript/property_attributes.h @@ -18,7 +18,7 @@ #include "ecmascript/js_tagged_value.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" namespace panda::ecmascript { class PropertyDescriptor; diff --git a/ecmascript/runtime.h b/ecmascript/runtime.h index 37f08682c8..9b48ac29a9 100644 --- a/ecmascript/runtime.h +++ b/ecmascript/runtime.h @@ -16,7 +16,7 @@ #ifndef ECMASCRIPT_RUNTIME_H #define ECMASCRIPT_RUNTIME_H -#include "common_interfaces/base_runtime.h" +#include "base_runtime.h" #include "ecmascript/ecma_string_table.h" #include "ecmascript/global_env_constants.h" #include "ecmascript/js_runtime_options.h" @@ -29,7 +29,7 @@ #include "ecmascript/platform/mutex.h" #include "ecmascript/serializer/serialize_chunk.h" -#include "libpandabase/macros.h" +#include "macros.h" #include #include diff --git a/ecmascript/shared_objects/concurrent_api_scope.h b/ecmascript/shared_objects/concurrent_api_scope.h index 6b29f41e5c..c263293e84 100644 --- a/ecmascript/shared_objects/concurrent_api_scope.h +++ b/ecmascript/shared_objects/concurrent_api_scope.h @@ -21,7 +21,7 @@ #include "ecmascript/shared_objects/js_shared_typed_array.h" #include "ecmascript/containers/containers_errors.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { enum class ModType : uint8_t { diff --git a/ecmascript/snapshot/mem/encode_bit.h b/ecmascript/snapshot/mem/encode_bit.h index a05b0708fa..b7045ac3ce 100644 --- a/ecmascript/snapshot/mem/encode_bit.h +++ b/ecmascript/snapshot/mem/encode_bit.h @@ -20,7 +20,7 @@ #include "ecmascript/mem/slots.h" #include "ecmascript/snapshot/mem/constants.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" /* * EncodeBit: use uint64_t value to encode TaggedObject when serialize diff --git a/ecmascript/snapshot/mem/snapshot.h b/ecmascript/snapshot/mem/snapshot.h index bb650bef64..32c0c3c8b5 100644 --- a/ecmascript/snapshot/mem/snapshot.h +++ b/ecmascript/snapshot/mem/snapshot.h @@ -22,7 +22,7 @@ #include "ecmascript/snapshot/mem/encode_bit.h" #include "ecmascript/snapshot/mem/snapshot_processor.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class Program; diff --git a/ecmascript/snapshot/mem/snapshot_processor.h b/ecmascript/snapshot/mem/snapshot_processor.h index 517674c277..2bf5987d23 100644 --- a/ecmascript/snapshot/mem/snapshot_processor.h +++ b/ecmascript/snapshot/mem/snapshot_processor.h @@ -27,7 +27,7 @@ #include "ecmascript/js_tagged_value.h" #include "ecmascript/mem/object_xray.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class EcmaVM; diff --git a/ecmascript/stackmap/ark_stackmap_builder.h b/ecmascript/stackmap/ark_stackmap_builder.h index 64ee715bce..5596b98cd6 100644 --- a/ecmascript/stackmap/ark_stackmap_builder.h +++ b/ecmascript/stackmap/ark_stackmap_builder.h @@ -27,7 +27,7 @@ #include "ecmascript/stackmap/ark_stackmap.h" #include "ecmascript/stackmap/llvm/llvm_stackmap_type.h" -#include "libpandabase/utils/leb128.h" +#include "utils/leb128.h" namespace panda::ecmascript { class BinaryBufferParser; } diff --git a/ecmascript/stackmap/llvm/llvm_stackmap_type.h b/ecmascript/stackmap/llvm/llvm_stackmap_type.h index 4b56973f4a..ba48cc9b98 100644 --- a/ecmascript/stackmap/llvm/llvm_stackmap_type.h +++ b/ecmascript/stackmap/llvm/llvm_stackmap_type.h @@ -29,7 +29,7 @@ #include "ecmascript/mem/mem.h" #include "ecmascript/stackmap/cg_stackmap.h" -#include "libpandabase/utils/leb128.h" +#include "utils/leb128.h" namespace panda::ecmascript::kungfu { struct LocationTy { diff --git a/ecmascript/ts_types/global_ts_type_ref.h b/ecmascript/ts_types/global_ts_type_ref.h index 8f250cb4c4..970998ab43 100644 --- a/ecmascript/ts_types/global_ts_type_ref.h +++ b/ecmascript/ts_types/global_ts_type_ref.h @@ -17,7 +17,7 @@ #define ECMASCRIPT_TS_TYPES_GLOBAL_TS_TYPE_REF_H #include "ecmascript/log_wrapper.h" -#include "libpandabase/utils/bit_field.h" +#include "utils/bit_field.h" namespace panda::ecmascript { enum class TSTypeKind : uint8_t { -- Gitee