Reapply "Add a level of indirection to exception handler addresses."

src/code-stubs.h

 // Copyright 2011 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 157 matching lines @@
   void GenerateCode(MacroAssembler* masm);
 
   // Generates the assembler code for the stub.
   virtual void Generate(MacroAssembler* masm) = 0;
 
   // Perform bookkeeping required after code generation when stub code is
   // initially generated.
   void RecordCodeGeneration(Code* code, MacroAssembler* masm);
 
   // Finish the code object after it has been generated.
-  virtual void FinishCode(Code* code) { }
+  virtual void FinishCode(Handle<Code> code) { }
 
   // Activate newly generated stub. Is called after
   // registering stub in the stub cache.
   virtual void Activate(Code* code) { }
 
   // Returns information for computing the number key.
   virtual Major MajorKey() = 0;
   virtual int MinorKey() = 0;
 
   // BinaryOpStub needs to override this.
@@ skipping 245 matching lines @@
       : op_(op), state_(state) {
     ASSERT(Token::IsCompareOp(op));
   }
 
   virtual void Generate(MacroAssembler* masm);
 
  private:
   class OpField: public BitField<int, 0, 3> { };
   class StateField: public BitField<int, 3, 5> { };
 
-  virtual void FinishCode(Code* code) { code->set_compare_state(state_); }
+  virtual void FinishCode(Handle<Code> code) {
+    code->set_compare_state(state_);
+  }
 
   virtual CodeStub::Major MajorKey() { return CompareIC; }
   virtual int MinorKey();
 
   virtual int GetCodeKind() { return Code::COMPARE_IC; }
 
   void GenerateSmis(MacroAssembler* masm);
   void GenerateHeapNumbers(MacroAssembler* masm);
   void GenerateSymbols(MacroAssembler* masm);
   void GenerateStrings(MacroAssembler* masm);
@@ skipping 82 matching lines @@
   class IncludeNumberCompareField: public BitField<bool, 2, 1> {};
   class IncludeSmiCompareField: public  BitField<bool, 3, 1> {};
   class RegisterField: public BitField<bool, 4, 1> {};
   class ConditionField: public BitField<int, 5, 11> {};
 
   Major MajorKey() { return Compare; }
 
   int MinorKey();
 
   virtual int GetCodeKind() { return Code::COMPARE_IC; }
-  virtual void FinishCode(Code* code) {
+  virtual void FinishCode(Handle<Code> code) {
     code->set_compare_state(CompareIC::GENERIC);
   }
 
   // Branch to the label if the given object isn't a symbol.
   void BranchIfNonSymbol(MacroAssembler* masm,
                          Label* label,
                          Register object,
                          Register scratch);
 
   // Unfortunately you have to run without snapshots to see most of these
@@ skipping 44 matching lines @@
   JSEntryStub() { }
 
   void Generate(MacroAssembler* masm) { GenerateBody(masm, false); }
 
  protected:
   void GenerateBody(MacroAssembler* masm, bool is_construct);
 
  private:
   Major MajorKey() { return JSEntry; }
   int MinorKey() { return 0; }
+
+  virtual void FinishCode(Handle<Code> code);
+
+  int handler_offset_;
 };
 
 
 class JSConstructEntryStub : public JSEntryStub {
  public:
   JSConstructEntryStub() { }
 
   void Generate(MacroAssembler* masm) { GenerateBody(masm, true); }
 
  private:
@@ skipping 56 matching lines @@
 };
 
 
 class CallFunctionStub: public CodeStub {
  public:
   CallFunctionStub(int argc, CallFunctionFlags flags)
       : argc_(argc), flags_(flags) { }
 
   void Generate(MacroAssembler* masm);
 
-  virtual void FinishCode(Code* code);
+  virtual void FinishCode(Handle<Code> code);
 
   static void Clear(Heap* heap, Address address);
 
   static Object* GetCachedValue(Address address);
 
   static int ExtractArgcFromMinorKey(int minor_key) {
     return ArgcBits::decode(minor_key);
   }
 
   // The object that indicates an uninitialized cache.
@@ skipping 290 matching lines @@
   void Generate(MacroAssembler* masm);
   virtual int GetCodeKind() { return Code::TO_BOOLEAN_IC; }
   virtual void PrintName(StringStream* stream);
 
   virtual bool SometimesSetsUpAFrame() { return false; }
 
  private:
   Major MajorKey() { return ToBoolean; }
   int MinorKey() { return (tos_.code() << NUMBER_OF_TYPES) | types_.ToByte(); }
 
-  virtual void FinishCode(Code* code) {
+  virtual void FinishCode(Handle<Code> code) {
     code->set_to_boolean_state(types_.ToByte());
   }
 
   void CheckOddball(MacroAssembler* masm,
                     Type type,
                     Heap::RootListIndex value,
                     bool result);
   void GenerateTypeTransition(MacroAssembler* masm);
 
   Register tos_;
@@ skipping 46 matching lines @@
   int MinorKey() { return 0; }
 
   void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(StoreArrayLiteralElementStub);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_