[wasm] Split off wasm-linkage.h

Linkage-related methods were declared in wasm-compiler.h and
implemented in wasm-linkage.cc. This required all users of e.g. wasm
call descriptors to include the whole wasm compiler header. Also, some
wasm linkage information is independent of turbofan and also used
outside of the compiler directory.

This CL splits off wasm-linkage.h (with minimal includes) and puts it
in src/wasm. This allows to use that information without including
compiler headers (will clean up several uses in follow-up CLs).

R=mstarzinger@chromium.org, titzer@chromium.org

Bug: v8:7570
Change-Id: Ifcae70b4ea7932cda30953b325c2b87c4176c598
Reviewed-on: https://chromium-review.googlesource.com/1013701Reviewed-by: Ben Titzer <titzer@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52849}

BUILD.gn

@@ -1420,6 +1420,7 @@ v8_source_set("v8_base") {
     "src/asmjs/asm-types.h",
     "src/asmjs/switch-logic.cc",
     "src/asmjs/switch-logic.h",
+    "src/assembler-arch.h",
     "src/assembler-inl.h",
     "src/assembler.cc",
     "src/assembler.h",
@@ -1729,7 +1730,6 @@ v8_source_set("v8_base") {
     "src/compiler/verifier.h",
     "src/compiler/wasm-compiler.cc",
     "src/compiler/wasm-compiler.h",
-    "src/compiler/wasm-linkage.cc",
     "src/compiler/zone-stats.cc",
     "src/compiler/zone-stats.h",
     "src/contexts-inl.h",
@@ -2358,6 +2358,7 @@ v8_source_set("v8_base") {
     "src/wasm/wasm-js.cc",
     "src/wasm/wasm-js.h",
     "src/wasm/wasm-limits.h",
+    "src/wasm/wasm-linkage.h",
     "src/wasm/wasm-memory.cc",
     "src/wasm/wasm-memory.h",
     "src/wasm/wasm-module-builder.cc",

src/assembler-arch.h

+// Copyright 2018 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_ASSEMBLER_ARCH_H_
+#define V8_ASSEMBLER_ARCH_H_
+
+#include "src/assembler.h"
+
+#if V8_TARGET_ARCH_IA32
+#include "src/ia32/assembler-ia32.h"
+#elif V8_TARGET_ARCH_X64
+#include "src/x64/assembler-x64.h"
+#elif V8_TARGET_ARCH_ARM64
+#include "src/arm64/assembler-arm64.h"
+#elif V8_TARGET_ARCH_ARM
+#include "src/arm/assembler-arm.h"
+#elif V8_TARGET_ARCH_PPC
+#include "src/ppc/assembler-ppc.h"
+#elif V8_TARGET_ARCH_MIPS
+#include "src/mips/assembler-mips.h"
+#elif V8_TARGET_ARCH_MIPS64
+#include "src/mips64/assembler-mips64.h"
+#elif V8_TARGET_ARCH_S390
+#include "src/s390/assembler-s390.h"
+#else
+#error Unknown architecture.
+#endif
+
+#endif  // V8_ASSEMBLER_ARCH_H_

src/compiler/int64-lowering.cc

@@ -13,7 +13,8 @@
 #include "src/compiler/node-properties.h"
 #include "src/compiler/node.h"
 #include "src/compiler/wasm-compiler.h"
-#include "src/macro-assembler-inl.h"
+// TODO(wasm): Remove this include.
+#include "src/wasm/wasm-linkage.h"
 #include "src/zone/zone.h"
 
 namespace v8 {
@@ -283,7 +284,7 @@ void Int64Lowering::LowerNode(Node* node) {
         int old_index = ParameterIndexOf(node->op());
         // TODO(wasm): Make this part not wasm specific.
         // Prevent special lowering of the instance parameter.
-        if (old_index == kWasmInstanceParameterIndex) {
+        if (old_index == wasm::kWasmInstanceParameterIndex) {
           DefaultLowering(node);
           break;
         }

src/compiler/simd-scalar-lowering.cc

@@ -10,7 +10,6 @@
 #include "src/compiler/node-properties.h"
 #include "src/compiler/node.h"
 #include "src/compiler/wasm-compiler.h"
-#include "src/macro-assembler-inl.h"
 
 namespace v8 {
 namespace internal {

src/compiler/wasm-compiler.h

@@ -9,7 +9,6 @@
 
 // Clients of this interface shouldn't depend on lots of compiler internals.
 // Do not include anything from src/compiler here!
-#include "src/compiler.h"
 #include "src/optimized-compilation-info.h"
 #include "src/trap-handler/trap-handler.h"
 #include "src/wasm/function-body-decoder.h"
@@ -22,11 +21,14 @@
 namespace v8 {
 namespace internal {
 
+class OptimizedCompilationJob;
+
 namespace compiler {
 // Forward declarations for some compiler data structures.
-class Node;
-class JSGraph;
+class CallDescriptor;
 class Graph;
+class JSGraph;
+class Node;
 class Operator;
 class SourcePositionTable;
 }  // namespace compiler
@@ -73,9 +75,8 @@ class WasmCompilationData {
 
 class TurbofanWasmCompilationUnit {
  public:
-  explicit TurbofanWasmCompilationUnit(wasm::WasmCompilationUnit* wasm_unit)
-      : wasm_unit_(wasm_unit),
-        wasm_compilation_data_(wasm_unit->env_->runtime_exception_support) {}
+  explicit TurbofanWasmCompilationUnit(wasm::WasmCompilationUnit* wasm_unit);
+  ~TurbofanWasmCompilationUnit();
 
   SourcePositionTable* BuildGraphForWasmFunction(double* decode_ms);
 
@@ -506,14 +507,12 @@ class WasmGraphBuilder {
   Builtins::Name GetBuiltinIdForTrap(wasm::TrapReason reason);
 };
 
-// The parameter index where the instance parameter should be placed in wasm
-// call descriptors. This is used by the Int64Lowering::LowerNode method.
-constexpr int kWasmInstanceParameterIndex = 0;
-
 V8_EXPORT_PRIVATE CallDescriptor* GetWasmCallDescriptor(
     Zone* zone, wasm::FunctionSig* signature, bool use_retpoline = false);
+
 V8_EXPORT_PRIVATE CallDescriptor* GetI32WasmCallDescriptor(
     Zone* zone, CallDescriptor* call_descriptor);
+
 V8_EXPORT_PRIVATE CallDescriptor* GetI32WasmCallDescriptorForSimd(
     Zone* zone, CallDescriptor* call_descriptor);
 

src/runtime/runtime-wasm.cc

@@ -11,7 +11,6 @@
 #include "src/debug/debug.h"
 #include "src/frame-constants.h"
 #include "src/heap/factory.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 #include "src/objects/frame-array-inl.h"
 #include "src/trap-handler/trap-handler.h"

src/wasm/baseline/liftoff-compiler.cc

@@ -15,6 +15,7 @@
 #include "src/wasm/function-body-decoder-impl.h"
 #include "src/wasm/function-compiler.h"
 #include "src/wasm/memory-tracing.h"
+#include "src/wasm/wasm-linkage.h"
 #include "src/wasm/wasm-objects.h"
 #include "src/wasm/wasm-opcodes.h"
 

src/wasm/function-body-decoder.cc

@@ -5,23 +5,19 @@
 #include "src/signature.h"
 
 #include "src/base/platform/elapsed-timer.h"
+#include "src/compiler/wasm-compiler.h"
 #include "src/flags.h"
 #include "src/handles.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
-#include "src/zone/zone-containers.h"
-
+#include "src/ostreams.h"
 #include "src/wasm/decoder.h"
 #include "src/wasm/function-body-decoder-impl.h"
 #include "src/wasm/function-body-decoder.h"
 #include "src/wasm/wasm-limits.h"
+#include "src/wasm/wasm-linkage.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-opcodes.h"
 
-#include "src/ostreams.h"
-
-#include "src/compiler/wasm-compiler.h"
-
 namespace v8 {
 namespace internal {
 namespace wasm {
@@ -106,7 +102,7 @@ class WasmGraphBuildingInterface {
         static_cast<int>(decoder->sig_->parameter_count() + 1 + 1));
     // Initialize the instance parameter (index 0).
     builder_->set_instance_node(
-        builder_->Param(compiler::kWasmInstanceParameterIndex));
+        builder_->Param(wasm::kWasmInstanceParameterIndex));
     // Initialize local variables. Parameters are shifted by 1 because of the
     // the instance parameter.
     uint32_t index = 0;

src/wasm/module-compiler.cc

@@ -14,7 +14,6 @@
 #include "src/compiler/wasm-compiler.h"
 #include "src/counters.h"
 #include "src/identity-map.h"
-#include "src/macro-assembler-inl.h"
 #include "src/property-descriptor.h"
 #include "src/trap-handler/trap-handler.h"
 #include "src/wasm/compilation-manager.h"

src/wasm/wasm-debug.cc

@@ -14,7 +14,6 @@
 #include "src/heap/factory.h"
 #include "src/identity-map.h"
 #include "src/isolate.h"
-#include "src/macro-assembler-inl.h"
 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-code-manager.h"
 #include "src/wasm/wasm-interpreter.h"

src/wasm/wasm-interpreter.cc

@@ -12,7 +12,6 @@
 #include "src/compiler/wasm-compiler.h"
 #include "src/conversions.h"
 #include "src/identity-map.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 #include "src/trap-handler/trap-handler.h"
 #include "src/utils.h"

src/wasm/wasm-linkage.h

+// Copyright 2018 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef V8_WASM_WASM_LINKAGE_H_
+#define V8_WASM_WASM_LINKAGE_H_
+
+#include "src/assembler-arch.h"
+#include "src/machine-type.h"
+#include "src/signature.h"
+#include "src/wasm/value-type.h"
+
+namespace v8 {
+namespace internal {
+namespace wasm {
+
+#if V8_TARGET_ARCH_IA32
+// ===========================================================================
+// == ia32 ===================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {esi, eax, edx, ecx, ebx};
+constexpr Register kGpReturnRegisters[] = {eax, edx};
+constexpr DoubleRegister kFpParamRegisters[] = {xmm1, xmm2, xmm3,
+                                                xmm4, xmm5, xmm6};
+constexpr DoubleRegister kFpReturnRegisters[] = {xmm1, xmm2};
+
+#elif V8_TARGET_ARCH_X64
+// ===========================================================================
+// == x64 ====================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {rsi, rax, rdx, rcx, rbx, rdi};
+constexpr Register kGpReturnRegisters[] = {rax, rdx};
+constexpr DoubleRegister kFpParamRegisters[] = {xmm1, xmm2, xmm3,
+                                                xmm4, xmm5, xmm6};
+constexpr DoubleRegister kFpReturnRegisters[] = {xmm1, xmm2};
+
+#elif V8_TARGET_ARCH_ARM
+// ===========================================================================
+// == arm ====================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {r3, r0, r1, r2};
+constexpr Register kGpReturnRegisters[] = {r0, r1};
+constexpr DoubleRegister kFpParamRegisters[] = {d0, d1, d2, d3, d4, d5, d6, d7};
+constexpr DoubleRegister kFpReturnRegisters[] = {d0, d1};
+
+#elif V8_TARGET_ARCH_ARM64
+// ===========================================================================
+// == arm64 ====================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {x7, x0, x1, x2, x3, x4, x5, x6};
+constexpr Register kGpReturnRegisters[] = {x0, x1};
+constexpr DoubleRegister kFpParamRegisters[] = {d0, d1, d2, d3, d4, d5, d6, d7};
+constexpr DoubleRegister kFpReturnRegisters[] = {d0, d1};
+
+#elif V8_TARGET_ARCH_MIPS
+// ===========================================================================
+// == mips ===================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {a0, a1, a2, a3};
+constexpr Register kGpReturnRegisters[] = {v0, v1};
+constexpr DoubleRegister kFpParamRegisters[] = {f2, f4, f6, f8, f10, f12, f14};
+constexpr DoubleRegister kFpReturnRegisters[] = {f2, f4};
+
+#elif V8_TARGET_ARCH_MIPS64
+// ===========================================================================
+// == mips64 =================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {a0, a1, a2, a3, a4, a5, a6, a7};
+constexpr Register kGpReturnRegisters[] = {v0, v1};
+constexpr DoubleRegister kFpParamRegisters[] = {f2, f4, f6, f8, f10, f12, f14};
+constexpr DoubleRegister kFpReturnRegisters[] = {f2, f4};
+
+#elif V8_TARGET_ARCH_PPC || V8_TARGET_ARCH_PPC64
+// ===========================================================================
+// == ppc & ppc64 ============================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {r10, r3, r4, r5, r6, r7, r8, r9};
+constexpr Register kGpReturnRegisters[] = {r3, r4};
+constexpr DoubleRegister kFpParamRegisters[] = {d1, d2, d3, d4, d5, d6, d7, d8};
+constexpr DoubleRegister kFpReturnRegisters[] = {d1, d2};
+
+#elif V8_TARGET_ARCH_S390X
+// ===========================================================================
+// == s390x ==================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {r6, r2, r3, r4, r5};
+constexpr Register kGpReturnRegisters[] = {r2, r3};
+constexpr DoubleRegister kFpParamRegisters[] = {d0, d2, d4, d6};
+constexpr DoubleRegister kFpReturnRegisters[] = {d0, d2, d4, d6};
+
+#elif V8_TARGET_ARCH_S390
+// ===========================================================================
+// == s390 ===================================================================
+// ===========================================================================
+constexpr Register kGpParamRegisters[] = {r6, r2, r3, r4, r5};
+constexpr Register kGpReturnRegisters[] = {r2, r3};
+constexpr DoubleRegister kFpParamRegisters[] = {d0, d2};
+constexpr DoubleRegister kFpReturnRegisters[] = {d0, d2};
+
+#else
+// ===========================================================================
+// == unknown ================================================================
+// ===========================================================================
+// Do not use any registers, we will just always use the stack.
+constexpr Register kGpParamRegisters[] = {};
+constexpr Register kGpReturnRegisters[] = {};
+constexpr DoubleRegister kFpParamRegisters[] = {};
+constexpr DoubleRegister kFpReturnRegisters[] = {};
+
+#endif
+
+// The parameter index where the instance parameter should be placed in wasm
+// call descriptors. This is used by the Int64Lowering::LowerNode method.
+constexpr int kWasmInstanceParameterIndex = 0;
+
+class LinkageAllocator {
+ public:
+  template <size_t kNumGpRegs, size_t kNumFpRegs>
+  constexpr LinkageAllocator(const Register (&gp)[kNumGpRegs],
+                             const DoubleRegister (&fp)[kNumFpRegs])
+      : LinkageAllocator(gp, kNumGpRegs, fp, kNumFpRegs) {}
+
+  constexpr LinkageAllocator(const Register* gp, int gpc,
+                             const DoubleRegister* fp, int fpc)
+      : gp_count_(gpc), gp_regs_(gp), fp_count_(fpc), fp_regs_(fp) {}
+
+  bool has_more_gp_regs() const { return gp_offset_ < gp_count_; }
+  bool has_more_fp_regs() const { return fp_offset_ < fp_count_; }
+
+  Register NextGpReg() {
+    DCHECK_LT(gp_offset_, gp_count_);
+    return gp_regs_[gp_offset_++];
+  }
+
+  DoubleRegister NextFpReg() {
+    DCHECK_LT(fp_offset_, fp_count_);
+    return fp_regs_[fp_offset_++];
+  }
+
+  // Stackslots are counted upwards starting from 0 (or the offset set by
+  // {SetStackOffset}.
+  int NumStackSlots(ValueType type) {
+    return 1 << std::max(0, ElementSizeLog2Of(type) - kPointerSizeLog2);
+  }
+
+  // Stackslots are counted upwards starting from 0 (or the offset set by
+  // {SetStackOffset}. If {type} needs more than
+  // one stack slot, the lowest used stack slot is returned.
+  int NextStackSlot(ValueType type) {
+    int num_stack_slots = NumStackSlots(type);
+    int offset = stack_offset_;
+    stack_offset_ += num_stack_slots;
+    return offset;
+  }
+
+  // Set an offset for the stack slots returned by {NextStackSlot} and
+  // {NumStackSlots}. Can only be called before any call to {NextStackSlot}.
+  void SetStackOffset(int num) {
+    DCHECK_LE(0, num);
+    DCHECK_EQ(0, stack_offset_);
+    stack_offset_ = num;
+  }
+
+  int NumStackSlots() const { return stack_offset_; }
+
+ private:
+  const int gp_count_;
+  int gp_offset_ = 0;
+  const Register* const gp_regs_;
+
+  const int fp_count_;
+  int fp_offset_ = 0;
+  const DoubleRegister* const fp_regs_;
+
+  int stack_offset_ = 0;
+};
+
+}  // namespace wasm
+}  // namespace internal
+}  // namespace v8
+
+#endif  // V8_WASM_WASM_LINKAGE_H_

src/wasm/wasm-module.cc

@@ -11,7 +11,6 @@
 #include "src/compiler/wasm-compiler.h"
 #include "src/debug/interface-types.h"
 #include "src/frames-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects.h"
 #include "src/property-descriptor.h"
 #include "src/simulator.h"

src/wasm/wasm-objects.cc

@@ -9,7 +9,6 @@
 #include "src/base/iterator.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/debug/debug-interface.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 #include "src/objects/debug-objects-inl.h"
 #include "src/trap-handler/trap-handler.h"

test/cctest/compiler/test-multiple-return.cc

@@ -14,7 +14,6 @@
 #include "src/compiler/linkage.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/machine-type.h"
-#include "src/macro-assembler-inl.h"
 #include "src/macro-assembler.h"
 #include "src/objects-inl.h"
 #include "src/wasm/function-compiler.h"

test/cctest/wasm/test-c-wasm-entry.cc

@@ -5,7 +5,6 @@
 #include <cstdint>
 
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 #include "src/wasm/wasm-objects.h"
 #include "test/cctest/cctest.h"

test/cctest/wasm/test-run-wasm-64.cc

@@ -8,7 +8,6 @@
 
 #include "src/assembler-inl.h"
 #include "src/base/bits.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 
 #include "test/cctest/cctest.h"

test/cctest/wasm/test-run-wasm-asmjs.cc

@@ -8,7 +8,6 @@
 
 #include "src/assembler-inl.h"
 #include "src/base/platform/elapsed-timer.h"
-#include "src/macro-assembler-inl.h"
 
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"

test/cctest/wasm/test-run-wasm-atomics.cc

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/macro-assembler-inl.h"
 #include "test/cctest/wasm/wasm-atomics-utils.h"
 #include "test/common/wasm/wasm-macro-gen.h"
 

test/cctest/wasm/test-run-wasm-atomics64.cc

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/macro-assembler-inl.h"
 #include "test/cctest/wasm/wasm-atomics-utils.h"
 #include "test/common/wasm/wasm-macro-gen.h"
 

test/cctest/wasm/test-run-wasm-interpreter.cc

@@ -9,7 +9,6 @@
 #include <memory>
 
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "src/wasm/wasm-interpreter.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"

test/cctest/wasm/test-run-wasm-js.cc

@@ -9,7 +9,6 @@
 
 #include "src/api.h"
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"
 #include "test/cctest/wasm/wasm-run-utils.h"

test/cctest/wasm/test-run-wasm-sign-extension.cc

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/macro-assembler-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/wasm/wasm-run-utils.h"
 #include "test/common/wasm/wasm-macro-gen.h"

test/cctest/wasm/test-run-wasm-simd.cc

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"
 #include "test/cctest/wasm/wasm-run-utils.h"

test/cctest/wasm/test-run-wasm.cc

@@ -8,7 +8,6 @@
 
 #include "src/assembler-inl.h"
 #include "src/base/platform/elapsed-timer.h"
-#include "src/macro-assembler-inl.h"
 #include "src/utils.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"

test/cctest/wasm/test-wasm-breakpoints.cc

@@ -5,7 +5,6 @@
 #include "src/assembler-inl.h"
 #include "src/debug/debug-interface.h"
 #include "src/frames-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "src/property-descriptor.h"
 #include "src/utils.h"
 #include "src/wasm/wasm-objects-inl.h"

test/cctest/wasm/test-wasm-interpreter-entry.cc

@@ -5,7 +5,6 @@
 #include <cstdint>
 
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 #include "src/wasm/wasm-objects.h"
 #include "test/cctest/cctest.h"

test/cctest/wasm/test-wasm-stack.cc

@@ -4,7 +4,6 @@
 
 #include "src/api.h"
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"
 #include "test/cctest/wasm/wasm-run-utils.h"

test/cctest/wasm/test-wasm-trap-position.cc

@@ -4,7 +4,6 @@
 
 #include "src/api.h"
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "src/trap-handler/trap-handler.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"

test/cctest/wasm/wasm-run-utils.cc

@@ -5,7 +5,6 @@
 #include "test/cctest/wasm/wasm-run-utils.h"
 
 #include "src/assembler-inl.h"
-#include "src/macro-assembler-inl.h"
 #include "src/wasm/wasm-memory.h"
 #include "src/wasm/wasm-objects-inl.h"
 

test/fuzzer/multi-return.cc

@@ -14,7 +14,6 @@
 #include "src/compiler/raw-machine-assembler.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/machine-type.h"
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 #include "src/objects.h"
 #include "src/optimized-compilation-info.h"

test/unittests/compiler/int64-lowering-unittest.cc

@@ -6,17 +6,12 @@
 #include "src/compiler/common-operator.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/machine-operator.h"
+#include "src/compiler/node-properties.h"
 #include "src/compiler/node.h"
 #include "src/compiler/wasm-compiler.h"
-
-#include "src/compiler/node-properties.h"
-
-#include "src/macro-assembler-inl.h"
 #include "src/objects-inl.h"
 #include "src/signature.h"
-
 #include "src/wasm/wasm-module.h"
-
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"