changeset 507:f3b15e2870c5

anno-stable.patch: tweak naming
author jrose
date Mon, 15 Oct 2012 17:45:20 -0700
parents aa8f59e8372f
children b6f0babd7cf1
files anno-stable.patch series
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/anno-stable.patch	Fri Oct 12 12:35:47 2012 -0700
+++ b/anno-stable.patch	Mon Oct 15 17:45:20 2012 -0700
@@ -335,7 +335,7 @@
      if (_location != _in_method)  break;  // only allow for methods
 +    if (!privileged)              break;  // only allow in privileged code
      return _method_LambdaForm_Hidden;
-+  case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_Stable_signature):
++  case vmSymbols::VM_SYMBOL_ENUM_NAME(sun_invoke_Stable_signature):
 +    if (_location != _in_field)   break;  // only allow for fields
 +    if (!privileged)              break;  // only allow in privileged code
 +    return _field_Stable;
@@ -407,7 +407,7 @@
    template(java_lang_invoke_LambdaForm,               "java/lang/invoke/LambdaForm")              \
    template(java_lang_invoke_ForceInline_signature,    "Ljava/lang/invoke/ForceInline;")           \
    template(java_lang_invoke_DontInline_signature,     "Ljava/lang/invoke/DontInline;")            \
-+  template(java_lang_invoke_Stable_signature,         "Ljava/lang/invoke/Stable;")                \
++  template(sun_invoke_Stable_signature,               "Lsun/invoke/Stable;")                      \
    template(java_lang_invoke_LambdaForm_Compiled_signature, "Ljava/lang/invoke/LambdaForm$Compiled;") \
    template(java_lang_invoke_LambdaForm_Hidden_signature, "Ljava/lang/invoke/LambdaForm$Hidden;")  \
    /* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */         \
@@ -533,7 +533,7 @@
 diff --git a/src/share/vm/opto/graphKit.cpp b/src/share/vm/opto/graphKit.cpp
 --- a/src/share/vm/opto/graphKit.cpp
 +++ b/src/share/vm/opto/graphKit.cpp
-@@ -3791,7 +3791,7 @@
+@@ -3788,7 +3788,7 @@
                                                       false, NULL, 0);
    const TypePtr* value_field_type = string_type->add_offset(value_offset);
    const TypeAryPtr*  value_type = TypeAryPtr::make(TypePtr::NotNull,
@@ -542,7 +542,7 @@
                                                     ciTypeArrayKlass::make(T_CHAR), true, 0);
    int value_field_idx = C->get_alias_index(value_field_type);
    return make_load(ctrl, basic_plus_adr(str, str, value_offset),
-@@ -3814,7 +3814,7 @@
+@@ -3811,7 +3811,7 @@
                                                       false, NULL, 0);
    const TypePtr* value_field_type = string_type->add_offset(value_offset);
    const TypeAryPtr*  value_type = TypeAryPtr::make(TypePtr::NotNull,
@@ -672,7 +672,7 @@
 diff --git a/src/share/vm/opto/parse1.cpp b/src/share/vm/opto/parse1.cpp
 --- a/src/share/vm/opto/parse1.cpp
 +++ b/src/share/vm/opto/parse1.cpp
-@@ -916,6 +916,7 @@
+@@ -917,6 +917,7 @@
      // such unusual early publications.  But no barrier is needed on
      // exceptional returns, since they cannot publish normally.
      //
--- a/series	Fri Oct 12 12:35:47 2012 -0700
+++ b/series	Mon Oct 15 17:45:20 2012 -0700
@@ -3,8 +3,8 @@
 # review pending before push to hotspot-comp:
 
 # non-pushed files are under review or development, or merely experimental:
+anno-stable.patch               #-/meth #+bf2edd3c9b0f
 value-obj.patch                 #-/meth #+bf2edd3c9b0f #-testable
-anno-stable.patch               #-/meth #+bf2edd3c9b0f #-testable
 meth.patch                      #-/meth #+bf2edd3c9b0f
 
 meth.proj.patch                 #-/meth #+projects