[sparkplug] Restict header visibility to baseline.h

Bug: v8:11429
Change-Id: Ib85f759a763640a55e5e6dcaf350b3ed1629bbf1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2712563
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Auto-Submit: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72910}

src/DEPS

@@ -3,6 +3,8 @@ include_rules = [
   "+src",
   "-src/asmjs",
   "+src/asmjs/asm-js.h",
+  "-src/baseline",
+  "+src/baseline/baseline.h",
   "-src/compiler",
   "+src/compiler/pipeline.h",
   "+src/compiler/code-assembler.h",

src/baseline/baseline.cc

@@ -32,6 +32,10 @@ Handle<Code> GenerateBaselineCode(Isolate* isolate,
   return code;
 }
 
+void EmitReturnBaseline(MacroAssembler* masm) {
+  baseline::BaselineAssembler::EmitReturn(masm);
+}
+
 }  // namespace internal
 }  // namespace v8
 
@@ -45,6 +49,8 @@ Handle<Code> GenerateBaselineCode(Isolate* isolate,
   UNREACHABLE();
 }
 
+void EmitReturnBaseline(MacroAssembler* masm) { UNREACHABLE(); }
+
 }  // namespace internal
 }  // namespace v8
 

src/baseline/baseline.h

@@ -12,12 +12,13 @@ namespace internal {
 
 class Code;
 class SharedFunctionInfo;
-class BytecodeArray;
+class MacroAssembler;
 
-// TODO(v8:11429): Restrict header visibility to just this file.
 Handle<Code> GenerateBaselineCode(Isolate* isolate,
                                   Handle<SharedFunctionInfo> shared);
 
+void EmitReturnBaseline(MacroAssembler* masm);
+
 }  // namespace internal
 }  // namespace v8
 

src/builtins/arm64/builtins-arm64.cc

@@ -5,7 +5,6 @@
 #if V8_TARGET_ARCH_ARM64
 
 #include "src/api/api-arguments.h"
-#include "src/baseline/baseline-compiler.h"
 #include "src/codegen/code-factory.h"
 // For interpreter_entry_return_pc_offset. TODO(jkummerow): Drop.
 #include "src/codegen/macro-assembler-inl.h"

src/builtins/builtins-internal-gen.cc

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "src/api/api.h"
-#include "src/baseline/baseline-compiler.h"
+#include "src/baseline/baseline.h"
 #include "src/builtins/builtins-utils-gen.h"
 #include "src/builtins/builtins.h"
 #include "src/codegen/code-stub-assembler.h"
@@ -928,7 +928,7 @@ void Builtins::Generate_MemMove(MacroAssembler* masm) {
 // architectures.
 #if V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64
 void Builtins::Generate_BaselineLeaveFrame(MacroAssembler* masm) {
-  baseline::BaselineAssembler::EmitReturn(masm);
+  EmitReturnBaseline(masm);
 }
 #else
 // Stub out implementations of arch-specific baseline builtins.

src/builtins/x64/builtins-x64.cc

@@ -7,7 +7,6 @@
 #include "src/api/api-arguments.h"
 #include "src/base/bits-iterator.h"
 #include "src/base/iterator.h"
-#include "src/baseline/baseline-compiler.h"
 #include "src/codegen/code-factory.h"
 #include "src/common/globals.h"
 #include "src/objects/code.h"