| Index: src/assembler.h
 | 
| diff --git a/src/assembler.h b/src/assembler.h
 | 
| index 40df858331589a7793250d1cc94ea5d62f5e807e..6765211acc40926d8199f586681b7374bbf058a8 100644
 | 
| --- a/src/assembler.h
 | 
| +++ b/src/assembler.h
 | 
| @@ -1004,7 +1004,7 @@ class ExternalReference BASE_EMBEDDED {
 | 
|    Address address() const { return reinterpret_cast<Address>(address_); }
 | 
|  
 | 
|    // Used to check if single stepping is enabled in generated code.
 | 
| -  static ExternalReference debug_step_in_fp_address(Isolate* isolate);
 | 
| +  static ExternalReference debug_last_step_action_address(Isolate* isolate);
 | 
|  
 | 
|  #ifndef V8_INTERPRETED_REGEXP
 | 
|    // C functions called from RegExp generated code.
 | 
| @@ -1154,8 +1154,11 @@ class CallWrapper {
 | 
|    virtual void BeforeCall(int call_size) const = 0;
 | 
|    // Called just after emitting a call, i.e., at the return site for the call.
 | 
|    virtual void AfterCall() const = 0;
 | 
| +  // Return whether call needs to check for debug stepping.
 | 
| +  virtual bool NeedsDebugStepCheck() const { return false; }
 | 
|  };
 | 
|  
 | 
| +
 | 
|  class NullCallWrapper : public CallWrapper {
 | 
|   public:
 | 
|    NullCallWrapper() { }
 | 
| @@ -1165,6 +1168,16 @@ class NullCallWrapper : public CallWrapper {
 | 
|  };
 | 
|  
 | 
|  
 | 
| +class CheckDebugStepCallWrapper : public CallWrapper {
 | 
| + public:
 | 
| +  CheckDebugStepCallWrapper() {}
 | 
| +  virtual ~CheckDebugStepCallWrapper() {}
 | 
| +  virtual void BeforeCall(int call_size) const {}
 | 
| +  virtual void AfterCall() const {}
 | 
| +  virtual bool NeedsDebugStepCheck() const { return true; }
 | 
| +};
 | 
| +
 | 
| +
 | 
|  // -----------------------------------------------------------------------------
 | 
|  // Constant pool support
 | 
|  
 | 
| 
 |