changeset 509:37735140b62a

rebase to current hsx/hotspot-comp
author jrose
date Sat, 03 Nov 2012 19:00:15 -0700
parents b6f0babd7cf1
children c4e42349c4b6
files anno-stable-8001107.patch coro.patch series
diffstat 3 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/anno-stable-8001107.patch	Wed Oct 17 21:46:25 2012 -0700
+++ b/anno-stable-8001107.patch	Sat Nov 03 19:00:15 2012 -0700
@@ -41,7 +41,7 @@
 +  assert(ary->is_array(), "");
 +  if (index < 0 || index >= ary->length())
 +    return ciConstant();
-+  arrayKlass* ak = (arrayKlass*) ary->klass();
++  ArrayKlass* ak = (ArrayKlass*) ary->klass();
 +  BasicType abt = ak->element_type();
 +  if (fixup_element_type(elembt) !=
 +      fixup_element_type(abt))
@@ -391,7 +391,7 @@
      void set_annotation(ID id) {
        assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob");
 @@ -237,7 +238,8 @@
-                                        int runtime_invisible_annotations_length, TRAPS);
+                                         int runtime_invisible_annotations_length, TRAPS);
    int skip_annotation(u1* buffer, int limit, int index);
    int skip_annotation_value(u1* buffer, int limit, int index);
 -  void parse_annotations(u1* buffer, int limit, constantPoolHandle cp,
--- a/coro.patch	Wed Oct 17 21:46:25 2012 -0700
+++ b/coro.patch	Sat Nov 03 19:00:15 2012 -0700
@@ -1492,14 +1492,14 @@
 --- a/src/share/vm/classfile/systemDictionary.hpp
 +++ b/src/share/vm/classfile/systemDictionary.hpp
 @@ -179,6 +179,11 @@
-   template(Short_klass,                  java_lang_Short,                Pre) \
-   template(Integer_klass,                java_lang_Integer,              Pre) \
-   template(Long_klass,                   java_lang_Long,                 Pre) \
-+                                                                              \
-+  /* Stack manipulation classes */                                            \
-+  template(coroutine_support_klass,      java_dyn_CoroutineSupport,      Opt) \
-+  template(coroutine_base_klass,         java_dyn_CoroutineBase,         Opt) \
-+  template(coroutine_frame_klass,        java_dyn_CoroutineFrame,        Opt) \
+   do_klass(Short_klass,                                 java_lang_Short,                           Pre                 ) \
+   do_klass(Integer_klass,                               java_lang_Integer,                         Pre                 ) \
+   do_klass(Long_klass,                                  java_lang_Long,                            Pre                 ) \
++                                                                                                                         \
++  /* Stack manipulation classes */                                                                                       \
++  do_klass(coroutine_support_klass,                     java_dyn_CoroutineSupport,                 Opt                 ) \
++  do_klass(coroutine_base_klass,                        java_dyn_CoroutineBase,                    Opt                 ) \
++  do_klass(coroutine_frame_klass,                       java_dyn_CoroutineFrame,                   Opt                 ) \
    /*end*/
  
  
--- a/series	Wed Oct 17 21:46:25 2012 -0700
+++ b/series	Sat Nov 03 19:00:15 2012 -0700
@@ -1,11 +1,11 @@
-# base = bf2edd3c9b0f in http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot [2012-10-04]
+# base = 64672b22ef05 in http://hg.openjdk.java.net/hsx/hotspot-comp/hotspot [2012-11-02]
 
 # review pending before push to hotspot-comp:
 
 # non-pushed files are under review or development, or merely experimental:
-anno-stable-8001107.patch       #-/meth #+bf2edd3c9b0f
-value-obj-8001111.patch         #-/meth #+bf2edd3c9b0f #-testable
-meth.patch                      #-/meth #+bf2edd3c9b0f
+anno-stable-8001107.patch       #-/meth #+64672b22ef05
+value-obj-8001111.patch         #-/meth #+64672b22ef05 #-testable
+meth.patch                      #-/meth #+64672b22ef05
 
 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          #(bf2edd3c9b0f)
-coro-simple.patch               #+coro-simple   #(bf2edd3c9b0f)
+coro.patch                      #+coro          #(64672b22ef05)
+coro-simple.patch               #+coro-simple   #(64672b22ef05)
 
 tuple-tsig.patch        #+tuple #-/tuple #-testable