Also support smi in load-ICs.

src/arm/stub-cache-arm.cc

Index: src/arm/stub-cache-arm.cc
diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
index 3994aa0fdf946a7e2a8329bf38c862a1ef05f0ee..fefd4622ba808d979d380548f64042523433688b 100644
--- a/src/arm/stub-cache-arm.cc
+++ b/src/arm/stub-cache-arm.cc
@@ -3054,7 +3054,20 @@ Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(
     GenerateNameCheck(name, this->name(), &miss);
   }
 
-  __ JumpIfSmi(receiver(), &miss);
+  Label number_case;
+  Label* smi_handler = &miss;
+  for (int i = 0; i < receiver_maps->length(); ++i) {
+    Handle<Map> map = receiver_maps->at(i);
+    if (map.is_identical_to(isolate()->factory()->heap_number_map())) {
+      // Do not jump to the handler directly to ensure maps / handlers are still
+      // in sync so updating a polymorphic IC can gather maps / handlers in
+      // sequence.
+      smi_handler = &number_case;
+      break;
+    }
+  }
+  __ JumpIfSmi(receiver(), smi_handler);
+
   Register map_reg = scratch1();
 
   int receiver_count = receiver_maps->length();
@@ -3066,6 +3079,10 @@ Handle<Code> BaseLoadStoreStubCompiler::CompilePolymorphicIC(
       number_of_handled_maps++;
       __ mov(ip, Operand(receiver_maps->at(current)));
       __ cmp(map_reg, ip);
+      if (map.is_identical_to(isolate()->factory()->heap_number_map())) {
+        ASSERT(!number_case.is_unused());
+        __ bind(&number_case);
+      }
       __ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq);
     }
   }