1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/optimizing/scheduler_arm64.cc b/compiler/optimizing/scheduler_arm64.cc
index 3071afd951..0c178f6d6e 100644
--- a/compiler/optimizing/scheduler_arm64.cc
+++ b/compiler/optimizing/scheduler_arm64.cc
@@ -91,7 +91,8 @@ void SchedulingLatencyVisitorARM64::VisitDiv(HDiv* instr) {
     default:
       // Follow the code path used by code generation.
       if (instr->GetRight()->IsConstant()) {
-        int64_t imm = Int64FromConstant(instr->GetRight()->AsConstant());
+        // TODO: Remove "OrNull".
+        int64_t imm = Int64FromConstant(instr->GetRight()->AsConstantOrNull());
         if (imm == 0) {
           last_visited_internal_latency_ = 0;
           last_visited_latency_ = 0;
@@ -159,7 +160,8 @@ void SchedulingLatencyVisitorARM64::VisitRem(HRem* instruction) {
   } else {
     // Follow the code path used by code generation.
     if (instruction->GetRight()->IsConstant()) {
-      int64_t imm = Int64FromConstant(instruction->GetRight()->AsConstant());
+      // TODO: Remove "OrNull".
+      int64_t imm = Int64FromConstant(instruction->GetRight()->AsConstantOrNull());
       if (imm == 0) {
         last_visited_internal_latency_ = 0;
         last_visited_latency_ = 0;