[maglev] Fix x64 register includes

Bug: v8:7700
Change-Id: I221d77ddc43b5956e0b873900d1e92ec7c037103
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3487550
Commit-Queue: Leszek Swirski <leszeks@chromium.org>
Auto-Submit: Leszek Swirski <leszeks@chromium.org>
Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79251}

src/maglev/maglev-compiler.cc

@@ -14,8 +14,8 @@
 #include "src/codegen/interface-descriptors-inl.h"
 #include "src/codegen/machine-type.h"
 #include "src/codegen/macro-assembler.h"
+#include "src/codegen/register.h"
 #include "src/codegen/reglist.h"
-#include "src/codegen/x64/register-x64.h"
 #include "src/common/globals.h"
 #include "src/compiler/backend/instruction.h"
 #include "src/compiler/bytecode-liveness-map.h"

src/maglev/maglev-ir.cc

@@ -8,7 +8,7 @@
 #include "src/base/logging.h"
 #include "src/codegen/interface-descriptors-inl.h"
 #include "src/codegen/macro-assembler-inl.h"
-#include "src/codegen/x64/register-x64.h"
+#include "src/codegen/register.h"
 #include "src/compiler/backend/instruction.h"
 #include "src/ic/handler-configuration.h"
 #include "src/maglev/maglev-code-gen-state.h"

src/maglev/maglev-regalloc-data.h

@@ -5,7 +5,7 @@
 #ifndef V8_MAGLEV_MAGLEV_REGALLOC_DATA_H_
 #define V8_MAGLEV_MAGLEV_REGALLOC_DATA_H_
 
-#include "src/codegen/x64/register-x64.h"
+#include "src/codegen/register.h"
 #include "src/compiler/backend/instruction.h"
 #include "src/utils/pointer-with-payload.h"
 

src/maglev/maglev.h

@@ -7,10 +7,7 @@
 
 // TODO(v8:7700): Remove all references to V8_ENABLE_MAGLEV once maglev ships.
 
-#ifndef V8_ENABLE_MAGLEV
-// Let's explicitly avoid accidental includes for now.
-#error Maglev should be enabled.
-#endif  // V8_ENABLE_MAGLEV
+#ifdef V8_ENABLE_MAGLEV
 
 #include "src/handles/handles.h"
 
@@ -26,6 +23,8 @@ class Maglev : public AllStatic {
                                     Handle<JSFunction> function);
 };
 
+#endif  // V8_ENABLE_MAGLEV
+
 }  // namespace internal
 }  // namespace v8