Merge bleeding_edge 18658:18677

src/objects.cc

Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 654bd14f51435d184de24609597720d3dacdec62..8256764158e47e88d6aa687ccb443cab0118a3ad 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -10877,17 +10877,6 @@ bool Code::CanDeoptAt(Address pc) {
 }
 
 
-bool Code::IsContextual() {
-  ASSERT(is_inline_cache_stub());
-  Kind kind = this->kind();
-  if (kind == STORE_IC || kind == LOAD_IC || kind == CALL_IC) {
-    ExtraICState extra_state = extra_ic_state();
-    return IC::GetContextualMode(extra_state) == CONTEXTUAL;
-  }
-  return false;
-}
-
-
 // Identify kind of code.
 const char* Code::Kind2String(Kind kind) {
   switch (kind) {
@@ -11111,11 +11100,6 @@ void Code::PrintExtraICState(FILE* out, Kind kind, ExtraICState extra) {
   PrintF(out, "extra_ic_state = ");
   const char* name = NULL;
   switch (kind) {
-    case CALL_IC:
-      if (extra == STRING_INDEX_OUT_OF_BOUNDS) {
-        name = "STRING_INDEX_OUT_OF_BOUNDS";
-      }
-      break;
     case STORE_IC:
     case KEYED_STORE_IC:
       if (extra == kStrictMode) {