Fixed regression introduced in r9027.

src/x64/regexp-macro-assembler-x64.cc

Index: src/x64/regexp-macro-assembler-x64.cc
diff --git a/src/x64/regexp-macro-assembler-x64.cc b/src/x64/regexp-macro-assembler-x64.cc
index 8595c6df91f3efd661d472d4cdea6495c3233635..7f804477f3a405609bea79237c806bb0675cf6f2 100644
--- a/src/x64/regexp-macro-assembler-x64.cc
+++ b/src/x64/regexp-macro-assembler-x64.cc
@@ -1185,7 +1185,7 @@ int RegExpMacroAssemblerX64::CheckStackGuardState(Address* return_address,
   MaybeObject* result = Execution::HandleStackGuardInterrupt();
 
   if (*code_handle != re_code) {  // Return address no longer valid
-    int delta = *code_handle - re_code;
+    intptr_t delta = *code_handle - re_code;

[Sven Panne, 2011/08/26 13:36:21]

This change looks OK, but...

     // Overwrite the return address on the stack.
     *return_address += delta;

[Sven Panne, 2011/08/26 13:36:21]

This (old) code looks wrong: The delta is in units of Code, but we add it onto a
byte pointer. Is this really correct? I suspect that we should cast the Code
pointers to byte pointers before doing the subtraction. If I am wrong, a comment
why the code is correct should be added.

[Vyacheslav Egorov (Chromium), 2011/08/26 13:41:03]

Yes. Nice catch.

For type safety we need to do code_handle->address() - re_code->address().

sizeof(Code) == 0 so I guess it somehow worked as expected.

   }