Fix SDK version codes in ART w.r.t. API levels 32 and 33. am: 626def53a7
Original change: https://android-review.googlesource.com/c/platform/art/+/2194409
Change-Id: Ic7cf3581383baee3534482cd2c71fc8144c9194f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libartbase/base/sdk_version.h b/libartbase/base/sdk_version.h
index 07c3c2c..d39aa95 100644
--- a/libartbase/base/sdk_version.h
+++ b/libartbase/base/sdk_version.h
@@ -36,7 +36,8 @@
kQ = 29u,
kR = 30u,
kS = 31u,
- kT = 32u,
+ kS_V2 = 32u,
+ kT = 33u,
kMax = std::numeric_limits<uint32_t>::max(),
};
diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index ec0ac73..2f996f8 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -4899,7 +4899,7 @@
template <bool kVerifierDebug>
bool MethodVerifier<kVerifierDebug>::PotentiallyMarkRuntimeThrow() {
- if (IsAotMode() || IsSdkVersionSetAndAtLeast(api_level_, SdkVersion::kT)) {
+ if (IsAotMode() || IsSdkVersionSetAndAtLeast(api_level_, SdkVersion::kS_V2)) {
return false;
}
// Compatibility mode: we treat the following code unreachable and the verifier