Fix deoptimization address patching in Turbofan to use safepoints.

test/cctest/compiler/test-codegen-deopt.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/compiler/code-generator.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
@@ skipping 183 matching lines @@
 
   TrivialDeoptCodegenTester t(&scope);
   t.GenerateCode();
 
   DeoptimizationInputData* data =
       DeoptimizationInputData::cast(t.result_code->deoptimization_data());
 
   Label* cont_label = t.code->GetLabel(t.cont_block);
   Label* deopt_label = t.code->GetLabel(t.deopt_block);
 
-  // Check the patch table. It should patch the continuation address to the
-  // deoptimization block address.
-  CHECK_EQ(1, data->ReturnAddressPatchCount());
-  CHECK_EQ(cont_label->pos(), data->ReturnAddressPc(0)->value());
-  CHECK_EQ(deopt_label->pos(), data->PatchedAddressPc(0)->value());
+  // Check the safepoint - it should contain an entry for the call
+  // with the right deoptimization address.
+  SafepointEntry entry = t.result_code->GetSafepointEntry(
+      t.result_code->instruction_start() + cont_label->pos());
+  CHECK(entry.is_valid());
+  CHECK_EQ(deopt_label->pos(), entry.deoptimization_pc());
 
   // Check that we deoptimize to the right AST id.
   CHECK_EQ(1, data->DeoptCount());
   CHECK_EQ(1, data->DeoptCount());
   CHECK_EQ(t.bailout_id.ToInt(), data->AstId(0).ToInt());
 }
 
 
 TEST(TurboTrivialDeoptCodegenAndRun) {
   HandleAndZoneScope scope;
@@ skipping 118 matching lines @@
   Handle<Object> result;
   bool has_pending_exception =
       !Execution::Call(isolate, t.function,
                        isolate->factory()->undefined_value(), 0, NULL,
                        false).ToHandle(&result);
   CHECK(!has_pending_exception);
   CHECK(result->SameValue(Smi::FromInt(42)));
 }
 
 #endif