8343685: C2 SuperWord: refactor VPointer with MemPointer

src/hotspot/share/classfile/vmSymbols.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -356,6 +356,8 @@ class SerializeClosure;
   template(jdk_internal_foreign_abi_VMStorage_array_array_signature, "[[Ljdk/internal/foreign/abi/VMStorage;") \
   template(jdk_internal_foreign_abi_CallConv,                        "jdk/internal/foreign/abi/UpcallLinker$CallRegs") \
                                                                                                   \
+  template(jdk_internal_foreign_NativeMemorySegmentImpl,             "jdk/internal/foreign/NativeMemorySegmentImpl") \
+                                                                                                  \
   /* Support for JVMCI */                                                                         \
   JVMCI_VM_SYMBOLS_DO(template, do_alias)                                                         \
                                                                                                   \

src/hotspot/share/opto/memnode.cpp

@@ -2859,16 +2859,16 @@ class MergePrimitiveStores : public StackObj {
     return is_trace(TraceMergeStores::Tag::BASIC);
   }
 
-  bool is_trace_pointer() const {
-    return is_trace(TraceMergeStores::Tag::POINTER);
+  bool is_trace_pointer_parsing() const {
+    return is_trace(TraceMergeStores::Tag::POINTER_PARSING);
   }
 
-  bool is_trace_aliasing() const {
-    return is_trace(TraceMergeStores::Tag::ALIASING);
+  bool is_trace_pointer_aliasing() const {
+    return is_trace(TraceMergeStores::Tag::POINTER_ALIASING);
   }
 
-  bool is_trace_adjacency() const {
-    return is_trace(TraceMergeStores::Tag::ADJACENCY);
+  bool is_trace_pointer_adjacency() const {
+    return is_trace(TraceMergeStores::Tag::POINTER_ADJACENCY);
   }
 
   bool is_trace_success() const {
@@ -2939,12 +2939,13 @@ bool MergePrimitiveStores::is_adjacent_pair(const StoreNode* use_store, const St
 
   ResourceMark rm;
 #ifndef PRODUCT
-  const TraceMemPointer trace(is_trace_pointer(),
-                              is_trace_aliasing(),
-                              is_trace_adjacency());
+  const TraceMemPointer trace(is_trace_pointer_parsing(),
+                              is_trace_pointer_aliasing(),
+                              is_trace_pointer_adjacency(),
+                              true);
 #endif
-  const MemPointer pointer_use(use_store NOT_PRODUCT( COMMA trace ));
-  const MemPointer pointer_def(def_store NOT_PRODUCT( COMMA trace ));
+  const MemPointer pointer_use(use_store NOT_PRODUCT(COMMA trace));
+  const MemPointer pointer_def(def_store NOT_PRODUCT(COMMA trace));
   return pointer_def.is_adjacent_to_and_before(pointer_use);
 }