Fix offset computation for EmitProfilingCounterReset in x64.

src/x64/deoptimizer-x64.cc

 // Copyright 2012 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 95 matching lines @@
   if (FLAG_trace_deopt) {
     PrintF("[forced deoptimization: ");
     function->PrintName();
     PrintF(" / %" V8PRIxPTR "]\n", reinterpret_cast<intptr_t>(function));
   }
 }
 
 
 static const byte kJnsInstruction = 0x79;
 static const byte kJnsOffset = 0x1f;
-static const byte kJnsOffsetDebugCode = 0x53;
 static const byte kJaeInstruction = 0x73;
 static const byte kJaeOffset = 0x07;
 static const byte kCallInstruction = 0xe8;
 static const byte kNopByteOne = 0x66;
 static const byte kNopByteTwo = 0x90;
 
 void Deoptimizer::PatchStackCheckCodeAt(Code* unoptimized_code,
                                         Address pc_after,
                                         Code* check_code,
                                         Code* replacement_code) {
@@ skipping 12 matching lines @@
   //
   //     cmp rsp, <limit>  ;; Not changed
   //     nop
   //     nop
   //     call <on-stack replacment>
   //     test rax, <loop nesting depth>
   // ok:
   //
   if (FLAG_count_based_interrupts) {
     ASSERT_EQ(kJnsInstruction,       *(call_target_address - 3));
-    if (FLAG_debug_code) {
-      // FullCodeGenerator::EmitProfilingCounterReset() makes use of
-      // masm->Move(Operand&, Smi*), which generates additional code
-      // when FLAG_debug_code is set, so the jump offset is larger
-      // in that case.
-      ASSERT_EQ(kJnsOffsetDebugCode, *(call_target_address - 2));
-    } else {
-      ASSERT_EQ(kJnsOffset,          *(call_target_address - 2));
-    }
+    ASSERT_EQ(kJnsOffset,            *(call_target_address - 2));
   } else {
     ASSERT_EQ(kJaeInstruction,       *(call_target_address - 3));
     ASSERT_EQ(kJaeOffset,            *(call_target_address - 2));
   }
   ASSERT_EQ(kCallInstruction,        *(call_target_address - 1));
   *(call_target_address - 3) = kNopByteOne;
   *(call_target_address - 2) = kNopByteTwo;
   Assembler::set_target_address_at(call_target_address,
                                    replacement_code->entry());
 
   unoptimized_code->GetHeap()->incremental_marking()->RecordCodeTargetPatch(
       unoptimized_code, call_target_address, replacement_code);
 }
 
 
 void Deoptimizer::RevertStackCheckCodeAt(Code* unoptimized_code,
                                          Address pc_after,
                                          Code* check_code,
                                          Code* replacement_code) {
   Address call_target_address = pc_after - kIntSize;
   ASSERT(replacement_code->entry() ==
          Assembler::target_address_at(call_target_address));
   // Replace the nops from patching (Deoptimizer::PatchStackCheckCode) to
   // restore the conditional branch.
   ASSERT_EQ(kNopByteOne,      *(call_target_address - 3));
   ASSERT_EQ(kNopByteTwo,      *(call_target_address - 2));
   ASSERT_EQ(kCallInstruction, *(call_target_address - 1));
   if (FLAG_count_based_interrupts) {
     *(call_target_address - 3) = kJnsInstruction;
-    if (FLAG_debug_code) {
-      // See comment above: larger jump offset if debug code is generated.
-      *(call_target_address - 2) = kJnsOffsetDebugCode;
-    } else {
-      *(call_target_address - 2) = kJnsOffset;
-    }
+    *(call_target_address - 2) = kJnsOffset;
   } else {
     *(call_target_address - 3) = kJaeInstruction;
     *(call_target_address - 2) = kJaeOffset;
   }
   Assembler::set_target_address_at(call_target_address,
                                    check_code->entry());
 
   check_code->GetHeap()->incremental_marking()->RecordCodeTargetPatch(
       unoptimized_code, call_target_address, check_code);
 }
@@ skipping 776 matching lines @@
   }
   __ bind(&done);
 }
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_X64