Merge bleeding_edge 18021:18297

src/compiler.cc

Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index 1ec2626da9b2ce22eefd25de31468035ba3804c1..c6dfa045b744a82da959c177e090546488322398 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -235,8 +235,7 @@ void CompilationInfo::DisableOptimization() {
 // profiler, so they trigger their own optimization when they're called
 // for the SharedFunctionInfo::kCallsUntilPrimitiveOptimization-th time.
 bool CompilationInfo::ShouldSelfOptimize() {
-  return FLAG_self_optimization &&
-      FLAG_crankshaft &&
+  return FLAG_crankshaft &&
       !function()->flags()->Contains(kDontSelfOptimize) &&
       !function()->dont_optimize() &&
       function()->scope()->AllowsLazyCompilation() &&
@@ -324,9 +323,9 @@ static bool MakeCrankshaftCode(CompilationInfo* info) {
 }
 
 
-class HOptimizedGraphBuilderWithPotisions: public HOptimizedGraphBuilder {
+class HOptimizedGraphBuilderWithPositions: public HOptimizedGraphBuilder {
  public:
-  explicit HOptimizedGraphBuilderWithPotisions(CompilationInfo* info)
+  explicit HOptimizedGraphBuilderWithPositions(CompilationInfo* info)
       : HOptimizedGraphBuilder(info) {
   }
 
@@ -460,7 +459,7 @@ RecompileJob::Status RecompileJob::CreateGraph() {
   if (FLAG_trace_hydrogen) {
     Handle<String> name = info()->function()->debug_name();
     PrintF("-----------------------------------------------------------\n");
-    PrintF("Compiling method %s using hydrogen\n", *name->ToCString());
+    PrintF("Compiling method %s using hydrogen\n", name->ToCString().get());
     isolate()->GetHTracer()->TraceCompilation(info());
   }
 
@@ -468,7 +467,7 @@ RecompileJob::Status RecompileJob::CreateGraph() {
   AstTyper::Run(info());
 
   graph_builder_ = FLAG_emit_opt_code_positions
-      ? new(info()->zone()) HOptimizedGraphBuilderWithPotisions(info())
+      ? new(info()->zone()) HOptimizedGraphBuilderWithPositions(info())
       : new(info()->zone()) HOptimizedGraphBuilder(info());
 
   Timer t(this, &time_taken_to_create_graph_);
@@ -513,7 +512,7 @@ RecompileJob::Status RecompileJob::OptimizeGraph() {
   ASSERT(graph_ != NULL);
   BailoutReason bailout_reason = kNoReason;
   if (!graph_->Optimize(&bailout_reason)) {
-    if (bailout_reason == kNoReason) graph_builder_->Bailout(bailout_reason);
+    if (bailout_reason != kNoReason) graph_builder_->Bailout(bailout_reason);
     return SetLastStatus(BAILED_OUT);
   } else {
     chunk_ = LChunk::NewChunk(graph_);
@@ -1056,6 +1055,7 @@ bool Compiler::CompileLazy(CompilationInfo* info) {
 
 
 bool Compiler::RecompileConcurrent(Handle<JSFunction> closure,
+                                   Handle<Code> unoptimized,
                                    uint32_t osr_pc_offset) {
   bool compiling_for_osr = (osr_pc_offset != 0);
 
@@ -1078,11 +1078,10 @@ bool Compiler::RecompileConcurrent(Handle<JSFunction> closure,
   Handle<SharedFunctionInfo> shared = info->shared_info();
 
   if (compiling_for_osr) {
-    BailoutId osr_ast_id =
-        shared->code()->TranslatePcOffsetToAstId(osr_pc_offset);
+    BailoutId osr_ast_id = unoptimized->TranslatePcOffsetToAstId(osr_pc_offset);
     ASSERT(!osr_ast_id.IsNone());
     info->SetOptimizing(osr_ast_id);
-    info->set_osr_pc_offset(osr_pc_offset);
+    info->SetOsrInfo(unoptimized, osr_pc_offset);
 
     if (FLAG_trace_osr) {
       PrintF("[COSR - attempt to queue ");
@@ -1100,30 +1099,30 @@ bool Compiler::RecompileConcurrent(Handle<JSFunction> closure,
   isolate->counters()->total_compile_size()->Increment(compiled_size);
 
   {
-    CompilationHandleScope handle_scope(*info);
+    CompilationHandleScope handle_scope(info.get());
 
-    if (!compiling_for_osr && InstallCodeFromOptimizedCodeMap(*info)) {
+    if (!compiling_for_osr && InstallCodeFromOptimizedCodeMap(info.get())) {
       return true;
     }
 
-    if (Parser::Parse(*info)) {
+    if (Parser::Parse(info.get())) {
       LanguageMode language_mode = info->function()->language_mode();
       info->SetLanguageMode(language_mode);
       shared->set_language_mode(language_mode);
       info->SaveHandles();
 
-      if (Rewriter::Rewrite(*info) && Scope::Analyze(*info)) {
-        RecompileJob* job = new(info->zone()) RecompileJob(*info);
+      if (Rewriter::Rewrite(info.get()) && Scope::Analyze(info.get())) {
+        RecompileJob* job = new(info->zone()) RecompileJob(info.get());
         RecompileJob::Status status = job->CreateGraph();
         if (status == RecompileJob::SUCCEEDED) {
           info.Detach();
-          shared->code()->set_profiler_ticks(0);
+          unoptimized->set_profiler_ticks(0);
           isolate->optimizing_compiler_thread()->QueueForOptimization(job);
           ASSERT(!isolate->has_pending_exception());
           return true;
         } else if (status == RecompileJob::BAILED_OUT) {
           isolate->clear_pending_exception();
-          InstallFullCode(*info);
+          InstallFullCode(info.get());
         }
       }
     }
@@ -1140,7 +1139,7 @@ Handle<Code> Compiler::InstallOptimizedCode(RecompileJob* job) {
   // Except when OSR already disabled optimization for some reason.
   if (info->shared_info()->optimization_disabled()) {
     info->AbortOptimization();
-    InstallFullCode(*info);
+    InstallFullCode(info.get());
     if (FLAG_trace_concurrent_recompilation) {
       PrintF("  ** aborting optimization for ");
       info->closure()->PrintName();
@@ -1172,14 +1171,14 @@ Handle<Code> Compiler::InstallOptimizedCode(RecompileJob* job) {
            status == RecompileJob::BAILED_OUT);
   }
 
-  InstallCodeCommon(*info);
+  InstallCodeCommon(info.get());
   if (status == RecompileJob::SUCCEEDED) {
     Handle<Code> code = info->code();
     ASSERT(info->shared_info()->scope_info() != ScopeInfo::Empty(isolate));
     info->closure()->ReplaceCode(*code);
     if (info->shared_info()->SearchOptimizedCodeMap(
             info->closure()->context()->native_context()) == -1) {
-      InsertCodeIntoOptimizedCodeMap(*info);
+      InsertCodeIntoOptimizedCodeMap(info.get());
     }
     if (FLAG_trace_concurrent_recompilation) {
       PrintF("  ** Optimized code for ");
@@ -1188,7 +1187,7 @@ Handle<Code> Compiler::InstallOptimizedCode(RecompileJob* job) {
     }
   } else {
     info->AbortOptimization();
-    InstallFullCode(*info);
+    InstallFullCode(info.get());
   }
   // Optimized code is finally replacing unoptimized code.  Reset the latter's
   // profiler ticks to prevent too soon re-opt after a deopt.