From 90da364a4da1f46b29628ceb10cb368f9fa0829e Mon Sep 17 00:00:00 2001 From: qianyong325 Date: Sat, 13 Sep 2025 16:23:09 +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 --- tooling/dynamic/BUILD.gn | 5 ++++- tooling/dynamic/agent/animation_impl.h | 2 +- tooling/dynamic/agent/css_impl.h | 2 +- tooling/dynamic/agent/debugger_impl.h | 2 +- tooling/dynamic/agent/dom_impl.h | 2 +- tooling/dynamic/agent/heapprofiler_impl.h | 2 +- tooling/dynamic/agent/overlay_impl.h | 2 +- tooling/dynamic/agent/page_impl.h | 2 +- tooling/dynamic/agent/profiler_impl.h | 2 +- tooling/dynamic/agent/runtime_impl.h | 2 +- tooling/dynamic/agent/target_impl.h | 2 +- tooling/dynamic/agent/tracing_impl.h | 2 +- tooling/dynamic/backend/debugger_executor.h | 2 +- tooling/dynamic/backend/js_pt_hooks.h | 2 +- tooling/dynamic/backend/js_single_stepper.h | 2 +- tooling/dynamic/base/pt_events.h | 2 +- tooling/dynamic/base/pt_script.h | 2 +- tooling/dynamic/base/pt_types.h | 2 +- tooling/dynamic/dispatcher.h | 2 +- tooling/dynamic/protocol_channel.h | 2 +- tooling/dynamic/test/BUILD.gn | 2 ++ tooling/dynamic/test/utils/test_extractor.cpp | 16 ++++++++-------- 22 files changed, 33 insertions(+), 28 deletions(-) diff --git a/tooling/dynamic/BUILD.gn b/tooling/dynamic/BUILD.gn index f844b7a9..a63164cc 100644 --- a/tooling/dynamic/BUILD.gn +++ b/tooling/dynamic/BUILD.gn @@ -141,7 +141,10 @@ ohos_static_library("libark_ecma_debugger_test") { external_deps = [ "libuv:uv", ] - external_deps += [ "ets_runtime:libark_jsruntime" ] + external_deps += [ + "bounds_checking_function:libsec_shared", + "ets_runtime:libark_jsruntime", + ] if ((is_arkui_x && target_os == "ios") || target_os == "mac") { external_deps += [ "cJSON:cjson_static" ] } else { diff --git a/tooling/dynamic/agent/animation_impl.h b/tooling/dynamic/agent/animation_impl.h index 827b562c..ba30f57d 100755 --- a/tooling/dynamic/agent/animation_impl.h +++ b/tooling/dynamic/agent/animation_impl.h @@ -20,7 +20,7 @@ #include "base/pt_returns.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class AnimationImpl final { diff --git a/tooling/dynamic/agent/css_impl.h b/tooling/dynamic/agent/css_impl.h index 78152811..cc486b04 100755 --- a/tooling/dynamic/agent/css_impl.h +++ b/tooling/dynamic/agent/css_impl.h @@ -20,7 +20,7 @@ #include "base/pt_returns.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class CssImpl final { diff --git a/tooling/dynamic/agent/debugger_impl.h b/tooling/dynamic/agent/debugger_impl.h index c04e540b..630d8ab1 100644 --- a/tooling/dynamic/agent/debugger_impl.h +++ b/tooling/dynamic/agent/debugger_impl.h @@ -24,7 +24,7 @@ #include "ecmascript/debugger/js_debugger_manager.h" #include "ecmascript/debugger/js_pt_method.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { namespace test { diff --git a/tooling/dynamic/agent/dom_impl.h b/tooling/dynamic/agent/dom_impl.h index 6e756964..2346b814 100755 --- a/tooling/dynamic/agent/dom_impl.h +++ b/tooling/dynamic/agent/dom_impl.h @@ -20,7 +20,7 @@ #include "base/pt_returns.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class DomImpl final { diff --git a/tooling/dynamic/agent/heapprofiler_impl.h b/tooling/dynamic/agent/heapprofiler_impl.h index b0302e3e..282e9e86 100644 --- a/tooling/dynamic/agent/heapprofiler_impl.h +++ b/tooling/dynamic/agent/heapprofiler_impl.h @@ -30,7 +30,7 @@ #include "ecmascript/dfx/hprof/progress.h" #include "ecmascript/dfx/hprof/stream.h" #include "ecmascript/napi/include/dfx_jsnapi.h" -#include "libpandabase/macros.h" +#include "macros.h" #include diff --git a/tooling/dynamic/agent/overlay_impl.h b/tooling/dynamic/agent/overlay_impl.h index 8bc2a22b..d877fa1f 100755 --- a/tooling/dynamic/agent/overlay_impl.h +++ b/tooling/dynamic/agent/overlay_impl.h @@ -20,7 +20,7 @@ #include "base/pt_returns.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class OverlayImpl final { diff --git a/tooling/dynamic/agent/page_impl.h b/tooling/dynamic/agent/page_impl.h index 8c2dd135..c5072249 100755 --- a/tooling/dynamic/agent/page_impl.h +++ b/tooling/dynamic/agent/page_impl.h @@ -20,7 +20,7 @@ #include "base/pt_returns.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class PageImpl final { diff --git a/tooling/dynamic/agent/profiler_impl.h b/tooling/dynamic/agent/profiler_impl.h index ba10b5d7..f6a85984 100644 --- a/tooling/dynamic/agent/profiler_impl.h +++ b/tooling/dynamic/agent/profiler_impl.h @@ -21,7 +21,7 @@ #include "dispatcher.h" #include "ecmascript/dfx/cpu_profiler/samples_record.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class ProfilerImpl final { diff --git a/tooling/dynamic/agent/runtime_impl.h b/tooling/dynamic/agent/runtime_impl.h index 6eb307cc..b4e93b93 100644 --- a/tooling/dynamic/agent/runtime_impl.h +++ b/tooling/dynamic/agent/runtime_impl.h @@ -20,7 +20,7 @@ #include "tooling/dynamic/base/pt_params.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class RuntimeImpl final { diff --git a/tooling/dynamic/agent/target_impl.h b/tooling/dynamic/agent/target_impl.h index f292f96e..4fba135b 100755 --- a/tooling/dynamic/agent/target_impl.h +++ b/tooling/dynamic/agent/target_impl.h @@ -20,7 +20,7 @@ #include "base/pt_returns.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class TargetImpl final { diff --git a/tooling/dynamic/agent/tracing_impl.h b/tooling/dynamic/agent/tracing_impl.h index 36177689..0c85b120 100644 --- a/tooling/dynamic/agent/tracing_impl.h +++ b/tooling/dynamic/agent/tracing_impl.h @@ -26,7 +26,7 @@ #include "ecmascript/dfx/cpu_profiler/samples_record.h" #include "ecmascript/dfx/tracing/tracing.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class TracingImpl final { diff --git a/tooling/dynamic/backend/debugger_executor.h b/tooling/dynamic/backend/debugger_executor.h index e76d9a24..61a5ada5 100644 --- a/tooling/dynamic/backend/debugger_executor.h +++ b/tooling/dynamic/backend/debugger_executor.h @@ -18,7 +18,7 @@ #include "ecmascript/napi/include/jsnapi.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript { class FrameHandler; diff --git a/tooling/dynamic/backend/js_pt_hooks.h b/tooling/dynamic/backend/js_pt_hooks.h index d84bfd30..c56d8cb2 100644 --- a/tooling/dynamic/backend/js_pt_hooks.h +++ b/tooling/dynamic/backend/js_pt_hooks.h @@ -20,7 +20,7 @@ #include "tooling/dynamic/base/pt_script.h" #include "ecmascript/debugger/js_debugger_interface.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class DebuggerImpl; diff --git a/tooling/dynamic/backend/js_single_stepper.h b/tooling/dynamic/backend/js_single_stepper.h index d098a265..fa3c79f7 100644 --- a/tooling/dynamic/backend/js_single_stepper.h +++ b/tooling/dynamic/backend/js_single_stepper.h @@ -21,7 +21,7 @@ #include "ecmascript/js_thread.h" #include "ecmascript/jspandafile/debug_info_extractor.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class SingleStepper { diff --git a/tooling/dynamic/base/pt_events.h b/tooling/dynamic/base/pt_events.h index 1ecaba86..7254d030 100644 --- a/tooling/dynamic/base/pt_events.h +++ b/tooling/dynamic/base/pt_events.h @@ -24,7 +24,7 @@ #include "tooling/dynamic/base/pt_types.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class PtBaseEvents : public PtBaseTypes { diff --git a/tooling/dynamic/base/pt_script.h b/tooling/dynamic/base/pt_script.h index d4d565f0..71cfcc96 100644 --- a/tooling/dynamic/base/pt_script.h +++ b/tooling/dynamic/base/pt_script.h @@ -18,7 +18,7 @@ #include "tooling/dynamic/base/pt_types.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { enum class ScriptMatchType : uint8_t { diff --git a/tooling/dynamic/base/pt_types.h b/tooling/dynamic/base/pt_types.h index 2907c0e5..fd934e72 100644 --- a/tooling/dynamic/base/pt_types.h +++ b/tooling/dynamic/base/pt_types.h @@ -27,7 +27,7 @@ #include "ecmascript/debugger/debugger_api.h" #include "ecmascript/dfx/cpu_profiler/samples_record.h" #include "ecmascript/dfx/hprof/heap_sampling.h" -#include "libpandabase/macros.h" +#include "macros.h" using ToolchainUtils = OHOS::ArkCompiler::Toolchain::Utils; diff --git a/tooling/dynamic/dispatcher.h b/tooling/dynamic/dispatcher.h index f2defc21..4b29a070 100644 --- a/tooling/dynamic/dispatcher.h +++ b/tooling/dynamic/dispatcher.h @@ -24,7 +24,7 @@ #include "ecmascript/debugger/js_debugger_interface.h" #include "ecmascript/napi/include/jsnapi.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class ProtocolChannel; diff --git a/tooling/dynamic/protocol_channel.h b/tooling/dynamic/protocol_channel.h index d4e4b543..f899f302 100644 --- a/tooling/dynamic/protocol_channel.h +++ b/tooling/dynamic/protocol_channel.h @@ -20,7 +20,7 @@ #include "tooling/dynamic/base/pt_returns.h" #include "dispatcher.h" -#include "libpandabase/macros.h" +#include "macros.h" namespace panda::ecmascript::tooling { class ProtocolChannel { diff --git a/tooling/dynamic/test/BUILD.gn b/tooling/dynamic/test/BUILD.gn index 667272e9..c74c6390 100644 --- a/tooling/dynamic/test/BUILD.gn +++ b/tooling/dynamic/test/BUILD.gn @@ -183,6 +183,7 @@ host_unittest_action("DebuggerEntryTest") { # hiviewdfx libraries external_deps = hiviewdfx_ext_deps external_deps += [ + "bounds_checking_function:libsec_shared", "cJSON:cjson_static", "ets_runtime:libark_jsruntime", "icu:shared_icui18n", @@ -268,6 +269,7 @@ host_unittest_action("DebuggerCInterpTest") { # hiviewdfx libraries external_deps = hiviewdfx_ext_deps external_deps += [ + "bounds_checking_function:libsec_shared", "cJSON:cjson_static", "ets_runtime:libark_jsruntime", "icu:shared_icui18n", diff --git a/tooling/dynamic/test/utils/test_extractor.cpp b/tooling/dynamic/test/utils/test_extractor.cpp index 5a57694e..9048e73e 100644 --- a/tooling/dynamic/test/utils/test_extractor.cpp +++ b/tooling/dynamic/test/utils/test_extractor.cpp @@ -16,14 +16,14 @@ #include "test/utils/test_extractor.h" -#include "libpandabase/utils/leb128.h" -#include "libpandabase/utils/utf.h" -#include "libpandafile/class_data_accessor-inl.h" -#include "libpandafile/code_data_accessor-inl.h" -#include "libpandafile/debug_data_accessor-inl.h" -#include "libpandafile/helpers.h" -#include "libpandafile/method_data_accessor-inl.h" -#include "libpandafile/proto_data_accessor-inl.h" +#include "utils/leb128.h" +#include "utils/utf.h" +#include "class_data_accessor-inl.h" +#include "code_data_accessor-inl.h" +#include "debug_data_accessor-inl.h" +#include "helpers.h" +#include "method_data_accessor-inl.h" +#include "proto_data_accessor-inl.h" namespace panda::ecmascript::tooling::test { std::pair TestExtractor::GetBreakpointAddress(const SourceLocation &sourceLocation) -- Gitee