changeset 440:7ee20b0bbd10

rebase to current hsx/hotspot-comp
author jrose
date Mon, 03 Dec 2012 18:58:35 -0800
parents c3c151c6d7d0
children 379345d2d26a
files meth.patch series
diffstat 2 files changed, 12 insertions(+), 98 deletions(-) [+]
line wrap: on
line diff
--- a/meth.patch	Sat Nov 03 19:00:02 2012 -0700
+++ b/meth.patch	Mon Dec 03 18:58:35 2012 -0800
@@ -3,18 +3,10 @@
 8001109: arity mismatch on a call to spreader method handle should elicit WrongMethodTypeException
 8001110: method handles should have a collectArguments transform, generalizing asCollector
 add comments where MR1 changes are likely
-update copyright headers
 
 diff --git a/src/share/classes/java/lang/invoke/CallSite.java b/src/share/classes/java/lang/invoke/CallSite.java
 --- a/src/share/classes/java/lang/invoke/CallSite.java
 +++ b/src/share/classes/java/lang/invoke/CallSite.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 @@ -289,7 +289,7 @@
                  throw new ClassCastException("bootstrap method failed to produce a CallSite");
              }
@@ -24,36 +16,9 @@
          } catch (Throwable ex) {
              BootstrapMethodError bex;
              if (ex instanceof BootstrapMethodError)
-diff --git a/src/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/share/classes/java/lang/invoke/DirectMethodHandle.java
---- a/src/share/classes/java/lang/invoke/DirectMethodHandle.java
-+++ b/src/share/classes/java/lang/invoke/DirectMethodHandle.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-diff --git a/src/share/classes/java/lang/invoke/Invokers.java b/src/share/classes/java/lang/invoke/Invokers.java
---- a/src/share/classes/java/lang/invoke/Invokers.java
-+++ b/src/share/classes/java/lang/invoke/Invokers.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 diff --git a/src/share/classes/java/lang/invoke/MemberName.java b/src/share/classes/java/lang/invoke/MemberName.java
 --- a/src/share/classes/java/lang/invoke/MemberName.java
 +++ b/src/share/classes/java/lang/invoke/MemberName.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 @@ -302,10 +302,6 @@
          assert(getReferenceKind() == oldKind);
          assert(MethodHandleNatives.refKindIsValid(refKind));
@@ -126,13 +91,6 @@
 diff --git a/src/share/classes/java/lang/invoke/MethodHandle.java b/src/share/classes/java/lang/invoke/MethodHandle.java
 --- a/src/share/classes/java/lang/invoke/MethodHandle.java
 +++ b/src/share/classes/java/lang/invoke/MethodHandle.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 @@ -31,8 +31,6 @@
  import sun.misc.Unsafe;
  
@@ -196,13 +154,6 @@
 diff --git a/src/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/share/classes/java/lang/invoke/MethodHandleProxies.java
 --- a/src/share/classes/java/lang/invoke/MethodHandleProxies.java
 +++ b/src/share/classes/java/lang/invoke/MethodHandleProxies.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 @@ -28,6 +28,7 @@
  import java.lang.reflect.*;
  import sun.invoke.WrapperInstance;
@@ -332,26 +283,9 @@
          List<Class<?>> types = BytecodeDescriptor.parseMethod(descriptor, loader);
          Class<?> rtype = types.remove(types.size() - 1);
          checkSlotCount(types.size());
-diff --git a/src/share/classes/java/lang/invoke/MethodTypeForm.java b/src/share/classes/java/lang/invoke/MethodTypeForm.java
---- a/src/share/classes/java/lang/invoke/MethodTypeForm.java
-+++ b/src/share/classes/java/lang/invoke/MethodTypeForm.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 diff --git a/src/share/classes/java/lang/invoke/SimpleMethodHandle.java b/src/share/classes/java/lang/invoke/SimpleMethodHandle.java
 --- a/src/share/classes/java/lang/invoke/SimpleMethodHandle.java
 +++ b/src/share/classes/java/lang/invoke/SimpleMethodHandle.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 @@ -27,8 +27,6 @@
  
  import static java.lang.invoke.LambdaForm.*;
@@ -361,26 +295,6 @@
  
  /**
   * A method handle whose behavior is determined only by its LambdaForm.
-diff --git a/src/share/classes/java/lang/invoke/WrongMethodTypeException.java b/src/share/classes/java/lang/invoke/WrongMethodTypeException.java
---- a/src/share/classes/java/lang/invoke/WrongMethodTypeException.java
-+++ b/src/share/classes/java/lang/invoke/WrongMethodTypeException.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
-diff --git a/src/share/classes/java/lang/invoke/package-info.java b/src/share/classes/java/lang/invoke/package-info.java
---- a/src/share/classes/java/lang/invoke/package-info.java
-+++ b/src/share/classes/java/lang/invoke/package-info.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  *
-  * This code is free software; you can redistribute it and/or modify it
 diff --git a/test/java/lang/invoke/MethodHandlesTest.java b/test/java/lang/invoke/MethodHandlesTest.java
 --- a/test/java/lang/invoke/MethodHandlesTest.java
 +++ b/test/java/lang/invoke/MethodHandlesTest.java
--- a/series	Sat Nov 03 19:00:02 2012 -0700
+++ b/series	Mon Dec 03 18:58:35 2012 -0800
@@ -1,4 +1,4 @@
-# base = 7ac292e57b5a in http://hg.openjdk.java.net/hsx/hotspot-comp/jdk [2012-11-04]
+# base = df5619994dc3 in http://hg.openjdk.java.net/hsx/hotspot-comp/jdk [2012-11-29]
 
 # review complete for hotspot-comp:
 # (none)
@@ -6,24 +6,24 @@
 # review pending before push to hotspot-comp:
 
 # non-pushed files are under review or development, or merely experimental:
-anno-stable-8001107.patch       #-/meth #+7ac292e57b5a
-meth-lfi-8001106.patch          #-/meth #+7ac292e57b5a
-meth-info-7087570.patch         #-/meth #+7ac292e57b5a
-meth-aclone-8001105.patch       #-/meth #+7ac292e57b5a
-meth.patch                      #-/meth #+7ac292e57b5a
-meth-7177472.patch              #-/meth #+7ac292e57b5a #-buildable
-indy.pack.patch                 #-/meth #+7ac292e57b5a #-buildable
+anno-stable-8001107.patch       #-/meth #+df5619994dc3
+meth-lfi-8001106.patch          #-/meth #+df5619994dc3
+meth-info-7087570.patch         #-/meth #+df5619994dc3
+meth-aclone-8001105.patch       #-/meth #+df5619994dc3
+meth.patch                      #-/meth #+df5619994dc3
+meth-7177472.patch              #-/meth #+df5619994dc3 #-buildable
+indy.pack.patch                 #-/meth #+df5619994dc3 #-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 #(7ac292e57b5a)
+continuation.patch #+continuation #-/continuation #(df5619994dc3)
 tailc.patch     #+tailc         #-/tailc
-anonk.patch                     #-/anonk #+7ac292e57b5a
+anonk.patch                     #-/anonk #+df5619994dc3
 
 # Coroutine patches: full version and simple version (no thread migration, no serialization, no stack sharing) 
-coro.patch                      #+coro          #(7ac292e57b5a)
-coro-simple.patch               #+coro-simple   #(7ac292e57b5a)
+coro.patch                      #+coro          #(df5619994dc3)
+coro-simple.patch               #+coro-simple   #(df5619994dc3)
 
 tuple-tsig.patch                #-/tuple #-testable