Re-submitting binary op ICs for ARM. Does not break debug tests

src/ic.cc

 // Copyright 2006-2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1415 matching lines @@
     // conceptually closer.
     case GENERIC: return MEGAMORPHIC;
 
     default: return MONOMORPHIC;
   }
 }
 
 
 BinaryOpIC::TypeInfo BinaryOpIC::GetTypeInfo(Object* left,
                                              Object* right) {
-  // Patching is never requested for the two smis.
-  ASSERT(!left->IsSmi() || !right->IsSmi());
+  if (left->IsSmi() && right->IsSmi()) {
+    return GENERIC;
+  }
 
   if (left->IsNumber() && right->IsNumber()) {
     return HEAP_NUMBERS;
   }
 
   if (left->IsString() || right->IsString()) {
     // Patching for fast string ADD makes sense even if only one of the
     // arguments is a string.
     return STRINGS;
   }
@@ skipping 46 matching lines @@
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) {
   return IC_utilities[id];
 }
 
 
 } }  // namespace v8::internal