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

src/objects.cc

 // Copyright 2013 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 9272 matching lines @@
     PrintName();
     PrintF(" for parallel recompilation.\n");
   }
   set_code_no_write_barrier(
       GetIsolate()->builtins()->builtin(Builtins::kInRecompileQueue));
   // No write barrier required, since the builtin is part of the root set.
 }
 
 
 static bool CompileLazyHelper(CompilationInfo* info,
-                              ClearExceptionFlag flag) {
+                              ClearExceptionFlag flag,
+                              bool install) {

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

The boolean flag is obsolete, see comments in "compiler.cc" about that.

   // Compile the source information to a code object.
   ASSERT(info->IsOptimizing() || !info->shared_info()->is_compiled());
   ASSERT(!info->isolate()->has_pending_exception());
-  bool result = Compiler::CompileLazy(info);
+  bool result = Compiler::CompileLazy(info, install);
   ASSERT(result != Isolate::Current()->has_pending_exception());
   if (!result && flag == CLEAR_EXCEPTION) {
     info->isolate()->clear_pending_exception();
   }
   return result;
 }
 
 
 bool SharedFunctionInfo::CompileLazy(Handle<SharedFunctionInfo> shared,
                                      ClearExceptionFlag flag) {
   ASSERT(shared->allows_lazy_compilation_without_context());
   CompilationInfoWithZone info(shared);
-  return CompileLazyHelper(&info, flag);
+  return CompileLazyHelper(&info, flag, true);
 }
 
 
 void SharedFunctionInfo::AddToOptimizedCodeMap(
     Handle<SharedFunctionInfo> shared,
     Handle<Context> native_context,
     Handle<Code> code,
     Handle<FixedArray> literals) {
   CALL_HEAP_FUNCTION_VOID(
       shared->GetIsolate(),
@@ skipping 129 matching lines @@
 
 
 bool JSFunction::CompileLazy(Handle<JSFunction> function,
                              ClearExceptionFlag flag) {
   bool result = true;
   if (function->shared()->is_compiled()) {
     function->ReplaceCode(function->shared()->code());
   } else {
     ASSERT(function->shared()->allows_lazy_compilation());
     CompilationInfoWithZone info(function);
-    result = CompileLazyHelper(&info, flag);
+    result = CompileLazyHelper(&info, flag, true);
     ASSERT(!result || function->is_compiled());
   }
   return result;
 }
 
 
-bool JSFunction::CompileOptimized(Handle<JSFunction> function,
+Handle<Code> JSFunction::CompileOsr(Handle<JSFunction> function,
                                   BailoutId osr_ast_id,
                                   ClearExceptionFlag flag) {
   CompilationInfoWithZone info(function);
   info.SetOptimizing(osr_ast_id);
-  return CompileLazyHelper(&info, flag);
+  if (CompileLazyHelper(&info, flag, false)) {
+    return info.code();
+  } else {
+    return Handle<Code>::null();
+  }
 }
 
 
+bool JSFunction::CompileOptimized(Handle<JSFunction> function,
+                                  ClearExceptionFlag flag) {
+  CompilationInfoWithZone info(function);
+  info.SetOptimizing(BailoutId::None());
+  return CompileLazyHelper(&info, flag, true);
+}
+
+
 bool JSFunction::EnsureCompiled(Handle<JSFunction> function,
                                 ClearExceptionFlag flag) {
   return function->is_compiled() || CompileLazy(function, flag);
 }
 
 
 bool JSFunction::IsInlineable() {
   if (IsBuiltin()) return false;
   SharedFunctionInfo* shared_info = shared();
   // Check that the function has a script associated with it.
@@ skipping 6486 matching lines @@
 
 void PropertyCell::AddDependentCode(Handle<Code> code) {
   Handle<DependentCode> codes = DependentCode::Insert(
       Handle<DependentCode>(dependent_code()),
       DependentCode::kPropertyCellChangedGroup, code);
   if (*codes != dependent_code()) set_dependent_code(*codes);
 }
 
 
 } }  // namespace v8::internal