summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/verifier/reg_type.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/verifier/reg_type.cc b/runtime/verifier/reg_type.cc
index c5e979ac71..a2b52f4f87 100644
--- a/runtime/verifier/reg_type.cc
+++ b/runtime/verifier/reg_type.cc
@@ -430,6 +430,9 @@ constexpr RegType::Kind RegTypeMergeImpl::MergeKind(RegType::Kind incoming_kind)
} else {
return Kind::kIntegerConstant;
}
+ } else if ((IsConstantLo() && incoming_type.IsConstantLo()) ||
+ (IsConstantHi() && incoming_type.IsConstantHi())) {
+ return GetKind();
} else if (IsIntegralTypes() && incoming_type.IsIntegralTypes()) {
if (IsBooleanTypes() && incoming_type.IsBooleanTypes()) {
return Kind::kBoolean; // boolean MERGE boolean => boolean