Remove uses of the extract compiler filter.
Access checks tests don't need extract, they already pass
-Xverify:softfail.
Test: test.py
Bug: 237380287
Change-Id: I7793a84e162d61f77c763af28fbeb58468cbc826
diff --git a/test/1953-pop-frame/run.py b/test/1953-pop-frame/run.py
index 81e237f..6438a1b 100644
--- a/test/1953-pop-frame/run.py
+++ b/test/1953-pop-frame/run.py
@@ -25,6 +25,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if not (args.jvm or args.verify_soft_fail or not args.prebuild or
+ if not (args.jvm or not args.prebuild or
(args.jvmti_redefine_stress and args.host)):
ctx.expected_stdout = ctx.expected_stdout.with_suffix(".no-jvm.txt")
diff --git a/test/1954-pop-frame-jit/run.py b/test/1954-pop-frame-jit/run.py
index 459b447..43ece36 100644
--- a/test/1954-pop-frame-jit/run.py
+++ b/test/1954-pop-frame-jit/run.py
@@ -25,6 +25,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if (args.jvm or args.verify_soft_fail or not args.prebuild or
+ if (args.jvm or not args.prebuild or
(args.jvmti_redefine_stress and args.host)):
ctx.expected_stdout = ctx.expected_stdout.with_suffix(".jvm.txt")
diff --git a/test/1955-pop-frame-jit-called/run.py b/test/1955-pop-frame-jit-called/run.py
index a43b17d..44fe18e 100644
--- a/test/1955-pop-frame-jit-called/run.py
+++ b/test/1955-pop-frame-jit-called/run.py
@@ -31,6 +31,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if (args.jvm or args.verify_soft_fail or not args.prebuild or
+ if (args.jvm or not args.prebuild or
(args.jvmti_redefine_stress and args.host)):
ctx.expected_stdout = ctx.expected_stdout.with_suffix(".jvm.txt")
diff --git a/test/1956-pop-frame-jit-calling/run.py b/test/1956-pop-frame-jit-calling/run.py
index a43b17d..44fe18e 100644
--- a/test/1956-pop-frame-jit-calling/run.py
+++ b/test/1956-pop-frame-jit-calling/run.py
@@ -31,6 +31,6 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if (args.jvm or args.verify_soft_fail or not args.prebuild or
+ if (args.jvm or not args.prebuild or
(args.jvmti_redefine_stress and args.host)):
ctx.expected_stdout = ctx.expected_stdout.with_suffix(".jvm.txt")
diff --git a/test/1969-force-early-return-void/run.py b/test/1969-force-early-return-void/run.py
index dda04df..d80f46f 100644
--- a/test/1969-force-early-return-void/run.py
+++ b/test/1969-force-early-return-void/run.py
@@ -21,6 +21,5 @@
# The RI has restrictions and bugs around some PopFrame behavior that ART lacks.
# See b/116003018. Some configurations cannot handle the class load events in
# quite the right way so they are disabled there too.
- if not (args.verify_soft_fail or not args.prebuild or
- (args.jvmti_redefine_stress and args.host)):
+ if not (not args.prebuild or (args.jvmti_redefine_stress and args.host)):
ctx.expected_stdout = ctx.expected_stdout.with_suffix(".no-jvm.txt")
diff --git a/test/default_run.py b/test/default_run.py
index e102311..e3e5d21 100755
--- a/test/default_run.py
+++ b/test/default_run.py
@@ -669,8 +669,8 @@
INT_OPTS += " -Xcompiler-option --compiler-filter=verify"
COMPILE_FLAGS += " --compiler-filter=verify"
elif VERIFY == "s":
- INT_OPTS += " -Xcompiler-option --compiler-filter=extract"
- COMPILE_FLAGS += " --compiler-filter=extract"
+ INT_OPTS += " -Xcompiler-option --compiler-filter=verify"
+ COMPILE_FLAGS += " --compiler-filter=verify"
DEX_VERIFY = f"{DEX_VERIFY} -Xverify:softfail"
else: # VERIFY == "n"
INT_OPTS += " -Xcompiler-option --compiler-filter=assume-verified"