[Interpreter] Support compiling for baseline on return from interpreted function.

src/objects-inl.h

Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index dd2d2df384bd4c64ab41759832154472cf59f8ff..959a4973eb196340d3bc483a1ce825b6c7a11d11 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -4790,7 +4790,7 @@ bool Code::IsCodeStubOrIC() {
 
 bool Code::IsJavaScriptCode() {

[Michael Starzinger, 2016/05/11 13:04:27]

This predicate is no longer used in the codebase. I wanted to remove it twice
already. Can we remove it?

[rmcilroy, 2016/05/12 13:11:47]

Done.

   return kind() == FUNCTION || kind() == OPTIMIZED_FUNCTION ||
-         is_interpreter_entry_trampoline();
+         is_interpreter_trampoline_builtin();
 }
 
 
@@ -4833,18 +4833,11 @@ inline bool Code::is_hydrogen_stub() {
   return is_crankshafted() && kind() != OPTIMIZED_FUNCTION;
 }
 
-
-inline bool Code::is_interpreter_entry_trampoline() {
-  Handle<Code> interpreter_entry =
-      GetIsolate()->builtins()->InterpreterEntryTrampoline();
-  return interpreter_entry.location() != nullptr && *interpreter_entry == this;
-}
-
-inline bool Code::is_interpreter_enter_bytecode_dispatch() {
-  Handle<Code> interpreter_handler =
-      GetIsolate()->builtins()->InterpreterEnterBytecodeDispatch();
-  return interpreter_handler.location() != nullptr &&
-         *interpreter_handler == this;
+inline bool Code::is_interpreter_trampoline_builtin() {
+  Builtins* builtins = GetIsolate()->builtins();
+  return this == *builtins->InterpreterEntryTrampoline() ||
+         this == *builtins->InterpreterEnterBytecodeDispatch() ||
+         this == *builtins->InterpreterMarkBaselineOnReturn();
 }
 
 inline void Code::set_is_crankshafted(bool value) {
@@ -6118,7 +6111,7 @@ void Map::InobjectSlackTrackingStep() {
 
 AbstractCode* JSFunction::abstract_code() {
   Code* code = this->code();
-  if (code->is_interpreter_entry_trampoline()) {
+  if (code->is_interpreter_trampoline_builtin()) {
     return AbstractCode::cast(shared()->bytecode_array());
   } else {
     return AbstractCode::cast(code);