diff --git a/runtime/vm/compiler/assembler/assembler_arm64.cc b/runtime/vm/compiler/assembler/assembler_arm64.cc
index 38d0ada4664..759e52400b1 100644
--- a/runtime/vm/compiler/assembler/assembler_arm64.cc
+++ b/runtime/vm/compiler/assembler/assembler_arm64.cc
@@ -2377,7 +2377,7 @@ void Assembler::PushNativeCalleeSavedRegisters() {
 
 void Assembler::PopNativeCalleeSavedRegisters() {
   // Restore the bottom 64-bits of callee-saved V registers.
-  bool pop_single = (kAbiPreservedFpuRegCount & 1) == 1;
+  bool pop_single = (kAbiPreservedFpuRegCount & 1) != 0;
   VRegister vprev = kNoVRegister;
   for (int i = kAbiLastPreservedFpuReg; i >= kAbiFirstPreservedFpuReg; i--) {
     const VRegister r = static_cast<VRegister>(i);
@@ -2397,7 +2397,7 @@ void Assembler::PopNativeCalleeSavedRegisters() {
   // register when it is not holding a pool-pointer since we are returning to
   // C++ code. We also skip the dart stack pointer SP, since we are still
   // using it as the stack pointer.
-  pop_single = (kAbiPreservedCpuRegCount & 1) == 1;
+  pop_single = (kAbiPreservedCpuRegCount & 1) != 0;
   Register prev = kNoRegister;
   for (int i = kAbiLastPreservedCpuReg; i >= kAbiFirstPreservedCpuReg; i--) {
     Register r = static_cast<Register>(i);
diff --git a/runtime/vm/compiler/assembler/assembler_arm64.h b/runtime/vm/compiler/assembler/assembler_arm64.h
index 62f1e52ddc8..ab0075ddd31 100644
--- a/runtime/vm/compiler/assembler/assembler_arm64.h
+++ b/runtime/vm/compiler/assembler/assembler_arm64.h
@@ -351,6 +351,7 @@ class Address : public ValueObject {
       case Unknown:
         UNREACHABLE();
     }
+    return 0;
   }
 
   AddressType type() const { return type_; }