From 7547c5c27e2454f686268b09b2eda084bc4fc6de Mon Sep 17 00:00:00 2001
From: Anna Antipina <antipina.anna1@huawei.com>
Date: Sat, 6 Sep 2025 15:12:25 +0300
Subject: [PATCH] Enable AOT verifier by default

Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICWPZW

Enable ahead-of-time verification by default in runtime

Change-Id: I0572fd798af57a5beaca266a94eb5013269b95e1
Signed-off-by: Anna Antipina <antipina.anna1@huawei.com>
---
 static_core/runtime/CMakeLists.txt | 17 +++++++++++++----
 static_core/runtime/options.yaml   |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/static_core/runtime/CMakeLists.txt b/static_core/runtime/CMakeLists.txt
index 607f816b06..0aacdd90ed 100644
--- a/static_core/runtime/CMakeLists.txt
+++ b/static_core/runtime/CMakeLists.txt
@@ -820,11 +820,9 @@ add_gtests(
     NO_WARNING_FILTER
 )
 
-add_gtests(
-    arkruntime_core_layout_test
+set(LAYOUT_TESTS_SOURCES
     tests/array_test.cpp
     tests/mark_word_test.cpp
-    tests/method_test.cpp
     tests/compiler_thread_pool.cpp
     tests/mock_queue_thread_pool.cpp
     tests/string_table_test.cpp
@@ -832,6 +830,16 @@ add_gtests(
     tests/compilation_status_test.cpp
     tests/osr_code_test.cpp
 )
+if (NOT PANDA_QEMU_BUILD OR NOT PANDA_TARGET_ARM32)
+    # NOTE: not enough user space for class allocation after enabling AOT veifier by default.
+    # Issue: #29519
+    list(APPEND LAYOUT_TESTS_SOURCES tests/method_test.cpp)
+endif()
+
+add_gtests(
+    arkruntime_core_layout_test
+    ${LAYOUT_TESTS_SOURCES}
+)
 
 add_gtests(
     arkruntime_get_method_test
@@ -1025,7 +1033,8 @@ if (TARGET arkruntime_test_interpreter_impl)
         tests/invokation_helper.cpp
     )
     if (NOT PANDA_QEMU_BUILD OR NOT PANDA_TARGET_ARM32)
-        # NOTE: not enough user space for class allocation after enabling AOT veifier by default. Issue: #29519
+        # NOTE: not enough user space for class allocation after enabling AOT veifier by default.
+        # Issue: #29519
         list(APPEND INTERPRETER_TESTS_SOURCES tests/exception_test.cpp)
     endif()
         
diff --git a/static_core/runtime/options.yaml b/static_core/runtime/options.yaml
index 4e94c55c52..ecb37b4f82 100644
--- a/static_core/runtime/options.yaml
+++ b/static_core/runtime/options.yaml
@@ -733,7 +733,7 @@ options:
 
 - name: verification-mode
   type: std::string
-  default: disabled
+  default: ahead-of-time
   possible_values:
     - disabled
     - on-the-fly
-- 
Gitee