GC_JVM_STACK_MOVE_LIMIT vs. GC_JVM_STACK_MOVE_UNIT

[Christian Thalinger]

Hi John!

There is a mismatch between HotSpot and the JDK about a constant name. 
I think this is the correct fix, right?

diff --git a/src/share/vm/prims/methodHandles.cpp 
b/src/share/vm/prims/methodHandles.cpp
--- a/src/share/vm/prims/methodHandles.cpp
+++ b/src/share/vm/prims/methodHandles.cpp
@@ -2137,7 +2137,7 @@ JVM_ENTRY(jint, MHI_getConstant(JNIEnv *
      guarantee(MethodHandlePushLimit >= 2 && MethodHandlePushLimit <= 0xFF,
                "MethodHandlePushLimit parameter must be in valid range");
      return MethodHandlePushLimit;
-  case MethodHandles::GC_JVM_STACK_MOVE_LIMIT:
+  case MethodHandles::GC_JVM_STACK_MOVE_UNIT:
      // return number of words per slot, signed according to stack 
direction
      return MethodHandles::stack_move_unit();
    }
@@ -2148,7 +2148,7 @@ JVM_END
  #ifndef PRODUCT
  #define EACH_NAMED_CON(template) \
      template(MethodHandles,GC_JVM_PUSH_LIMIT) \
-    template(MethodHandles,GC_JVM_STACK_MOVE_LIMIT) \
+    template(MethodHandles,GC_JVM_STACK_MOVE_UNIT) \
      template(MethodHandles,ETF_HANDLE_OR_METHOD_NAME) \
      template(MethodHandles,ETF_DIRECT_HANDLE) \
      template(MethodHandles,ETF_METHOD_NAME) \
diff --git a/src/share/vm/prims/methodHandles.hpp 
b/src/share/vm/prims/methodHandles.hpp
--- a/src/share/vm/prims/methodHandles.hpp
+++ b/src/share/vm/prims/methodHandles.hpp
@@ -243,7 +243,7 @@ class MethodHandles: AllStatic {
    enum {
      // format of query to getConstant:
      GC_JVM_PUSH_LIMIT = 0,
-    GC_JVM_STACK_MOVE_LIMIT = 1,
+    GC_JVM_STACK_MOVE_UNIT = 1,

      // format of result from getTarget / encode_target:
      ETF_HANDLE_OR_METHOD_NAME = 0, // all available data (immediate MH 
or method)

-- Christian
_______________________________________________
mlvm-dev mailing list
mlvm-dev@openjdk.java.net
http://mail.openjdk.java.net/mailman/listinfo/mlvm-dev