Unify use-sites of EnsureDeoptimizationSupport.

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 30 matching lines @@
  public:
   explicit DeoptCodegenTester(HandleAndZoneScope* scope, const char* src)
       : scope_(scope),
         function(NewFunction(src)),
         info(function, scope->main_zone()),
         bailout_id(-1) {
     CHECK(Parser::Parse(&info));
     info.SetOptimizing(BailoutId::None(), Handle<Code>(function->code()));
     CHECK(Rewriter::Rewrite(&info));
     CHECK(Scope::Analyze(&info));
-    CHECK_NE(NULL, info.scope());
-    Handle<ScopeInfo> scope_info = ScopeInfo::Create(info.scope(), info.zone());
-    info.shared_info()->set_scope_info(*scope_info);
-
-    FunctionTester::EnsureDeoptimizationSupport(&info);
+    CHECK(Compiler::EnsureDeoptimizationSupport(&info));
 
     DCHECK(info.shared_info()->has_deoptimization_support());
 
     graph = new (scope_->main_zone()) Graph(scope_->main_zone());
   }
 
   virtual ~DeoptCodegenTester() { delete code; }
 
   void GenerateCodeFromSchedule(Schedule* schedule) {
     OFStream os(stdout);
@@ skipping 242 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