[interpreter] Fix self-healing with preserved bytecode.

test/cctest/test-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 767 matching lines @@
             ->Set(context, v8_str("IsBaselineCompiled"),
                   t->GetFunction(context).ToLocalChecked())
             .FromJust());
 }
 
 TEST(IgnitionBaselineOnReturn) {
   FLAG_allow_natives_syntax = true;
   FLAG_always_opt = false;
   CcTest::InitializeVM();
   FLAG_ignition = true;
-  reinterpret_cast<i::Isolate*>(CcTest::isolate())->interpreter()->Initialize();
+  Isolate* isolate = CcTest::i_isolate();
+  isolate->interpreter()->Initialize();
   v8::HandleScope scope(CcTest::isolate());
   InstallIsBaselineCompiledHelper(CcTest::isolate());
 
   CompileRun(
       "var is_baseline_in_function, is_baseline_after_return;\n"
       "var return_val;\n"
       "function f() {\n"
       "  %CompileBaseline(f);\n"
       "  is_baseline_in_function = IsBaselineCompiled(f);\n"
       "  return 1234;\n"
       "};\n"
       "return_val = f();\n"
       "is_baseline_after_return = IsBaselineCompiled(f);\n");
   CHECK_EQ(false, GetGlobalProperty("is_baseline_in_function")->BooleanValue());
   CHECK_EQ(true, GetGlobalProperty("is_baseline_after_return")->BooleanValue());
   CHECK_EQ(1234.0, GetGlobalProperty("return_val")->Number());
 }
+
+TEST(IgnitionEntryTrampolineSelfHealing) {
+  FLAG_allow_natives_syntax = true;
+  FLAG_always_opt = false;
+  CcTest::InitializeVM();
+  FLAG_ignition = true;
+  Isolate* isolate = CcTest::i_isolate();
+  isolate->interpreter()->Initialize();
+  v8::HandleScope scope(CcTest::isolate());
+
+  CompileRun(
+      "function MkFun() {"
+      "  function f() { return 23 }"
+      "  return f"
+      "}"
+      "var f1 = MkFun(); f1();"
+      "var f2 = MkFun(); f2();"
+      "%BaselineFunctionOnNextCall(f1);");
+  Handle<JSFunction> f1 = Handle<JSFunction>::cast(GetGlobalProperty("f1"));
+  Handle<JSFunction> f2 = Handle<JSFunction>::cast(GetGlobalProperty("f2"));
+
+  // Function {f1} is marked for baseline.
+  CompileRun("var result1 = f1()");
+  CHECK_NE(*isolate->builtins()->InterpreterEntryTrampoline(), f1->code());
+  CHECK_EQ(*isolate->builtins()->InterpreterEntryTrampoline(), f2->code());
+  CHECK_EQ(23.0, GetGlobalProperty("result1")->Number());
+
+  // Function {f2} will self-heal now.
+  CompileRun("var result2 = f2()");
+  CHECK_NE(*isolate->builtins()->InterpreterEntryTrampoline(), f1->code());
+  CHECK_NE(*isolate->builtins()->InterpreterEntryTrampoline(), f2->code());
+  CHECK_EQ(23.0, GetGlobalProperty("result2")->Number());
+}