Revert "deps: patch V8 to support compilation with MSVC"

This reverts commit 0f98039.

PR-URL: #58187
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rafael Gonzaga <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>

Author: targos

common.gypi

@@ -38,7 +38,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.12',
+    'v8_embedder_string': '-node.13',
 
     ##### V8 defaults for Node.js #####
 

deps/v8/src/base/fpu.cc

@@ -57,21 +57,13 @@ void FPU::SetFlushDenormals(bool value) {
 #elif defined(V8_HOST_ARCH_ARM64) || defined(V8_HOST_ARCH_ARM)
 
 namespace {
-#if defined(V8_HOST_ARCH_ARM64) && defined(_MSC_VER) && !defined(__clang__)
-#include <intrin.h>
-#endif
-
 // Bit 24 is the flush-to-zero mode control bit. Setting it to 1 flushes
 // denormals to 0.
 constexpr int kFlushDenormToZeroBit = (1 << 24);
 int GetStatusWord() {
   int result;
 #if defined(V8_HOST_ARCH_ARM64)
-# if defined(_MSC_VER) && !defined(__clang__)
-    result = _ReadStatusReg(ARM64_FPCR);
-# else
-    asm volatile("mrs %x[result], FPCR" : [result] "=r"(result));
-# endif
+  asm volatile("mrs %x[result], FPCR" : [result] "=r"(result));
 #else
   asm volatile("vmrs %[result], FPSCR" : [result] "=r"(result));
 #endif
@@ -80,11 +72,7 @@ int GetStatusWord() {
 
 void SetStatusWord(int a) {
 #if defined(V8_HOST_ARCH_ARM64)
-# if defined(_MSC_VER) && !defined(__clang__)
-    _WriteStatusReg(ARM64_FPCR, a);
-# else
-    asm volatile("msr FPCR, %x[src]" : : [src] "r"(a));
-# endif
+  asm volatile("msr FPCR, %x[src]" : : [src] "r"(a));
 #else
   asm volatile("vmsr FPSCR, %[src]" : : [src] "r"(a));
 #endif

deps/v8/src/codegen/arm64/assembler-arm64.h

@@ -168,10 +168,14 @@ class AssemblerZone {
  public:
   explicit AssemblerZone(const MaybeAssemblerZone& zone)
       // Create a fresh Zone unless one is already provided.
-      : maybe_local_zone_(),
+      : maybe_local_zone_(
+            std::holds_alternative<Zone*>(zone)
+                ? std::nullopt
+                : std::make_optional<Zone>(std::get<AccountingAllocator*>(zone),
+                                           ZONE_NAME)),
         zone_(std::holds_alternative<Zone*>(zone)
                   ? std::get<Zone*>(zone)
-                  : &maybe_local_zone_.emplace(std::get<AccountingAllocator*>(zone), ZONE_NAME)) {}
+                  : &maybe_local_zone_.value()) {}
 
   Zone* get() const { return zone_; }
 

deps/v8/src/compiler/js-heap-broker.cc

@@ -879,7 +879,7 @@ ElementAccessFeedback const& JSHeapBroker::ProcessFeedbackMapsForElementAccess(
     Tagged<Map> transition_target;
 
     // Don't generate elements kind transitions from stable maps.
-    if (!map.is_stable() && possible_transition_targets.begin() != possible_transition_targets.end()) {
+    if (!map.is_stable()) {
       // The lock is needed for UnusedPropertyFields (called deep inside
       // FindElementsKindTransitionedMap).
       MapUpdaterGuardIfNeeded mumd_scope(this);

deps/v8/src/execution/frames.h

@@ -1292,11 +1292,11 @@ class WasmFrame : public TypedFrame {
   FrameSummaries Summarize() const override;
 
   static WasmFrame* cast(StackFrame* frame) {
+    DCHECK(frame->is_wasm()
 #ifdef V8_ENABLE_DRUMBRAKE
-    DCHECK(frame->is_wasm() && !frame->is_wasm_interpreter_entry());
-#else
-    DCHECK(frame->is_wasm());
+           && !frame->is_wasm_interpreter_entry()
 #endif  // V8_ENABLE_DRUMBRAKE
+    );
     return static_cast<WasmFrame*>(frame);
   }
 

deps/v8/src/execution/isolate.h

@@ -574,14 +574,10 @@ using DebugObjectCache = std::vector<Handle<HeapObject>>;
 #define THREAD_LOCAL_TOP_ADDRESS(type, name) \
   inline type* name##_address() { return &thread_local_top()->name##_; }
 
-#if defined(_MSC_VER)
-extern thread_local Isolate* g_current_isolate_ V8_CONSTINIT;
-#else
 // Do not use this variable directly, use Isolate::Current() instead.
 // Defined outside of Isolate because Isolate uses V8_EXPORT_PRIVATE.
 __attribute__((tls_model(V8_TLS_MODEL))) extern thread_local Isolate*
     g_current_isolate_ V8_CONSTINIT;
-#endif  // defined(_MSC_VER)
 
 // HiddenFactory exists so Isolate can privately inherit from it without making
 // Factory's members available to Isolate directly.

deps/v8/src/heap/base/asm/arm64/push_registers_masm.S

@@ -33,14 +33,10 @@ class MarkingBarrier;
 class MutablePageMetadata;
 class Safepoint;
 
-#if defined(_MSC_VER)
-extern thread_local LocalHeap* g_current_local_heap_ V8_CONSTINIT;
-#else
 // Do not use this variable directly, use LocalHeap::Current() instead.
 // Defined outside of LocalHeap because LocalHeap uses V8_EXPORT_PRIVATE.
 __attribute__((tls_model(V8_TLS_MODEL))) extern thread_local LocalHeap*
     g_current_local_heap_ V8_CONSTINIT;
-#endif  // defined(_MSC_VER)
 
 // LocalHeap is used by the GC to track all threads with heap access in order to
 // stop them before performing a collection. LocalHeaps can be either Parked or

deps/v8/src/heap/local-heap.h

@@ -11003,19 +11003,13 @@ MaybeReduceResult MaglevGraphBuilder::TryReduceCallForNewClosure(
       return BuildCallRuntime(Runtime::kThrowConstructorNonCallableError,
                               {target_node});
     }
-
-#ifdef V8_ENABLE_LEAPTIERING
-      RETURN_IF_DONE(TryBuildCallKnownJSFunction(
-        target_context, target_node,
-        GetRootConstant(RootIndex::kUndefinedValue),
-        dispatch_handle,
-        shared, feedback_cell, args, feedback_source));
-#else
     RETURN_IF_DONE(TryBuildCallKnownJSFunction(
         target_context, target_node,
         GetRootConstant(RootIndex::kUndefinedValue),
-        shared, feedback_cell, args, feedback_source));
+#ifdef V8_ENABLE_LEAPTIERING
+        dispatch_handle,
 #endif
+        shared, feedback_cell, args, feedback_source));
   }
   return BuildGenericCall(target_node, Call::TargetType::kJSFunction, args);
 }

deps/v8/src/maglev/maglev-graph-builder.cc

@@ -42,13 +42,13 @@ HEAP_OBJECT_TYPE_LIST(DECL_TYPE)
 // Instance types which are associated with one unique map.
 
 template <class type>
-V8_INLINE constexpr std::optional<RootIndex> UniqueMapOfInstanceTypeCheck() {
+V8_INLINE consteval std::optional<RootIndex> UniqueMapOfInstanceTypeCheck() {
   return {};
 }
 
 #define INSTANCE_TYPE_MAP(V, rootIndexName, rootAccessorName, class_name) \
   template <>                                                             \
-  V8_INLINE constexpr std::optional<RootIndex>                            \
+  V8_INLINE consteval std::optional<RootIndex>                            \
   UniqueMapOfInstanceTypeCheck<InstanceTypeTraits::class_name>() {        \
     return {RootIndex::k##rootIndexName};                                 \
   }

deps/v8/src/objects/instance-type-inl.h

@@ -121,10 +121,12 @@ static_assert(sizeof(UnalignedDoubleMember) == sizeof(double));
 #define FLEXIBLE_ARRAY_MEMBER(Type, name)                     \
   using FlexibleDataReturnType = Type[0];                     \
   FlexibleDataReturnType& name() {                            \
+    static_assert(alignof(Type) <= alignof(decltype(*this))); \
     using ReturnType = Type[0];                               \
     return reinterpret_cast<ReturnType&>(*(this + 1));        \
   }                                                           \
   const FlexibleDataReturnType& name() const {                \
+    static_assert(alignof(Type) <= alignof(decltype(*this))); \
     using ReturnType = Type[0];                               \
     return reinterpret_cast<const ReturnType&>(*(this + 1));  \
   }                                                           \

deps/v8/src/objects/tagged-field.h

@@ -1204,8 +1204,8 @@ RUNTIME_FUNCTION(Runtime_SetAllocationTimeout) {
 namespace {
 
 int FixedArrayLenFromSize(int size) {
-return std::min<int>((size - OFFSET_OF_DATA_START(FixedArray)) / kTaggedSize,
-                     static_cast<int>(FixedArray::kMaxRegularLength));
+  return std::min({(size - OFFSET_OF_DATA_START(FixedArray)) / kTaggedSize,
+                   FixedArray::kMaxRegularLength});
 }
 
 void FillUpOneNewSpacePage(Isolate* isolate, Heap* heap,

deps/v8/src/runtime/runtime-test.cc

@@ -3009,21 +3009,15 @@ DirectHandle<WasmExportedFunction> WasmExportedFunction::New(
     DirectHandle<WasmFuncRef> func_ref,
     DirectHandle<WasmInternalFunction> internal_function, int arity,
     DirectHandle<Code> export_wrapper) {
-#if V8_ENABLE_DRUMBRAKE
   DCHECK(CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind() ||
          (export_wrapper->is_builtin() &&
           (export_wrapper->builtin_id() == Builtin::kJSToWasmWrapper ||
+#if V8_ENABLE_DRUMBRAKE
            export_wrapper->builtin_id() ==
                Builtin::kGenericJSToWasmInterpreterWrapper ||
+#endif  // V8_ENABLE_DRUMBRAKE
            export_wrapper->builtin_id() == Builtin::kWasmPromising ||
            export_wrapper->builtin_id() == Builtin::kWasmStressSwitch)));
-#else
-  DCHECK(CodeKind::JS_TO_WASM_FUNCTION == export_wrapper->kind() ||
-         (export_wrapper->is_builtin() &&
-          (export_wrapper->builtin_id() == Builtin::kJSToWasmWrapper ||
-           export_wrapper->builtin_id() == Builtin::kWasmPromising ||
-           export_wrapper->builtin_id() == Builtin::kWasmStressSwitch)));
-#endif  // V8_ENABLE_DRUMBRAKE
   int func_index = internal_function->function_index();
   Factory* factory = isolate->factory();
   DirectHandle<Map> rtt;

deps/v8/src/wasm/wasm-objects.cc

@@ -153,13 +153,8 @@ struct PlainHashReader {
 /*
  *  Likely and unlikely macros.
  */
-#if defined(_MSC_VER) && !defined(__clang__)
-  #define _likely_(x) (x)
-  #define _unlikely_(x) (x)
-#else
-  #define _likely_(x) __builtin_expect(x, 1)
-  #define _unlikely_(x) __builtin_expect(x, 0)
-#endif
+#define _likely_(x) __builtin_expect(x, 1)
+#define _unlikely_(x) __builtin_expect(x, 0)
 
 /*
  *  Default seed.