changeset 422:1bb873eba051

fix meth-7177472.patch for recent changes in meth-lazy-7023639.patch
author Lukas Stadler <lukas.stadler@jku.at>
date Wed, 25 Jul 2012 14:19:14 +0200
parents 0cd0e35d7fe6
children 90c60ec5aba4
files meth-7177472.patch
diffstat 1 files changed, 6 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/meth-7177472.patch	Mon Jul 23 10:44:17 2012 -0700
+++ b/meth-7177472.patch	Wed Jul 25 14:19:14 2012 +0200
@@ -17,20 +17,10 @@
  import sun.invoke.util.BytecodeDescriptor;
  import static java.lang.invoke.MethodHandleStatics.*;
 +import java.lang.ref.Reference;
+ import sun.invoke.util.VerifyType;
  
  /**
-  * A method type represents the arguments and return type accepted and
-@@ -240,8 +242,7 @@
-             ptypes = NO_PTYPES; trusted = true;
-         }
-         MethodType mt1 = new MethodType(rtype, ptypes);
--        MethodType mt0;
--        mt0 = internTable.get(mt1);
-+        MethodType mt0 = internTable.get(mt1);
-         if (mt0 != null)
-             return mt0;
-         if (!trusted)
-@@ -939,84 +940,17 @@
+@@ -990,84 +992,17 @@
       * @see         java.util.HashSet
       * @see         java.util.WeakHashMap
       * @see         java.lang.ref.WeakReference
@@ -118,7 +108,7 @@
          }
  
          /**
-@@ -1024,39 +958,11 @@
+@@ -1075,39 +1010,11 @@
           */
          private void expungeStaleEntries() {
              for (Object x; (x = queue.poll()) != null; ) {
@@ -159,7 +149,7 @@
           * Returns the entry to which the specified value is mapped,
           * or {@code null} if this set contains no entry for the value.
           *
-@@ -1068,16 +974,15 @@
+@@ -1119,16 +1026,15 @@
           * @param value value to search for in set
           * @return interned value if in set, otherwise <tt>null</tt>
           */
@@ -185,7 +175,7 @@
              }
              return null;
          }
-@@ -1091,86 +996,20 @@
+@@ -1142,86 +1048,20 @@
           * @return the previous entry associated with <tt>value</tt>, or
           *         <tt>value</tt> if there was no previous entry found
           */
@@ -285,7 +275,7 @@
          }
  
          /**
-@@ -1179,18 +1018,36 @@
+@@ -1230,18 +1070,36 @@
           */
          private static class Entry extends WeakReference<MethodType> {
              final int hash;