changeset 429:a8e6272996ec

rebase to current hsx/hotspot-comp
author jrose
date Sat, 01 Sep 2012 16:44:35 -0700
parents a65758cae648
children 7325272c5eb4
files meth.patch series
diffstat 2 files changed, 9 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/meth.patch	Wed Aug 22 16:37:49 2012 -0700
+++ b/meth.patch	Sat Sep 01 16:44:35 2012 -0700
@@ -65,7 +65,7 @@
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
-@@ -299,19 +299,9 @@
+@@ -299,10 +299,6 @@
          assert(getReferenceKind() == oldKind);
          assert(MethodHandleNatives.refKindIsValid(refKind));
          flags += (((int)refKind - oldKind) << MN_REFERENCE_KIND_SHIFT);
@@ -76,26 +76,6 @@
          return this;
      }
  
--    private void setFlags(int flags) {
--        this.flags = flags;
--        assert(testAnyFlags(ALL_KINDS));
--        assert(referenceKindIsConsistent());
--    }
--
-     private boolean testFlags(int mask, int value) {
-         return (flags & mask) == value;
-     }
-@@ -452,7 +442,9 @@
-         this.clazz = defClass;
-         this.name = name;
-         this.type = type;
--        setFlags(flags);
-+        this.flags = flags;
-+        assert(testAnyFlags(ALL_KINDS));
-+        assert(referenceKindIsConsistent());  // do this after resolution also
-         assert(this.resolution == null);  // nobody should have touched this yet
-     }
- 
 @@ -494,14 +486,14 @@
          case REF_invokeVirtual:     return clone().changeReferenceKind(REF_invokeSpecial, REF_invokeVirtual);
          case REF_newInvokeSpecial:  return clone().changeReferenceKind(REF_invokeSpecial, REF_newInvokeSpecial);
--- a/series	Wed Aug 22 16:37:49 2012 -0700
+++ b/series	Sat Sep 01 16:44:35 2012 -0700
@@ -1,4 +1,4 @@
-# base = a4f0043a5621 in http://hg.openjdk.java.net/hsx/hotspot-comp/jdk [2012-08-17]
+# base = 59231f2cb6e1 in http://hg.openjdk.java.net/hsx/hotspot-comp/jdk [2012-08-28]
 
 # review complete for hotspot-comp:
 # (none)
@@ -6,20 +6,20 @@
 # review pending before push to hotspot-comp:
 
 # non-pushed files are under review or development, or merely experimental:
-meth.patch                      #-/meth #+a4f0043a5621
-meth-7177472.patch              #-/meth #+a4f0043a5621 #-buildable
-indy.pack.patch                 #-/meth #+a4f0043a5621 #-buildable
+meth.patch                      #-/meth #+59231f2cb6e1
+meth-7177472.patch              #-/meth #+59231f2cb6e1 #-buildable
+indy.pack.patch                 #-/meth #+59231f2cb6e1 #-buildable
 
 # Keep these separate, for debugging and review:
 dyncast.patch   #+dyncast       #-/dyncast
 inti.patch      #+inti          #-/inti #-buildable
 callcc_old.patch #+callcc_old   #-/callcc_old
-continuation.patch #+continuation #-/continuation #(a4f0043a5621)
+continuation.patch #+continuation #-/continuation #(59231f2cb6e1)
 tailc.patch     #+tailc         #-/tailc
-anonk.patch                     #-/anonk #+a4f0043a5621
+anonk.patch                     #-/anonk #+59231f2cb6e1
 
 # Coroutine patches: full version and simple version (no thread migration, no serialization, no stack sharing) 
-coro.patch                      #+coro          #(a4f0043a5621)
-coro-simple.patch               #+coro-simple   #(a4f0043a5621)
+coro.patch                      #+coro          #(59231f2cb6e1)
+coro-simple.patch               #+coro-simple   #(59231f2cb6e1)
 
 tuple-tsig.patch                #-/tuple #-testable