Generate a custom OSR entrypoint for OSR compiles on all platforms, and transition to optimized cod…

src/compiler.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 890 matching lines @@
       }
       // Caching of optimized code enabled and optimized code found.
       shared->InstallFromOptimizedCodeMap(*function, index);
       return true;
     }
   }
   return false;
 }
 
 
-bool Compiler::CompileLazy(CompilationInfo* info) {
+bool Compiler::CompileLazy(CompilationInfo* info, bool install) {
   Isolate* isolate = info->isolate();
 
   // The VM is in the COMPILER state until exiting this function.
   VMState<COMPILER> state(isolate);
 
   PostponeInterruptsScope postpone(isolate);
 
   Handle<SharedFunctionInfo> shared = info->shared_info();
   int compiled_size = shared->end_position() - shared->start_position();
   isolate->counters()->total_compile_size()->Increment(compiled_size);
 
-  if (InstallCodeFromOptimizedCodeMap(info)) return true;
+  if (install && InstallCodeFromOptimizedCodeMap(info)) return true;

[Michael Starzinger, 2013/07/31 14:55:50]

Both InsertCodeIntoOptimizedCodeMap() and InstallCodeFromOptimizedCodeMap()
already have a check for "info->osr_ast_id().IsNone()" in them.

 
   // Generate the AST for the lazily compiled function.
   if (Parser::Parse(info)) {
     // Measure how long it takes to do the lazy compilation; only take the
     // rest of the function into account to avoid overlap with the lazy
     // parsing statistics.
     HistogramTimerScope timer(isolate->counters()->compile_lazy());
 
     // After parsing we know the function's language mode. Remember it.
     LanguageMode language_mode = info->function()->language_mode();
     info->SetLanguageMode(language_mode);
     shared->set_language_mode(language_mode);
 
     // Compile the code.
     if (!MakeCode(info)) {
       if (!isolate->has_pending_exception()) {
         isolate->StackOverflow();
       }
     } else {
-      InstallCodeCommon(info);
+      if (install) InstallCodeCommon(info);
 
       if (info->IsOptimizing()) {
         Handle<Code> code = info->code();
         ASSERT(shared->scope_info() != ScopeInfo::Empty(isolate));
-        info->closure()->ReplaceCode(*code);
-        InsertCodeIntoOptimizedCodeMap(info);
+        if (install) {

[Michael Starzinger, 2013/07/31 14:55:50]

Instead of passing the "install" boolean flag we could just check that
"osr_ast_id()" is not set. Simplifies the interface and is in line with current
semantics of that field.

+          info->closure()->ReplaceCode(*code);
+          InsertCodeIntoOptimizedCodeMap(info);
+        }
         return true;
-      } else {
+      } else if (install) {
         return InstallFullCode(info);
       }
     }
   }
 
   ASSERT(info->code().is_null());
   return false;
 }
 
 
@@ skipping 289 matching lines @@
   // Trace if the appropriate trace flag is set and the phase name's first
   // character is in the FLAG_trace_phase command line parameter.
   bool tracing_on = info()->IsStub() ?
       FLAG_trace_hydrogen_stubs :
       FLAG_trace_hydrogen;
   return (tracing_on &&
       OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL);
 }
 
 } }  // namespace v8::internal