From 7be051d7e6f28f6705d04e6ead8e7fcd5db6439f Mon Sep 17 00:00:00 2001
From: Jordan DeLong <jdelong@fb.com>
Date: Wed, 3 Jul 2013 12:37:52 -0700
Subject: [PATCH] Check key types for KindOfInt64 instead of using isNumeric

---
 hphp/runtime/base/array/hphp_array.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hphp/runtime/base/array/hphp_array.cpp b/hphp/runtime/base/array/hphp_array.cpp
index c6b6bc05d..115f51aa4 100644
--- a/hphp/runtime/base/array/hphp_array.cpp
+++ b/hphp/runtime/base/array/hphp_array.cpp
@@ -1297,7 +1297,7 @@ ArrayData* HphpArray::plus(const ArrayData* elems, bool copy) {
   for (ArrayIter it(elems); !it.end(); it.next()) {
     Variant key = it.first();
     CVarRef value = it.secondRef();
-    if (key.isNumeric()) {
+    if (key.asTypedValue()->m_type == KindOfInt64) {
       a->addValWithRef(key.toInt64(), value);
     } else {
       a->addValWithRef(key.getStringData(), value);
@@ -1311,7 +1311,7 @@ ArrayData* HphpArray::merge(const ArrayData* elems, bool copy) {
   for (ArrayIter it(elems); !it.end(); it.next()) {
     Variant key = it.first();
     CVarRef value = it.secondRef();
-    if (key.isNumeric()) {
+    if (key.asTypedValue()->m_type == KindOfInt64) {
       a->nextInsertWithRef(value);
     } else {
       Variant *p;