From d7a4b837ffc01a0dbe264caec8ab466994fdb970 Mon Sep 17 00:00:00 2001
From: Petrov Igor <petrov.igor1@huawei.com>
Date: Fri, 15 Jul 2022 14:29:12 +0300
Subject: [PATCH] [MM] Refactor heap verifier options

Change-Id: I0bdc99174128ec4e646ea03ff98581d270ca1179
Signed-off-by: Petrov Igor <petrov.igor1@huawei.com>
---
 runtime_options.yaml                          | 35 ++++++-------------
 .../tooling/options_test/options_test.cpp     |  2 +-
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/runtime_options.yaml b/runtime_options.yaml
index 95c135d5d..8846157e9 100644
--- a/runtime_options.yaml
+++ b/runtime_options.yaml
@@ -144,33 +144,18 @@ options:
   default: true
   description: Enable fast heap verifier, which is faster than ordinary heap verifier but uses more internal memory
 
-- name: fail-on-heap-verification
+- name: heap-verifier
   lang:
     - ecmascript
-  type: bool
-  default: false
-  description: if enabled then fail execution if heap verifier found heap corruption
-
-- name: pre-gc-heap-verify-enabled
-  lang:
-    - ecmascript
-  type: bool
-  default: false
-  description: whether verify heap before GC
-
-- name: into-gc-heap-verify-enabled
-  lang:
-    - ecmascript
-  type: bool
-  default: false
-  description: whether verify heap during GC
-
-- name: post-gc-heap-verify-enabled
-  lang:
-    - ecmascript
-  type: bool
-  default: false
-  description: whether verify heap after GC
+  type: arg_list_t
+  default: []
+  possible_values:
+    - pre
+    - into
+    - post
+    - fail_on_verification
+  description: parameters for heap verification
+  delimiter: ":"
 
 - name: concurrent-gc-enabled
   lang:
diff --git a/tests/runtime/tooling/options_test/options_test.cpp b/tests/runtime/tooling/options_test/options_test.cpp
index 8d3db2d73..f5afc7bec 100644
--- a/tests/runtime/tooling/options_test/options_test.cpp
+++ b/tests/runtime/tooling/options_test/options_test.cpp
@@ -35,7 +35,7 @@ void EcmascriptRuntimeOptionsTest::LoadCorrectOptionsList()
 {
     AddTestingOption("ecmascript.run-gc-in-place", "true");
     AddTestingOption("ecmascript.gc-dump-heap", "true");
-    AddTestingOption("ecmascript.pre-gc-heap-verify-enabled", "true");
+    AddTestingOption("ecmascript.heap-verifier", "pre");
     AddTestingOption("gc-trigger-type", "no-gc-for-start-up");
 }
 
-- 
Gitee