changeset 510:c4e42349c4b6

rebase to current hsx/hotspot-comp
author jrose
date Mon, 03 Dec 2012 18:58:35 -0800
parents 37735140b62a
children d8eb5f191045
files anno-stable-8001107.patch series value-obj-8001111.patch
diffstat 3 files changed, 17 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/anno-stable-8001107.patch	Sat Nov 03 19:00:15 2012 -0700
+++ b/anno-stable-8001107.patch	Mon Dec 03 18:58:35 2012 -0800
@@ -351,15 +351,17 @@
  }
  
  void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) {
-@@ -2125,7 +2143,7 @@
+@@ -2125,8 +2143,8 @@
          runtime_visible_annotations_length = method_attribute_length;
          runtime_visible_annotations = cfs->get_u1_buffer();
          assert(runtime_visible_annotations != NULL, "null visible annotations");
--        parse_annotations(runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
-+        parse_annotations(loader_data, runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle));
+-        parse_annotations(runtime_visible_annotations,
+-            runtime_visible_annotations_length, cp, &parsed_annotations,
++        parse_annotations(loader_data,
++            runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations,
+             CHECK_(nullHandle));
          cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
        } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
-         runtime_invisible_annotations_length = method_attribute_length;
 @@ -2785,7 +2803,8 @@
          runtime_visible_annotations_length = attribute_length;
          runtime_visible_annotations = cfs->get_u1_buffer();
@@ -410,7 +412,7 @@
 +  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: */         \
+   template(java_lang_invoke_MagicLambdaImpl,          "java/lang/invoke/MagicLambdaImpl")         \
 diff --git a/src/share/vm/oops/fieldInfo.hpp b/src/share/vm/oops/fieldInfo.hpp
 --- a/src/share/vm/oops/fieldInfo.hpp
 +++ b/src/share/vm/oops/fieldInfo.hpp
--- a/series	Sat Nov 03 19:00:15 2012 -0700
+++ b/series	Mon Dec 03 18:58:35 2012 -0800
@@ -1,11 +1,11 @@
-# base = 64672b22ef05 in http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot [2012-11-02]
+# base = cd3d6a6b95d9 in http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot [2012-11-30]
 
 # review pending before push to hotspot-comp:
 
 # non-pushed files are under review or development, or merely experimental:
-anno-stable-8001107.patch       #-/meth #+64672b22ef05
-value-obj-8001111.patch         #-/meth #+64672b22ef05 #-testable
-meth.patch                      #-/meth #+64672b22ef05
+anno-stable-8001107.patch       #-/meth #+cd3d6a6b95d9
+value-obj-8001111.patch         #-/meth #+cd3d6a6b95d9 #-testable
+meth.patch                      #-/meth #+cd3d6a6b95d9
 
 meth.proj.patch                 #-/meth #+projects
 anonk.proj.patch                #-/anonk #+projects
@@ -21,7 +21,7 @@
 hotswaplight.patch   #+hotswaplight       #-/hotswaplight
 
 # Coroutine patches: full version and simple version (no thread migration, no serialization, no stack sharing) 
-coro.patch                      #+coro          #(64672b22ef05)
-coro-simple.patch               #+coro-simple   #(64672b22ef05)
+coro.patch                      #+coro          #(cd3d6a6b95d9)
+coro-simple.patch               #+coro-simple   #(cd3d6a6b95d9)
 
 tuple-tsig.patch        #+tuple #-/tuple #-testable
--- a/value-obj-8001111.patch	Sat Nov 03 19:00:15 2012 -0700
+++ b/value-obj-8001111.patch	Mon Dec 03 18:58:35 2012 -0800
@@ -518,7 +518,7 @@
        ResourceMark rm;
        tty->print_cr("  (Skipping revocation of object of type %s because it's no longer biased)",
 @@ -164,8 +164,9 @@
-                   (intptr_t) obj, (intptr_t) mark, Klass::cast(obj->klass())->external_name(), (intptr_t) Klass::cast(obj->klass())->prototype_header(), (allow_rebias ? 1 : 0), (intptr_t) requesting_thread);
+                   (intptr_t) obj, (intptr_t) mark, obj->klass()->external_name(), (intptr_t) obj->klass()->prototype_header(), (allow_rebias ? 1 : 0), (intptr_t) requesting_thread);
    }
  
 -  JavaThread* biased_thread = mark->biased_locker();
@@ -556,7 +556,7 @@
    }
  
 @@ -329,6 +337,9 @@
-                   (intptr_t) o, (intptr_t) o->mark(), Klass::cast(o->klass())->external_name());
+                   (intptr_t) o, (intptr_t) o->mark(), o->klass()->external_name());
    }
  
 +  assert(!o->mark()->is_permanently_locked(),
@@ -645,7 +645,7 @@
      }
 -  } else if (mark->has_bias_pattern()) {
 +  } else if (mark->has_revocable_bias_pattern()) {
-     Klass* k = Klass::cast(obj->klass());
+     Klass* k = obj->klass();
      markOop prototype_header = k->prototype_header();
 +    assert(!prototype_header->is_permanently_locked(), "object cannot be normal if klass is permanently biased");
      if (!prototype_header->has_bias_pattern()) {
@@ -653,7 +653,7 @@
        // for this data type occurred. It's pointless to update the
 @@ -592,7 +604,7 @@
    } else if (heuristics == HR_SINGLE_REVOKE) {
-     Klass *k = Klass::cast(obj->klass());
+     Klass *k = obj->klass();
      markOop prototype_header = k->prototype_header();
 -    if (mark->biased_locker() == THREAD &&
 +    if (mark->is_biased_to(THREAD) &&