| Index: src/ia32/regexp-macro-assembler-ia32.cc
|
| diff --git a/src/ia32/regexp-macro-assembler-ia32.cc b/src/ia32/regexp-macro-assembler-ia32.cc
|
| index e18638ee0207e4ef086102c322ca24f32f234fef..aa7f19964c512e5f80ad7e42d37a3c29aa772a87 100644
|
| --- a/src/ia32/regexp-macro-assembler-ia32.cc
|
| +++ b/src/ia32/regexp-macro-assembler-ia32.cc
|
| @@ -56,6 +56,7 @@ namespace internal {
|
| *
|
| * Each call to a public method should retain this convention.
|
| * The stack will have the following structure:
|
| + * - Isolate* isolate (Address of the current isolate)
|
| * - direct_call (if 1, direct call from JavaScript code, if 0
|
| * call through the runtime system)
|
| * - stack_area_base (High end of the memory area to use as
|
| @@ -1031,7 +1032,8 @@ static T& frame_entry(Address re_frame, int frame_offset) {
|
| int RegExpMacroAssemblerIA32::CheckStackGuardState(Address* return_address,
|
| Code* re_code,
|
| Address re_frame) {
|
| - Isolate* isolate = Isolate::Current();
|
| + Isolate* isolate = frame_entry<Isolate*>(re_frame, kIsolate);
|
| + ASSERT(isolate == Isolate::Current());
|
| if (isolate->stack_guard()->IsStackOverflow()) {
|
| isolate->StackOverflow();
|
| return EXCEPTION;
|
|
|