Remove extended_extra_ic_state and extend extra_ic_state instead.

src/code-stubs.h

Index: src/code-stubs.h
diff --git a/src/code-stubs.h b/src/code-stubs.h
index a7283ba642ef4ea2742cbba7ed77e9783faf39a1..49a5dd0783c56895b8b3e06a090fca6c388118a6 100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -188,8 +188,8 @@ class CodeStub BASE_EMBEDDED {
   virtual Code::StubType GetStubType() {
     return Code::NORMAL;
   }
-  virtual int GetStubFlags() {
-    return -1;
+  virtual Code::Kind GetHandlerKind() {
+    return Code::STUB;
   }
 
   virtual void PrintName(StringStream* stream);
@@ -883,7 +883,7 @@ class HICStub: public HydrogenCodeStub {
 class HandlerStub: public HICStub {
  public:
   virtual Code::Kind GetCodeKind() const { return Code::HANDLER; }
-  virtual int GetStubFlags() { return kind(); }
+  virtual Code::Kind GetHandlerKind() { return kind(); }
 
  protected:
   HandlerStub() : HICStub() { }