| Index: src/x64/simulator-x64.h
 | 
| diff --git a/src/x64/simulator-x64.h b/src/x64/simulator-x64.h
 | 
| index 99649ec018a0b2f7c88cc7be45fc49033c15612e..f1351c88cfe3b9d96d0c7134dc807cf3a2e8c5dc 100644
 | 
| --- a/src/x64/simulator-x64.h
 | 
| +++ b/src/x64/simulator-x64.h
 | 
| @@ -13,7 +13,7 @@ namespace internal {
 | 
|  // Since there is no simulator for the x64 architecture the only thing we can
 | 
|  // do is to call the entry directly.
 | 
|  // TODO(X64): Don't pass p0, since it isn't used?
 | 
| -#define CALL_GENERATED_CODE(entry, p0, p1, p2, p3, p4) \
 | 
| +#define CALL_GENERATED_CODE(isolate, entry, p0, p1, p2, p3, p4) \
 | 
|    (entry(p0, p1, p2, p3, p4))
 | 
|  
 | 
|  typedef int (*regexp_matcher)(String*, int, const byte*,
 | 
| @@ -21,7 +21,8 @@ typedef int (*regexp_matcher)(String*, int, const byte*,
 | 
|  
 | 
|  // Call the generated regexp code directly. The code at the entry address should
 | 
|  // expect eight int/pointer sized arguments and return an int.
 | 
| -#define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6, p7, p8) \
 | 
| +#define CALL_GENERATED_REGEXP_CODE(isolate, entry, p0, p1, p2, p3, p4, p5, p6, \
 | 
| +                                   p7, p8)                                     \
 | 
|    (FUNCTION_CAST<regexp_matcher>(entry)(p0, p1, p2, p3, p4, p5, p6, p7, p8))
 | 
|  
 | 
|  // The stack limit beyond which we will throw stack overflow errors in
 | 
| @@ -34,11 +35,13 @@ class SimulatorStack : public v8::internal::AllStatic {
 | 
|      return c_limit;
 | 
|    }
 | 
|  
 | 
| -  static inline uintptr_t RegisterCTryCatch(uintptr_t try_catch_address) {
 | 
| +  static inline uintptr_t RegisterCTryCatch(Isolate* isolate,
 | 
| +                                            uintptr_t try_catch_address) {
 | 
| +    USE(isolate);
 | 
|      return try_catch_address;
 | 
|    }
 | 
|  
 | 
| -  static inline void UnregisterCTryCatch() { }
 | 
| +  static inline void UnregisterCTryCatch(Isolate* isolate) { USE(isolate); }
 | 
|  };
 | 
|  
 | 
|  }  // namespace internal
 | 
| 
 |