Merge "Adjust art::HTypeConversion's side effects for MIPS64."

1 files changed, 2 insertions, 3 deletions

diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 578b2208d8..0df5d6dd2e 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -3742,9 +3742,8 @@ class HTypeConversion : public HExpression<1> {
     // Some architectures may not require the 'GC' side effects, but at this point
     // in the compilation process we do not know what architecture we will
     // generate code for, so we must be conservative.
-    if (((input_type == Primitive::kPrimFloat || input_type == Primitive::kPrimDouble)
-         && result_type == Primitive::kPrimLong)
-        || (input_type == Primitive::kPrimLong && result_type == Primitive::kPrimFloat)) {
+    if ((Primitive::IsFloatingPointType(input_type) && Primitive::IsIntegralType(result_type))
+        || (input_type == Primitive::kPrimLong && Primitive::IsFloatingPointType(result_type))) {
       return SideEffects::CanTriggerGC();
     }
     return SideEffects::None();