Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 33ee9ccf 编写于 作者: J jrose
浏览文件
操作

Merge

上级 a43c1c0e af1c19af
展开全部 显示空白变更内容
内联 并排
Showing with 1810 addition and 1653 deletion
make/common/Release.gmk
浏览文件 @ 33ee9ccf
...@@ -54,9 +54,6 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \ ...@@ -54,9 +54,6 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
com.sun.java.swing.plaf.motif \ com.sun.java.swing.plaf.motif \
com.sun.java.swing.plaf.gtk com.sun.java.swing.plaf.gtk
# This is a stopgap until 6839872 is fixed.
EXCLUDE_PROPWARN_PKGS += sun.dyn
# #
# Include the exported private packages in ct.sym. # Include the exported private packages in ct.sym.
# This is an interim solution until the ct.sym is replaced # This is an interim solution until the ct.sym is replaced
......
make/docs/CORE_PKGS.gmk
浏览文件 @ 33ee9ccf
# #
# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -55,7 +55,7 @@ EXCLUDE_PKGS = \ ...@@ -55,7 +55,7 @@ EXCLUDE_PKGS = \
# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar". # This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
# #
ACTIVE_JSR_PKGS= \ ACTIVE_JSR_PKGS= \
java.dyn \ java.lang.invoke \
java.sql \ java.sql \
javax.activation \ javax.activation \
javax.annotation.* \ javax.annotation.* \
...@@ -97,11 +97,11 @@ CORE_PKGS = \ ...@@ -97,11 +97,11 @@ CORE_PKGS = \
java.awt.print \ java.awt.print \
java.beans \ java.beans \
java.beans.beancontext \ java.beans.beancontext \
java.dyn \
java.io \ java.io \
java.lang \ java.lang \
java.lang.annotation \ java.lang.annotation \
java.lang.instrument \ java.lang.instrument \
java.lang.invoke \
java.lang.management \ java.lang.management \
java.lang.ref \ java.lang.ref \
java.lang.reflect \ java.lang.reflect \
......
make/java/Makefile
浏览文件 @ 33ee9ccf
# #
# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -44,7 +44,7 @@ SUBDIRS += security math util text net nio jar ...@@ -44,7 +44,7 @@ SUBDIRS += security math util text net nio jar
SUBDIRS_desktop = awt applet beans SUBDIRS_desktop = awt applet beans
SUBDIRS_management = management SUBDIRS_management = management
SUBDIRS_misc = npt java_crw_demo java_hprof_demo \ SUBDIRS_misc = npt java_crw_demo java_hprof_demo \
logging instrument dyn sql rmi logging instrument invoke sql rmi
ifeq ($(PLATFORM), solaris) ifeq ($(PLATFORM), solaris)
......
make/java/dyn/Makefile → make/java/invoke/Makefile
浏览文件 @ 33ee9ccf
# #
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -25,18 +25,18 @@ ...@@ -25,18 +25,18 @@
BUILDDIR = ../.. BUILDDIR = ../..
PACKAGE = java.dyn PACKAGE = java.lang.invoke
PRODUCT = java PRODUCT = java
include $(BUILDDIR)/common/Defs.gmk include $(BUILDDIR)/common/Defs.gmk
AUTO_FILES_JAVA_DIRS = java/dyn sun/dyn AUTO_FILES_JAVA_DIRS = java/lang/invoke sun/invoke
FILES_java = \
java/lang/ClassValue.java \
java/lang/BootstrapMethodError.java
# The sources built here use new language syntax to generate # The sources built here use new language syntax to generate
# method handle calls. Let's be sure we are using that format. # method handle calls. Let's be sure we are using that format.
LANGUAGE_VERSION = -source 7 LANGUAGE_VERSION = -source 7
CLASS_VERSION = -target 7 CLASS_VERSION = -target 7
# Tell the compiler not to accept transitional forms.
OTHER_JAVACFLAGS = -XDallowTransitionalJSR292=no
include $(BUILDDIR)/common/Classes.gmk include $(BUILDDIR)/common/Classes.gmk
src/share/classes/java/dyn/Linkage.java 已删除 100644 → 0
浏览文件 @ a43c1c0e
/*
* Copyright (c) 2008, 2010, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.dyn;
import java.dyn.MethodHandles.Lookup;
import java.util.WeakHashMap;
import sun.dyn.Access;
import sun.dyn.MethodHandleImpl;
import sun.dyn.util.VerifyAccess;
import sun.reflect.Reflection;
import static sun.dyn.MemberName.newIllegalArgumentException;
/**
* <em>CLASS WILL BE REMOVED FOR PFD:</em>
* Static routines for controlling invokedynamic behavior.
* Replaced by non-static APIs.
* @author John Rose, JSR 292 EG
* @deprecated This class will be removed in the Public Final Draft.
*/
public class Linkage {
private static final Access IMPL_TOKEN = Access.getToken();
private Linkage() {} // do not instantiate
/**
* <em>METHOD WILL BE REMOVED FOR PFD:</em>
* Register a <em>bootstrap method</em> to use when linking dynamic call sites within
* a given caller class.
* @deprecated Use @{@link BootstrapMethod} annotations instead.
*/
public static
void registerBootstrapMethod(Class callerClass, MethodHandle bootstrapMethod) {
Class callc = Reflection.getCallerClass(2);
if (callc != null && !VerifyAccess.isSamePackage(callerClass, callc))
throw new IllegalArgumentException("cannot set bootstrap method on "+callerClass);
MethodHandleImpl.registerBootstrap(IMPL_TOKEN, callerClass, bootstrapMethod);
}
/**
* <em>METHOD WILL BE REMOVED FOR PFD:</em>
* Simplified version of {@code registerBootstrapMethod} for self-registration,
* to be called from a static initializer.
* @deprecated Use @{@link BootstrapMethod} annotations instead.
*/
public static
void registerBootstrapMethod(Class<?> runtime, String name) {
Class callerClass = Reflection.getCallerClass(2);
registerBootstrapMethodLookup(callerClass, runtime, name);
}
/**
* <em>METHOD WILL BE REMOVED FOR PFD:</em>
* Simplified version of {@code registerBootstrapMethod} for self-registration,
* @deprecated Use @{@link BootstrapMethod} annotations instead.
*/
public static
void registerBootstrapMethod(String name) {
Class callerClass = Reflection.getCallerClass(2);
registerBootstrapMethodLookup(callerClass, callerClass, name);
}
private static
void registerBootstrapMethodLookup(Class<?> callerClass, Class<?> runtime, String name) {
Lookup lookup = new Lookup(IMPL_TOKEN, callerClass);
MethodHandle bootstrapMethod;
try {
bootstrapMethod = lookup.findStatic(runtime, name, BOOTSTRAP_METHOD_TYPE);
} catch (ReflectiveOperationException ex) {
throw new IllegalArgumentException("no such bootstrap method in "+runtime+": "+name, ex);
}
MethodHandleImpl.registerBootstrap(IMPL_TOKEN, callerClass, bootstrapMethod);
}
private static final MethodType BOOTSTRAP_METHOD_TYPE
= MethodType.methodType(CallSite.class,
Class.class, String.class, MethodType.class);
/**
* <em>METHOD WILL BE REMOVED FOR PFD:</em>
* Invalidate all <code>invokedynamic</code> call sites everywhere.
* @deprecated Use {@linkplain MutableCallSite#setTarget call site target setting},
* {@link MutableCallSite#syncAll call site update pushing},
* and {@link SwitchPoint#guardWithTest target switching} instead.
*/
public static
Object invalidateAll() {
throw new UnsupportedOperationException();
}
/**
* <em>METHOD WILL BE REMOVED FOR PFD:</em>
* Invalidate all {@code invokedynamic} call sites in the bytecodes
* of any methods of the given class.
* @deprecated Use {@linkplain MutableCallSite#setTarget call site target setting},
* {@link MutableCallSite#syncAll call site update pushing},
* and {@link SwitchPoint#guardWithTest target switching} instead.
*/
public static
Object invalidateCallerClass(Class<?> callerClass) {
throw new UnsupportedOperationException();
}
}
src/share/classes/java/dyn/MethodTypeForm.java 已删除 100644 → 0
浏览文件 @ a43c1c0e
/*
* Copyright (c) 2008, 2009, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.dyn;
/**
* TO DO: Temporary shim; remove after refactoring effects are complete in JVM.
* @author John Rose
*/
import sun.dyn.MethodTypeImpl;
class MethodTypeForm extends MethodTypeImpl {
MethodTypeForm(MethodType erasedType) {
super(erasedType);
}
}
src/share/classes/java/dyn/InvokeDynamicBootstrapError.java → src/share/classes/java/lang/BootstrapMethodError.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,58 +23,56 @@ ...@@ -23,58 +23,56 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang;
/** /**
* Thrown to indicate that an {@code invokedynamic} instruction has * Thrown to indicate that an {@code invokedynamic} instruction has
* failed to find its * failed to find its bootstrap method,
* {@linkplain BootstrapMethod bootstrap method}, * or the bootstrap method has failed to provide a
* or the bootstrap method has * {@linkplain java.lang.invoke.CallSite call site} with a {@linkplain java.lang.invoke.CallSite#getTarget target}
* failed to provide a * of the correct {@linkplain java.lang.invoke.MethodHandle#type method type}.
* {@linkplain CallSite call site} with a {@linkplain CallSite#getTarget target}
* of the correct {@linkplain MethodHandle#type method type}.
* *
* @author John Rose, JSR 292 EG * @author John Rose, JSR 292 EG
* @since 1.7 * @since 1.7
*/ */
public class InvokeDynamicBootstrapError extends LinkageError { public class BootstrapMethodError extends LinkageError {
private static final long serialVersionUID = 292L; private static final long serialVersionUID = 292L;
/** /**
* Constructs an {@code InvokeDynamicBootstrapError} with no detail message. * Constructs an {@code BootstrapMethodError} with no detail message.
*/ */
public InvokeDynamicBootstrapError() { public BootstrapMethodError() {
super(); super();
} }
/** /**
* Constructs an {@code InvokeDynamicBootstrapError} with the specified * Constructs an {@code BootstrapMethodError} with the specified
* detail message. * detail message.
* *
* @param s the detail message. * @param s the detail message.
*/ */
public InvokeDynamicBootstrapError(String s) { public BootstrapMethodError(String s) {
super(s); super(s);
} }
/** /**
* Constructs a {@code InvokeDynamicBootstrapError} with the specified * Constructs a {@code BootstrapMethodError} with the specified
* detail message and cause. * detail message and cause.
* *
* @param s the detail message. * @param s the detail message.
* @param cause the cause, may be {@code null}. * @param cause the cause, may be {@code null}.
*/ */
public InvokeDynamicBootstrapError(String s, Throwable cause) { public BootstrapMethodError(String s, Throwable cause) {
super(s, cause); super(s, cause);
} }
/** /**
* Constructs a {@code InvokeDynamicBootstrapError} with the specified * Constructs a {@code BootstrapMethodError} with the specified
* cause. * cause.
* *
* @param cause the cause, may be {@code null}. * @param cause the cause, may be {@code null}.
*/ */
public InvokeDynamicBootstrapError(Throwable cause) { public BootstrapMethodError(Throwable cause) {
// cf. Throwable(Throwable cause) constructor. // cf. Throwable(Throwable cause) constructor.
super(cause == null ? null : cause.toString()); super(cause == null ? null : cause.toString());
initCause(cause); initCause(cause);
......
src/share/classes/java/dyn/ClassValue.java → src/share/classes/java/lang/ClassValue.java
浏览文件 @ 33ee9ccf
...@@ -23,12 +23,10 @@ ...@@ -23,12 +23,10 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.lang.reflect.UndeclaredThrowableException;
/** /**
* Lazily associate a computed value with (potentially) every type. * Lazily associate a computed value with (potentially) every type.
...@@ -37,10 +35,11 @@ import java.lang.reflect.UndeclaredThrowableException; ...@@ -37,10 +35,11 @@ import java.lang.reflect.UndeclaredThrowableException;
* it can use a {@code ClassValue} to cache information needed to * it can use a {@code ClassValue} to cache information needed to
* perform the message send quickly, for each class encountered. * perform the message send quickly, for each class encountered.
* @author John Rose, JSR 292 EG * @author John Rose, JSR 292 EG
* @since 1.7
*/ */
public abstract class ClassValue<T> { public abstract class ClassValue<T> {
/** /**
* Compute the given class's derived value for this {@code ClassValue}. * Computes the given class's derived value for this {@code ClassValue}.
* <p> * <p>
* This method will be invoked within the first thread that accesses * This method will be invoked within the first thread that accesses
* the value with the {@link #get get} method. * the value with the {@link #get get} method.
...@@ -159,13 +158,7 @@ public abstract class ClassValue<T> { ...@@ -159,13 +158,7 @@ public abstract class ClassValue<T> {
} }
/// Implementation... /// Implementation...
// FIXME: Use a data structure here similar that of ThreadLocal (7030453).
// The hash code for this type is based on the identity of the object,
// and is well-dispersed for power-of-two tables.
/** @deprecated This override, which is implementation-specific, will be removed for PFD. */
public final int hashCode() { return hashCode; }
private final int hashCode = HASH_CODES.getAndAdd(0x61c88647);
private static final AtomicInteger HASH_CODES = new AtomicInteger();
private static final AtomicInteger STORE_BARRIER = new AtomicInteger(); private static final AtomicInteger STORE_BARRIER = new AtomicInteger();
......
src/share/classes/sun/dyn/BoundMethodHandle.java → src/share/classes/java/lang/invoke/BoundMethodHandle.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,15 +23,11 @@ ...@@ -23,15 +23,11 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import sun.dyn.util.VerifyType; import sun.invoke.util.VerifyType;
import sun.dyn.util.Wrapper; import sun.invoke.util.Wrapper;
import java.dyn.*; import static java.lang.invoke.MethodHandleStatics.*;
import java.util.List;
import sun.dyn.MethodHandleNatives.Constants;
import static sun.dyn.MethodHandleImpl.IMPL_LOOKUP;
import static sun.dyn.MemberName.newIllegalArgumentException;
/** /**
* The flavor of method handle which emulates an invoke instruction * The flavor of method handle which emulates an invoke instruction
...@@ -39,37 +35,29 @@ import static sun.dyn.MemberName.newIllegalArgumentException; ...@@ -39,37 +35,29 @@ import static sun.dyn.MemberName.newIllegalArgumentException;
* when the handle is created, not when it is invoked. * when the handle is created, not when it is invoked.
* @author jrose * @author jrose
*/ */
public class BoundMethodHandle extends MethodHandle { class BoundMethodHandle extends MethodHandle {
//MethodHandle vmtarget; // next BMH or final DMH or methodOop //MethodHandle vmtarget; // next BMH or final DMH or methodOop
private final Object argument; // argument to insert private final Object argument; // argument to insert
private final int vmargslot; // position at which it is inserted private final int vmargslot; // position at which it is inserted
private static final Access IMPL_TOKEN = Access.getToken();
private static final MemberName.Factory IMPL_NAMES = MemberName.getFactory(IMPL_TOKEN);
// Constructors in this class *must* be package scoped or private. // Constructors in this class *must* be package scoped or private.
/** Bind a direct MH to its receiver (or first ref. argument). /** Bind a direct MH to its receiver (or first ref. argument).
* The JVM will pre-dispatch the MH if it is not already static. * The JVM will pre-dispatch the MH if it is not already static.
*/ */
BoundMethodHandle(DirectMethodHandle mh, Object argument) { /*non-public*/ BoundMethodHandle(DirectMethodHandle mh, Object argument) {
super(Access.TOKEN, mh.type().dropParameterTypes(0, 1)); super(mh.type().dropParameterTypes(0, 1));
// check the type now, once for all: // check the type now, once for all:
this.argument = checkReferenceArgument(argument, mh, 0); this.argument = checkReferenceArgument(argument, mh, 0);
this.vmargslot = this.type().parameterSlotCount(); this.vmargslot = this.type().parameterSlotCount();
if (MethodHandleNatives.JVM_SUPPORT) { initTarget(mh, 0);
this.vmtarget = null; // maybe updated by JVM
MethodHandleNatives.init(this, mh, 0);
} else {
this.vmtarget = mh;
}
} }
/** Insert an argument into an arbitrary method handle. /** Insert an argument into an arbitrary method handle.
* If argnum is zero, inserts the first argument, etc. * If argnum is zero, inserts the first argument, etc.
* The argument type must be a reference. * The argument type must be a reference.
*/ */
BoundMethodHandle(MethodHandle mh, Object argument, int argnum) { /*non-public*/ BoundMethodHandle(MethodHandle mh, Object argument, int argnum) {
this(mh.type().dropParameterTypes(argnum, argnum+1), this(mh.type().dropParameterTypes(argnum, argnum+1),
mh, argument, argnum); mh, argument, argnum);
} }
...@@ -77,8 +65,8 @@ public class BoundMethodHandle extends MethodHandle { ...@@ -77,8 +65,8 @@ public class BoundMethodHandle extends MethodHandle {
/** Insert an argument into an arbitrary method handle. /** Insert an argument into an arbitrary method handle.
* If argnum is zero, inserts the first argument, etc. * If argnum is zero, inserts the first argument, etc.
*/ */
BoundMethodHandle(MethodType type, MethodHandle mh, Object argument, int argnum) { /*non-public*/ BoundMethodHandle(MethodType type, MethodHandle mh, Object argument, int argnum) {
super(Access.TOKEN, type); super(type);
if (mh.type().parameterType(argnum).isPrimitive()) if (mh.type().parameterType(argnum).isPrimitive())
this.argument = bindPrimitiveArgument(argument, mh, argnum); this.argument = bindPrimitiveArgument(argument, mh, argnum);
else { else {
...@@ -89,18 +77,14 @@ public class BoundMethodHandle extends MethodHandle { ...@@ -89,18 +77,14 @@ public class BoundMethodHandle extends MethodHandle {
} }
private void initTarget(MethodHandle mh, int argnum) { private void initTarget(MethodHandle mh, int argnum) {
if (MethodHandleNatives.JVM_SUPPORT) { //this.vmtarget = mh; // maybe updated by JVM
this.vmtarget = null; // maybe updated by JVM
MethodHandleNatives.init(this, mh, argnum); MethodHandleNatives.init(this, mh, argnum);
} else {
this.vmtarget = mh;
}
} }
/** For the AdapterMethodHandle subclass. /** For the AdapterMethodHandle subclass.
*/ */
BoundMethodHandle(MethodType type, Object argument, int vmargslot) { /*non-public*/ BoundMethodHandle(MethodType type, Object argument, int vmargslot) {
super(Access.TOKEN, type); super(type);
this.argument = argument; this.argument = argument;
this.vmargslot = vmargslot; this.vmargslot = vmargslot;
assert(this instanceof AdapterMethodHandle); assert(this instanceof AdapterMethodHandle);
...@@ -112,8 +96,8 @@ public class BoundMethodHandle extends MethodHandle { ...@@ -112,8 +96,8 @@ public class BoundMethodHandle extends MethodHandle {
* same as {@code entryPoint}, except that the first argument * same as {@code entryPoint}, except that the first argument
* type will be dropped. * type will be dropped.
*/ */
protected BoundMethodHandle(Access token, MethodHandle entryPoint) { /*non-public*/ BoundMethodHandle(MethodHandle entryPoint) {
super(token, entryPoint.type().dropParameterTypes(0, 1)); super(entryPoint.type().dropParameterTypes(0, 1));
this.argument = this; // kludge; get rid of this.argument = this; // kludge; get rid of
this.vmargslot = this.type().parameterSlotDepth(0); this.vmargslot = this.type().parameterSlotDepth(0);
initTarget(entryPoint, 0); initTarget(entryPoint, 0);
...@@ -172,7 +156,7 @@ public class BoundMethodHandle extends MethodHandle { ...@@ -172,7 +156,7 @@ public class BoundMethodHandle extends MethodHandle {
@Override @Override
public String toString() { public String toString() {
return MethodHandleImpl.addTypeString(baseName(), this); return addTypeString(baseName(), this);
} }
/** Component of toString() before the type string. */ /** Component of toString() before the type string. */
......
src/share/classes/java/dyn/CallSite.java → src/share/classes/java/lang/invoke/CallSite.java
浏览文件 @ 33ee9ccf
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
import sun.dyn.*; import sun.invoke.empty.Empty;
import sun.dyn.empty.Empty;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import java.util.Collection; import static java.lang.invoke.MethodHandleStatics.*;
import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* A {@code CallSite} is a holder for a variable {@link MethodHandle}, * A {@code CallSite} is a holder for a variable {@link MethodHandle},
...@@ -85,7 +85,6 @@ private static CallSite bootstrapDynamic(MethodHandles.Lookup caller, String nam ...@@ -85,7 +85,6 @@ private static CallSite bootstrapDynamic(MethodHandles.Lookup caller, String nam
*/ */
abstract abstract
public class CallSite { public class CallSite {
private static final Access IMPL_TOKEN = Access.getToken();
static { MethodHandleImpl.initStatics(); } static { MethodHandleImpl.initStatics(); }
// Fields used only by the JVM. Do not use or change. // Fields used only by the JVM. Do not use or change.
...@@ -96,9 +95,6 @@ public class CallSite { ...@@ -96,9 +95,6 @@ public class CallSite {
/*package-private*/ /*package-private*/
MethodHandle target; MethodHandle target;
// Remove this field for PFD and delete deprecated methods:
private MemberName calleeNameRemoveForPFD;
/** /**
* Make a blank call site object with the given method type. * Make a blank call site object with the given method type.
* An initial target method is supplied which will throw * An initial target method is supplied which will throw
...@@ -111,7 +107,7 @@ public class CallSite { ...@@ -111,7 +107,7 @@ public class CallSite {
*/ */
/*package-private*/ /*package-private*/
CallSite(MethodType type) { CallSite(MethodType type) {
target = MethodHandles.invokers(type).uninitializedCallSite(); target = type.invokers().uninitializedCallSite();
} }
/** /**
...@@ -145,7 +141,7 @@ public class CallSite { ...@@ -145,7 +141,7 @@ public class CallSite {
int callerBCI) { int callerBCI) {
if (this.vmmethod != null) { if (this.vmmethod != null) {
// FIXME // FIXME
throw new InvokeDynamicBootstrapError("call site has already been linked to an invokedynamic instruction"); throw new BootstrapMethodError("call site has already been linked to an invokedynamic instruction");
} }
if (!this.type().equals(type)) { if (!this.type().equals(type)) {
throw wrongTargetType(target, type); throw wrongTargetType(target, type);
...@@ -202,7 +198,7 @@ public class CallSite { ...@@ -202,7 +198,7 @@ public class CallSite {
} }
/** /**
* Produce a method handle equivalent to an invokedynamic instruction * Produces a method handle equivalent to an invokedynamic instruction
* which has been linked to this call site. * which has been linked to this call site.
* <p> * <p>
* This method is equivalent to the following code: * This method is equivalent to the following code:
...@@ -218,7 +214,7 @@ public class CallSite { ...@@ -218,7 +214,7 @@ public class CallSite {
public abstract MethodHandle dynamicInvoker(); public abstract MethodHandle dynamicInvoker();
/*non-public*/ MethodHandle makeDynamicInvoker() { /*non-public*/ MethodHandle makeDynamicInvoker() {
MethodHandle getTarget = MethodHandleImpl.bindReceiver(IMPL_TOKEN, GET_TARGET, this); MethodHandle getTarget = MethodHandleImpl.bindReceiver(GET_TARGET, this);
MethodHandle invoker = MethodHandles.exactInvoker(this.type()); MethodHandle invoker = MethodHandles.exactInvoker(this.type());
return MethodHandles.foldArguments(invoker, getTarget); return MethodHandles.foldArguments(invoker, getTarget);
} }
...@@ -226,7 +222,7 @@ public class CallSite { ...@@ -226,7 +222,7 @@ public class CallSite {
private static final MethodHandle GET_TARGET; private static final MethodHandle GET_TARGET;
static { static {
try { try {
GET_TARGET = MethodHandles.Lookup.IMPL_LOOKUP. GET_TARGET = IMPL_LOOKUP.
findVirtual(CallSite.class, "getTarget", MethodType.methodType(MethodHandle.class)); findVirtual(CallSite.class, "getTarget", MethodType.methodType(MethodHandle.class));
} catch (ReflectiveOperationException ignore) { } catch (ReflectiveOperationException ignore) {
throw new InternalError(); throw new InternalError();
...@@ -252,7 +248,6 @@ public class CallSite { ...@@ -252,7 +248,6 @@ public class CallSite {
/*package-private*/ /*package-private*/
void setTargetNormal(MethodHandle newTarget) { void setTargetNormal(MethodHandle newTarget) {
target = newTarget; target = newTarget;
//CallSiteImpl.setCallSiteTarget(IMPL_TOKEN, this, newTarget);
} }
/*package-private*/ /*package-private*/
MethodHandle getTargetVolatile() { MethodHandle getTargetVolatile() {
...@@ -261,6 +256,68 @@ public class CallSite { ...@@ -261,6 +256,68 @@ public class CallSite {
/*package-private*/ /*package-private*/
void setTargetVolatile(MethodHandle newTarget) { void setTargetVolatile(MethodHandle newTarget) {
unsafe.putObjectVolatile(this, TARGET_OFFSET, newTarget); unsafe.putObjectVolatile(this, TARGET_OFFSET, newTarget);
//CallSiteImpl.setCallSiteTarget(IMPL_TOKEN, this, newTarget); }
// this implements the upcall from the JVM, MethodHandleNatives.makeDynamicCallSite:
static CallSite makeSite(MethodHandle bootstrapMethod,
// Callee information:
String name, MethodType type,
// Extra arguments for BSM, if any:
Object info,
// Caller information:
MemberName callerMethod, int callerBCI) {
Class<?> callerClass = callerMethod.getDeclaringClass();
Object caller = IMPL_LOOKUP.in(callerClass);
CallSite site;
try {
Object binding;
info = maybeReBox(info);
if (info == null) {
binding = bootstrapMethod.invokeGeneric(caller, name, type);
} else if (!info.getClass().isArray()) {
binding = bootstrapMethod.invokeGeneric(caller, name, type, info);
} else {
Object[] argv = (Object[]) info;
maybeReBoxElements(argv);
if (3 + argv.length > 255)
throw new BootstrapMethodError("too many bootstrap method arguments");
MethodType bsmType = bootstrapMethod.type();
if (bsmType.parameterCount() == 4 && bsmType.parameterType(3) == Object[].class)
binding = bootstrapMethod.invokeGeneric(caller, name, type, argv);
else
binding = MethodHandles.spreadInvoker(bsmType, 3)
.invokeGeneric(bootstrapMethod, caller, name, type, argv);
}
//System.out.println("BSM for "+name+type+" => "+binding);
if (binding instanceof CallSite) {
site = (CallSite) binding;
} else {
throw new ClassCastException("bootstrap method failed to produce a CallSite");
}
assert(site.getTarget() != null);
assert(site.getTarget().type().equals(type));
} catch (Throwable ex) {
BootstrapMethodError bex;
if (ex instanceof BootstrapMethodError)
bex = (BootstrapMethodError) ex;
else
bex = new BootstrapMethodError("call site initialization exception", ex);
throw bex;
}
return site;
}
private static Object maybeReBox(Object x) {
if (x instanceof Integer) {
int xi = (int) x;
if (xi == (byte) xi)
x = xi; // must rebox; see JLS 5.1.7
}
return x;
}
private static void maybeReBoxElements(Object[] xa) {
for (int i = 0; i < xa.length; i++) {
xa[i] = maybeReBox(xa[i]);
}
} }
} }
src/share/classes/java/dyn/ConstantCallSite.java → src/share/classes/java/lang/invoke/ConstantCallSite.java
浏览文件 @ 33ee9ccf
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
/** /**
* A {@code ConstantCallSite} is a {@link CallSite} whose target is permanent, and can never be changed. * A {@code ConstantCallSite} is a {@link CallSite} whose target is permanent, and can never be changed.
......
src/share/classes/sun/dyn/DirectMethodHandle.java → src/share/classes/java/lang/invoke/DirectMethodHandle.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import static java.lang.invoke.MethodHandleNatives.Constants.*;
import static sun.dyn.MethodHandleNatives.Constants.*;
/** /**
* The flavor of method handle which emulates invokespecial or invokestatic. * The flavor of method handle which emulates invokespecial or invokestatic.
...@@ -39,7 +38,7 @@ class DirectMethodHandle extends MethodHandle { ...@@ -39,7 +38,7 @@ class DirectMethodHandle extends MethodHandle {
// Constructors in this class *must* be package scoped or private. // Constructors in this class *must* be package scoped or private.
DirectMethodHandle(MethodType mtype, MemberName m, boolean doDispatch, Class<?> lookupClass) { DirectMethodHandle(MethodType mtype, MemberName m, boolean doDispatch, Class<?> lookupClass) {
super(Access.TOKEN, mtype); super(mtype);
assert(m.isMethod() || !doDispatch && m.isConstructor()); assert(m.isMethod() || !doDispatch && m.isConstructor());
if (!m.isResolved()) if (!m.isResolved())
......
src/share/classes/sun/dyn/FilterGeneric.java → src/share/classes/java/lang/invoke/FilterGeneric.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*;
import java.lang.reflect.*; import java.lang.reflect.*;
import static sun.dyn.MemberName.newIllegalArgumentException; import static java.lang.invoke.MethodHandleStatics.*;
import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* These adapters apply arbitrary conversions to arguments * These adapters apply arbitrary conversions to arguments
...@@ -123,7 +123,7 @@ class FilterGeneric { ...@@ -123,7 +123,7 @@ class FilterGeneric {
MethodType entryType = entryType(kind, pos, filterType, targetType); MethodType entryType = entryType(kind, pos, filterType, targetType);
if (entryType.generic() != entryType) if (entryType.generic() != entryType)
throw newIllegalArgumentException("must be generic: "+entryType); throw newIllegalArgumentException("must be generic: "+entryType);
MethodTypeImpl form = MethodTypeImpl.of(entryType); MethodTypeForm form = entryType.form();
FilterGeneric filterGen = form.filterGeneric; FilterGeneric filterGen = form.filterGeneric;
if (filterGen == null) if (filterGen == null)
form.filterGeneric = filterGen = new FilterGeneric(entryType); form.filterGeneric = filterGen = new FilterGeneric(entryType);
...@@ -186,7 +186,7 @@ class FilterGeneric { ...@@ -186,7 +186,7 @@ class FilterGeneric {
// see if it has the required invoke method // see if it has the required invoke method
MethodHandle entryPoint = null; MethodHandle entryPoint = null;
try { try {
entryPoint = MethodHandleImpl.IMPL_LOOKUP.findSpecial(acls, iname, entryType, acls); entryPoint = IMPL_LOOKUP.findSpecial(acls, iname, entryType, acls);
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
} }
if (entryPoint == null) continue; if (entryPoint == null) continue;
...@@ -231,7 +231,7 @@ class FilterGeneric { ...@@ -231,7 +231,7 @@ class FilterGeneric {
@Override @Override
public String toString() { public String toString() {
return MethodHandleImpl.addTypeString(target, this); return addTypeString(target, this);
} }
protected boolean isPrototype() { return target == null; } protected boolean isPrototype() { return target == null; }
...@@ -246,7 +246,7 @@ class FilterGeneric { ...@@ -246,7 +246,7 @@ class FilterGeneric {
protected Adapter(MethodHandle entryPoint, protected Adapter(MethodHandle entryPoint,
MethodHandle filter, MethodHandle target) { MethodHandle filter, MethodHandle target) {
super(Access.TOKEN, entryPoint); super(entryPoint);
this.filter = filter; this.filter = filter;
this.target = target; this.target = target;
} }
...@@ -256,7 +256,7 @@ class FilterGeneric { ...@@ -256,7 +256,7 @@ class FilterGeneric {
MethodHandle filter, MethodHandle target); MethodHandle filter, MethodHandle target);
// { return new ThisType(entryPoint, filter, target); } // { return new ThisType(entryPoint, filter, target); }
static private final String CLASS_PREFIX; // "sun.dyn.FilterGeneric$" static private final String CLASS_PREFIX; // "java.lang.invoke.FilterGeneric$"
static { static {
String aname = Adapter.class.getName(); String aname = Adapter.class.getName();
String sname = Adapter.class.getSimpleName(); String sname = Adapter.class.getSimpleName();
......
src/share/classes/sun/dyn/FilterOneArgument.java → src/share/classes/java/lang/invoke/FilterOneArgument.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import static java.lang.invoke.MethodHandleStatics.*;
import static sun.dyn.MemberName.uncaughtException; import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* Unary function composition, useful for many small plumbing jobs. * Unary function composition, useful for many small plumbing jobs.
...@@ -36,7 +36,7 @@ import static sun.dyn.MemberName.uncaughtException; ...@@ -36,7 +36,7 @@ import static sun.dyn.MemberName.uncaughtException;
* final method type is the responsibility of a JVM-level adapter. * final method type is the responsibility of a JVM-level adapter.
* @author jrose * @author jrose
*/ */
public class FilterOneArgument extends BoundMethodHandle { class FilterOneArgument extends BoundMethodHandle {
protected final MethodHandle filter; // Object -> Object protected final MethodHandle filter; // Object -> Object
protected final MethodHandle target; // Object -> Object protected final MethodHandle target; // Object -> Object
...@@ -54,7 +54,7 @@ public class FilterOneArgument extends BoundMethodHandle { ...@@ -54,7 +54,7 @@ public class FilterOneArgument extends BoundMethodHandle {
static { static {
try { try {
INVOKE = INVOKE =
MethodHandleImpl.IMPL_LOOKUP.findVirtual(FilterOneArgument.class, "invoke", IMPL_LOOKUP.findVirtual(FilterOneArgument.class, "invoke",
MethodType.genericMethodType(1)); MethodType.genericMethodType(1));
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
throw uncaughtException(ex); throw uncaughtException(ex);
...@@ -62,7 +62,7 @@ public class FilterOneArgument extends BoundMethodHandle { ...@@ -62,7 +62,7 @@ public class FilterOneArgument extends BoundMethodHandle {
} }
protected FilterOneArgument(MethodHandle filter, MethodHandle target) { protected FilterOneArgument(MethodHandle filter, MethodHandle target) {
super(Access.TOKEN, INVOKE); super(INVOKE);
this.filter = filter; this.filter = filter;
this.target = target; this.target = target;
} }
......
src/share/classes/sun/dyn/FromGeneric.java → src/share/classes/java/lang/invoke/FromGeneric.java
浏览文件 @ 33ee9ccf
...@@ -23,12 +23,13 @@ ...@@ -23,12 +23,13 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import sun.invoke.util.ValueConversions;
import sun.invoke.util.Wrapper;
import java.lang.reflect.*; import java.lang.reflect.*;
import sun.dyn.util.*; import static java.lang.invoke.MethodHandleStatics.*;
import static sun.dyn.MethodTypeImpl.invokers; import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* Adapters which mediate between incoming calls which are generic * Adapters which mediate between incoming calls which are generic
...@@ -82,8 +83,8 @@ class FromGeneric { ...@@ -82,8 +83,8 @@ class FromGeneric {
} }
// outgoing primitive arguments will be wrapped; unwrap them // outgoing primitive arguments will be wrapped; unwrap them
MethodType primsAsObj = MethodTypeImpl.of(targetType).primArgsAsBoxes(); MethodType primsAsObj = targetType.form().primArgsAsBoxes();
MethodType objArgsRawRet = MethodTypeImpl.of(primsAsObj).primsAsInts(); MethodType objArgsRawRet = primsAsObj.form().primsAsInts();
if (objArgsRawRet != targetType) if (objArgsRawRet != targetType)
ad = findAdapter(internalType0 = objArgsRawRet); ad = findAdapter(internalType0 = objArgsRawRet);
if (ad == null) { if (ad == null) {
...@@ -129,16 +130,16 @@ class FromGeneric { ...@@ -129,16 +130,16 @@ class FromGeneric {
MethodType targetType, MethodType internalType) { MethodType targetType, MethodType internalType) {
// All the adapters we have here have reference-untyped internal calls. // All the adapters we have here have reference-untyped internal calls.
assert(internalType == internalType.erase()); assert(internalType == internalType.erase());
MethodHandle invoker = invokers(targetType).exactInvoker(); MethodHandle invoker = targetType.invokers().exactInvoker();
// cast all narrow reference types, unbox all primitive arguments: // cast all narrow reference types, unbox all primitive arguments:
MethodType fixArgsType = internalType.changeReturnType(targetType.returnType()); MethodType fixArgsType = internalType.changeReturnType(targetType.returnType());
MethodHandle fixArgs = AdapterMethodHandle.convertArguments(Access.TOKEN, MethodHandle fixArgs = MethodHandleImpl.convertArguments(
invoker, Invokers.invokerType(fixArgsType), invoker, Invokers.invokerType(fixArgsType),
invoker.type(), null); invoker.type(), null);
if (fixArgs == null) if (fixArgs == null)
throw new InternalError("bad fixArgs"); throw new InternalError("bad fixArgs");
// reinterpret the calling sequence as raw: // reinterpret the calling sequence as raw:
MethodHandle retyper = AdapterMethodHandle.makeRetypeRaw(Access.TOKEN, MethodHandle retyper = AdapterMethodHandle.makeRetypeRaw(
Invokers.invokerType(internalType), fixArgs); Invokers.invokerType(internalType), fixArgs);
if (retyper == null) if (retyper == null)
throw new InternalError("bad retyper"); throw new InternalError("bad retyper");
...@@ -171,7 +172,7 @@ class FromGeneric { ...@@ -171,7 +172,7 @@ class FromGeneric {
/** Return the adapter information for this type's erasure. */ /** Return the adapter information for this type's erasure. */
static FromGeneric of(MethodType type) { static FromGeneric of(MethodType type) {
MethodTypeImpl form = MethodTypeImpl.of(type); MethodTypeForm form = type.form();
FromGeneric fromGen = form.fromGeneric; FromGeneric fromGen = form.fromGeneric;
if (fromGen == null) if (fromGen == null)
form.fromGeneric = fromGen = new FromGeneric(form.erasedType()); form.fromGeneric = fromGen = new FromGeneric(form.erasedType());
...@@ -185,7 +186,7 @@ class FromGeneric { ...@@ -185,7 +186,7 @@ class FromGeneric {
/* Create an adapter that handles spreading calls for the given type. */ /* Create an adapter that handles spreading calls for the given type. */
static Adapter findAdapter(MethodType internalType) { static Adapter findAdapter(MethodType internalType) {
MethodType entryType = internalType.generic(); MethodType entryType = internalType.generic();
MethodTypeImpl form = MethodTypeImpl.of(internalType); MethodTypeForm form = internalType.form();
Class<?> rtype = internalType.returnType(); Class<?> rtype = internalType.returnType();
int argc = form.parameterCount(); int argc = form.parameterCount();
int lac = form.longPrimitiveParameterCount(); int lac = form.longPrimitiveParameterCount();
...@@ -203,7 +204,7 @@ class FromGeneric { ...@@ -203,7 +204,7 @@ class FromGeneric {
// see if it has the required invoke method // see if it has the required invoke method
MethodHandle entryPoint = null; MethodHandle entryPoint = null;
try { try {
entryPoint = MethodHandleImpl.IMPL_LOOKUP.findSpecial(acls, iname, entryType, acls); entryPoint = IMPL_LOOKUP.findSpecial(acls, iname, entryType, acls);
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
} }
if (entryPoint == null) continue; if (entryPoint == null) continue;
...@@ -257,7 +258,7 @@ class FromGeneric { ...@@ -257,7 +258,7 @@ class FromGeneric {
@Override @Override
public String toString() { public String toString() {
return MethodHandleImpl.addTypeString(target, this); return addTypeString(target, this);
} }
protected boolean isPrototype() { return target == null; } protected boolean isPrototype() { return target == null; }
...@@ -272,7 +273,7 @@ class FromGeneric { ...@@ -272,7 +273,7 @@ class FromGeneric {
protected Adapter(MethodHandle entryPoint, protected Adapter(MethodHandle entryPoint,
MethodHandle invoker, MethodHandle convert, MethodHandle target) { MethodHandle invoker, MethodHandle convert, MethodHandle target) {
super(Access.TOKEN, entryPoint); super(entryPoint);
this.invoker = invoker; this.invoker = invoker;
this.convert = convert; this.convert = convert;
this.target = target; this.target = target;
...@@ -290,7 +291,7 @@ class FromGeneric { ...@@ -290,7 +291,7 @@ class FromGeneric {
protected Object convert_F(float result) throws Throwable { return convert.invokeExact(result); } protected Object convert_F(float result) throws Throwable { return convert.invokeExact(result); }
protected Object convert_D(double result) throws Throwable { return convert.invokeExact(result); } protected Object convert_D(double result) throws Throwable { return convert.invokeExact(result); }
static private final String CLASS_PREFIX; // "sun.dyn.FromGeneric$" static private final String CLASS_PREFIX; // "java.lang.invoke.FromGeneric$"
static { static {
String aname = Adapter.class.getName(); String aname = Adapter.class.getName();
String sname = Adapter.class.getSimpleName(); String sname = Adapter.class.getSimpleName();
......
src/share/classes/java/dyn/InvokeDynamic.java → src/share/classes/java/lang/invoke/InvokeDynamic.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
/** /**
* This is a place-holder class. Some HotSpot implementations need to see it. * This is a place-holder class. Some HotSpot implementations need to see it.
......
src/share/classes/sun/dyn/InvokeGeneric.java → src/share/classes/java/lang/invoke/InvokeGeneric.java
浏览文件 @ 33ee9ccf
...@@ -23,15 +23,13 @@ ...@@ -23,15 +23,13 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import sun.invoke.util.*;
import java.lang.reflect.*; import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
import sun.dyn.util.*;
import static sun.dyn.MethodTypeImpl.invokers;
/** /**
* Adapters which manage MethodHanndle.invokeGeneric calls. * Adapters which manage MethodHandle.invokeGeneric calls.
* The JVM calls one of these when the exact type match fails. * The JVM calls one of these when the exact type match fails.
* @author jrose * @author jrose
*/ */
...@@ -44,7 +42,8 @@ class InvokeGeneric { ...@@ -44,7 +42,8 @@ class InvokeGeneric {
/** Compute and cache information for this adapter, so that it can /** Compute and cache information for this adapter, so that it can
* call out to targets of the erasure-family of the given erased type. * call out to targets of the erasure-family of the given erased type.
*/ */
private InvokeGeneric(MethodType erasedCallerType) throws ReflectiveOperationException { /*non-public*/ InvokeGeneric(MethodType erasedCallerType) throws ReflectiveOperationException {
assert(erasedCallerType.equals(erasedCallerType.erase()));
this.erasedCallerType = erasedCallerType; this.erasedCallerType = erasedCallerType;
this.initialInvoker = makeInitialInvoker(); this.initialInvoker = makeInitialInvoker();
assert initialInvoker.type().equals(erasedCallerType assert initialInvoker.type().equals(erasedCallerType
...@@ -53,22 +52,13 @@ class InvokeGeneric { ...@@ -53,22 +52,13 @@ class InvokeGeneric {
} }
private static MethodHandles.Lookup lookup() { private static MethodHandles.Lookup lookup() {
return MethodHandleImpl.IMPL_LOOKUP; return IMPL_LOOKUP;
} }
/** Return the adapter information for this type's erasure. */ /** Return the adapter information for this type's erasure. */
static MethodHandle genericInvokerOf(MethodType type) { /*non-public*/ static MethodHandle genericInvokerOf(MethodType erasedCallerType) throws ReflectiveOperationException {
MethodTypeImpl form = MethodTypeImpl.of(type); InvokeGeneric gen = new InvokeGeneric(erasedCallerType);
MethodHandle genericInvoker = form.genericInvoker; return gen.initialInvoker;
if (genericInvoker == null) {
try {
InvokeGeneric gen = new InvokeGeneric(form.erasedType());
form.genericInvoker = genericInvoker = gen.initialInvoker;
} catch (ReflectiveOperationException ex) {
throw new RuntimeException(ex);
}
}
return genericInvoker;
} }
private MethodHandle makeInitialInvoker() throws ReflectiveOperationException { private MethodHandle makeInitialInvoker() throws ReflectiveOperationException {
...@@ -88,7 +78,7 @@ class InvokeGeneric { ...@@ -88,7 +78,7 @@ class InvokeGeneric {
private MethodHandle makePostDispatchInvoker() { private MethodHandle makePostDispatchInvoker() {
// Take (MH'; MT, MH; A...) and run MH'(MT, MH; A...). // Take (MH'; MT, MH; A...) and run MH'(MT, MH; A...).
MethodType invokerType = erasedCallerType.insertParameterTypes(0, EXTRA_ARGS); MethodType invokerType = erasedCallerType.insertParameterTypes(0, EXTRA_ARGS);
return invokers(invokerType).exactInvoker(); return invokerType.invokers().exactInvoker();
} }
private MethodHandle dropDispatchArguments(MethodHandle targetInvoker) { private MethodHandle dropDispatchArguments(MethodHandle targetInvoker) {
assert(targetInvoker.type().parameterType(0) == MethodHandle.class); assert(targetInvoker.type().parameterType(0) == MethodHandle.class);
...@@ -112,7 +102,7 @@ class InvokeGeneric { ...@@ -112,7 +102,7 @@ class InvokeGeneric {
if (USE_AS_TYPE_PATH || target.isVarargsCollector()) { if (USE_AS_TYPE_PATH || target.isVarargsCollector()) {
MethodHandle newTarget = target.asType(callerType); MethodHandle newTarget = target.asType(callerType);
targetType = callerType; targetType = callerType;
Invokers invokers = MethodTypeImpl.invokers(Access.TOKEN, targetType); Invokers invokers = targetType.invokers();
MethodHandle invoker = invokers.erasedInvokerWithDrops; MethodHandle invoker = invokers.erasedInvokerWithDrops;
if (invoker == null) { if (invoker == null) {
invokers.erasedInvokerWithDrops = invoker = invokers.erasedInvokerWithDrops = invoker =
......
src/share/classes/sun/dyn/Invokers.java → src/share/classes/java/lang/invoke/Invokers.java
浏览文件 @ 33ee9ccf
...@@ -23,16 +23,16 @@ ...@@ -23,16 +23,16 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import sun.invoke.empty.Empty;
import sun.dyn.empty.Empty; import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* Construction and caching of often-used invokers. * Construction and caching of often-used invokers.
* @author jrose * @author jrose
*/ */
public class Invokers { class Invokers {
// exact type (sans leading taget MH) for the outgoing call // exact type (sans leading taget MH) for the outgoing call
private final MethodType targetType; private final MethodType targetType;
...@@ -60,15 +60,15 @@ public class Invokers { ...@@ -60,15 +60,15 @@ public class Invokers {
this.spreadInvokers = new MethodHandle[targetType.parameterCount()+1]; this.spreadInvokers = new MethodHandle[targetType.parameterCount()+1];
} }
public static MethodType invokerType(MethodType targetType) { /*non-public*/ static MethodType invokerType(MethodType targetType) {
return targetType.insertParameterTypes(0, MethodHandle.class); return targetType.insertParameterTypes(0, MethodHandle.class);
} }
public MethodHandle exactInvoker() { /*non-public*/ MethodHandle exactInvoker() {
MethodHandle invoker = exactInvoker; MethodHandle invoker = exactInvoker;
if (invoker != null) return invoker; if (invoker != null) return invoker;
try { try {
invoker = MethodHandleImpl.IMPL_LOOKUP.findVirtual(MethodHandle.class, "invokeExact", targetType); invoker = IMPL_LOOKUP.findVirtual(MethodHandle.class, "invokeExact", targetType);
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
throw new InternalError("JVM cannot find invoker for "+targetType); throw new InternalError("JVM cannot find invoker for "+targetType);
} }
...@@ -77,7 +77,7 @@ public class Invokers { ...@@ -77,7 +77,7 @@ public class Invokers {
return invoker; return invoker;
} }
public MethodHandle genericInvoker() { /*non-public*/ MethodHandle genericInvoker() {
MethodHandle invoker1 = exactInvoker(); MethodHandle invoker1 = exactInvoker();
MethodHandle invoker = genericInvoker; MethodHandle invoker = genericInvoker;
if (invoker != null) return invoker; if (invoker != null) return invoker;
...@@ -87,7 +87,7 @@ public class Invokers { ...@@ -87,7 +87,7 @@ public class Invokers {
return invoker; return invoker;
} }
public MethodHandle erasedInvoker() { /*non-public*/ MethodHandle erasedInvoker() {
MethodHandle invoker1 = exactInvoker(); MethodHandle invoker1 = exactInvoker();
MethodHandle invoker = erasedInvoker; MethodHandle invoker = erasedInvoker;
if (invoker != null) return invoker; if (invoker != null) return invoker;
...@@ -100,7 +100,7 @@ public class Invokers { ...@@ -100,7 +100,7 @@ public class Invokers {
return invoker; return invoker;
} }
public MethodHandle spreadInvoker(int objectArgCount) { /*non-public*/ MethodHandle spreadInvoker(int objectArgCount) {
MethodHandle vaInvoker = spreadInvokers[objectArgCount]; MethodHandle vaInvoker = spreadInvokers[objectArgCount];
if (vaInvoker != null) return vaInvoker; if (vaInvoker != null) return vaInvoker;
MethodHandle gInvoker = genericInvoker(); MethodHandle gInvoker = genericInvoker();
...@@ -111,12 +111,12 @@ public class Invokers { ...@@ -111,12 +111,12 @@ public class Invokers {
private static MethodHandle THROW_UCS = null; private static MethodHandle THROW_UCS = null;
public MethodHandle uninitializedCallSite() { /*non-public*/ MethodHandle uninitializedCallSite() {
MethodHandle invoker = uninitializedCallSite; MethodHandle invoker = uninitializedCallSite;
if (invoker != null) return invoker; if (invoker != null) return invoker;
if (targetType.parameterCount() > 0) { if (targetType.parameterCount() > 0) {
MethodType type0 = targetType.dropParameterTypes(0, targetType.parameterCount()); MethodType type0 = targetType.dropParameterTypes(0, targetType.parameterCount());
Invokers invokers0 = MethodTypeImpl.invokers(type0); Invokers invokers0 = type0.invokers();
invoker = MethodHandles.dropArguments(invokers0.uninitializedCallSite(), invoker = MethodHandles.dropArguments(invokers0.uninitializedCallSite(),
0, targetType.parameterList()); 0, targetType.parameterList());
assert(invoker.type().equals(targetType)); assert(invoker.type().equals(targetType));
...@@ -125,14 +125,14 @@ public class Invokers { ...@@ -125,14 +125,14 @@ public class Invokers {
} }
if (THROW_UCS == null) { if (THROW_UCS == null) {
try { try {
THROW_UCS = MethodHandleImpl.IMPL_LOOKUP THROW_UCS = IMPL_LOOKUP
.findStatic(CallSite.class, "uninitializedCallSite", .findStatic(CallSite.class, "uninitializedCallSite",
MethodType.methodType(Empty.class)); MethodType.methodType(Empty.class));
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
} }
invoker = AdapterMethodHandle.makeRetypeRaw(Access.TOKEN, targetType, THROW_UCS); invoker = AdapterMethodHandle.makeRetypeRaw(targetType, THROW_UCS);
assert(invoker.type().equals(targetType)); assert(invoker.type().equals(targetType));
uninitializedCallSite = invoker; uninitializedCallSite = invoker;
return invoker; return invoker;
......
src/share/classes/sun/dyn/MemberName.java → src/share/classes/java/lang/invoke/MemberName.java
浏览文件 @ 33ee9ccf
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import sun.dyn.util.BytecodeDescriptor; import sun.invoke.util.BytecodeDescriptor;
import java.dyn.*;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
...@@ -37,7 +36,8 @@ import java.util.Arrays; ...@@ -37,7 +36,8 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import static sun.dyn.MethodHandleNatives.Constants.*; import static java.lang.invoke.MethodHandleNatives.Constants.*;
import static java.lang.invoke.MethodHandleStatics.*;
/** /**
* A {@code MemberName} is a compact symbolic datum which fully characterizes * A {@code MemberName} is a compact symbolic datum which fully characterizes
...@@ -66,7 +66,7 @@ import static sun.dyn.MethodHandleNatives.Constants.*; ...@@ -66,7 +66,7 @@ import static sun.dyn.MethodHandleNatives.Constants.*;
* and those seven fields omit much of the information in Method. * and those seven fields omit much of the information in Method.
* @author jrose * @author jrose
*/ */
public final class MemberName implements Member, Cloneable { /*non-public*/ final class MemberName implements Member, Cloneable {
private Class<?> clazz; // class in which the method is defined private Class<?> clazz; // class in which the method is defined
private String name; // may be null if not yet materialized private String name; // may be null if not yet materialized
private Object type; // may be null if not yet materialized private Object type; // may be null if not yet materialized
...@@ -435,7 +435,7 @@ public final class MemberName implements Member, Cloneable { ...@@ -435,7 +435,7 @@ public final class MemberName implements Member, Cloneable {
/** Query whether this member name is resolved to a non-static, non-final method. /** Query whether this member name is resolved to a non-static, non-final method.
*/ */
public boolean hasReceiverTypeDispatch() { public boolean hasReceiverTypeDispatch() {
return (isMethod() && getVMIndex(Access.TOKEN) >= 0); return (isMethod() && getVMIndex() >= 0);
} }
/** Produce a string form of this member name. /** Produce a string form of this member name.
...@@ -490,59 +490,38 @@ public final class MemberName implements Member, Cloneable { ...@@ -490,59 +490,38 @@ public final class MemberName implements Member, Cloneable {
// Queries to the JVM: // Queries to the JVM:
/** Document? */ /** Document? */
public int getVMIndex(Access token) { /*non-public*/ int getVMIndex() {
Access.check(token);
if (!isResolved()) if (!isResolved())
throw newIllegalStateException("not resolved"); throw newIllegalStateException("not resolved", this);
return vmindex; return vmindex;
} }
// public Object getVMTarget(Access token) { // /*non-public*/ Object getVMTarget() {
// Access.check(token);
// if (!isResolved()) // if (!isResolved())
// throw newIllegalStateException("not resolved"); // throw newIllegalStateException("not resolved", this);
// return vmtarget; // return vmtarget;
// } // }
private RuntimeException newIllegalStateException(String message) {
return new IllegalStateException(message+": "+this);
}
// handy shared exception makers (they simplify the common case code) public IllegalAccessException makeAccessException(String message, Object from) {
public static RuntimeException newIllegalArgumentException(String message) { message = message + ": "+ toString();
return new IllegalArgumentException(message);
}
public static IllegalAccessException newNoAccessException(MemberName name, Object from) {
return newNoAccessException("cannot access", name, from);
}
public static IllegalAccessException newNoAccessException(String message,
MemberName name, Object from) {
message += ": " + name;
if (from != null) message += ", from " + from; if (from != null) message += ", from " + from;
return new IllegalAccessException(message); return new IllegalAccessException(message);
} }
public static ReflectiveOperationException newNoAccessException(MemberName name) { public ReflectiveOperationException makeAccessException(String message) {
if (name.isResolved()) message = message + ": "+ toString();
return new IllegalAccessException(name.toString()); if (isResolved())
else if (name.isConstructor()) return new IllegalAccessException(message);
return new NoSuchMethodException(name.toString()); else if (isConstructor())
else if (name.isMethod()) return new NoSuchMethodException(message);
return new NoSuchMethodException(name.toString()); else if (isMethod())
return new NoSuchMethodException(message);
else else
return new NoSuchFieldException(name.toString()); return new NoSuchFieldException(message);
}
public static Error uncaughtException(Exception ex) {
Error err = new InternalError("uncaught exception");
err.initCause(ex);
return err;
} }
/** Actually making a query requires an access check. */ /** Actually making a query requires an access check. */
public static Factory getFactory(Access token) { /*non-public*/ static Factory getFactory() {
Access.check(token);
return Factory.INSTANCE; return Factory.INSTANCE;
} }
public static Factory getFactory() {
return getFactory(Access.getToken());
}
/** A factory type for resolving member names with the help of the VM. /** A factory type for resolving member names with the help of the VM.
* TBD: Define access-safe public constructors for this factory. * TBD: Define access-safe public constructors for this factory.
*/ */
...@@ -662,7 +641,7 @@ public final class MemberName implements Member, Cloneable { ...@@ -662,7 +641,7 @@ public final class MemberName implements Member, Cloneable {
MemberName result = resolveOrNull(m, searchSupers, lookupClass); MemberName result = resolveOrNull(m, searchSupers, lookupClass);
if (result != null) if (result != null)
return result; return result;
ReflectiveOperationException ex = newNoAccessException(m); ReflectiveOperationException ex = m.makeAccessException("no access");
if (ex instanceof IllegalAccessException) throw (IllegalAccessException) ex; if (ex instanceof IllegalAccessException) throw (IllegalAccessException) ex;
throw nsmClass.cast(ex); throw nsmClass.cast(ex);
} }
......
src/share/classes/sun/dyn/MethodHandleNatives.java → src/share/classes/java/lang/invoke/MethodHandleNatives.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,14 +23,13 @@ ...@@ -23,14 +23,13 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import java.lang.invoke.MethodHandles.Lookup;
import java.dyn.MethodHandles.Lookup;
import java.lang.reflect.AccessibleObject; import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import static sun.dyn.MethodHandleNatives.Constants.*; import static java.lang.invoke.MethodHandleNatives.Constants.*;
import static sun.dyn.MethodHandleImpl.IMPL_LOOKUP; import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* The JVM interface for the method handles package is all here. * The JVM interface for the method handles package is all here.
...@@ -81,14 +80,12 @@ class MethodHandleNatives { ...@@ -81,14 +80,12 @@ class MethodHandleNatives {
* This routine is for debugging and reflection. * This routine is for debugging and reflection.
*/ */
static MemberName getMethodName(MethodHandle self) { static MemberName getMethodName(MethodHandle self) {
if (!JVM_SUPPORT) return null;
return (MemberName) getTarget(self, ETF_METHOD_NAME); return (MemberName) getTarget(self, ETF_METHOD_NAME);
} }
/** Fetch the reflective version of the handled method, if available. /** Fetch the reflective version of the handled method, if available.
*/ */
static AccessibleObject getTargetMethod(MethodHandle self) { static AccessibleObject getTargetMethod(MethodHandle self) {
if (!JVM_SUPPORT) return null;
return (AccessibleObject) getTarget(self, ETF_REFLECT_METHOD); return (AccessibleObject) getTarget(self, ETF_REFLECT_METHOD);
} }
...@@ -97,7 +94,6 @@ class MethodHandleNatives { ...@@ -97,7 +94,6 @@ class MethodHandleNatives {
* If it is chained to another method handle, return that handle. * If it is chained to another method handle, return that handle.
*/ */
static Object getTargetInfo(MethodHandle self) { static Object getTargetInfo(MethodHandle self) {
if (!JVM_SUPPORT) return null;
return getTarget(self, ETF_HANDLE_OR_METHOD_NAME); return getTarget(self, ETF_HANDLE_OR_METHOD_NAME);
} }
...@@ -111,11 +107,6 @@ class MethodHandleNatives { ...@@ -111,11 +107,6 @@ class MethodHandleNatives {
*/ */
static native int getConstant(int which); static native int getConstant(int which);
/** True iff this HotSpot JVM has built-in support for method handles.
* If false, some test cases might run, but functionality will be missing.
*/
public static final boolean JVM_SUPPORT;
/** Java copy of MethodHandlePushLimit in range 2..255. */ /** Java copy of MethodHandlePushLimit in range 2..255. */
static final int JVM_PUSH_LIMIT; static final int JVM_PUSH_LIMIT;
/** JVM stack motion (in words) after one slot is pushed, usually -1. /** JVM stack motion (in words) after one slot is pushed, usually -1.
...@@ -127,31 +118,24 @@ class MethodHandleNatives { ...@@ -127,31 +118,24 @@ class MethodHandleNatives {
private static native void registerNatives(); private static native void registerNatives();
static { static {
boolean JVM_SUPPORT_;
int JVM_PUSH_LIMIT_; int JVM_PUSH_LIMIT_;
int JVM_STACK_MOVE_UNIT_; int JVM_STACK_MOVE_UNIT_;
int CONV_OP_IMPLEMENTED_MASK_; int CONV_OP_IMPLEMENTED_MASK_;
try { try {
registerNatives(); registerNatives();
JVM_SUPPORT_ = true;
JVM_PUSH_LIMIT_ = getConstant(Constants.GC_JVM_PUSH_LIMIT); JVM_PUSH_LIMIT_ = getConstant(Constants.GC_JVM_PUSH_LIMIT);
JVM_STACK_MOVE_UNIT_ = getConstant(Constants.GC_JVM_STACK_MOVE_UNIT); JVM_STACK_MOVE_UNIT_ = getConstant(Constants.GC_JVM_STACK_MOVE_UNIT);
CONV_OP_IMPLEMENTED_MASK_ = getConstant(Constants.GC_CONV_OP_IMPLEMENTED_MASK); CONV_OP_IMPLEMENTED_MASK_ = getConstant(Constants.GC_CONV_OP_IMPLEMENTED_MASK);
//sun.reflect.Reflection.registerMethodsToFilter(MethodHandleImpl.class, "init"); //sun.reflect.Reflection.registerMethodsToFilter(MethodHandleImpl.class, "init");
} catch (UnsatisfiedLinkError ee) { } catch (UnsatisfiedLinkError ee) {
// ignore; if we use init() methods later we'll see linkage errors // ignore; if we use init() methods later we'll see linkage errors
JVM_SUPPORT_ = false;
JVM_PUSH_LIMIT_ = 3; // arbitrary JVM_PUSH_LIMIT_ = 3; // arbitrary
JVM_STACK_MOVE_UNIT_ = -1; // arbitrary JVM_STACK_MOVE_UNIT_ = -1; // arbitrary
CONV_OP_IMPLEMENTED_MASK_ = 0; CONV_OP_IMPLEMENTED_MASK_ = 0;
//System.out.println("Warning: Running with JVM_SUPPORT=false");
//System.out.println(ee);
JVM_SUPPORT = JVM_SUPPORT_;
JVM_PUSH_LIMIT = JVM_PUSH_LIMIT_; JVM_PUSH_LIMIT = JVM_PUSH_LIMIT_;
JVM_STACK_MOVE_UNIT = JVM_STACK_MOVE_UNIT_; JVM_STACK_MOVE_UNIT = JVM_STACK_MOVE_UNIT_;
throw ee; // just die; hopeless to try to run with an older JVM throw ee; // just die; hopeless to try to run with an older JVM
} }
JVM_SUPPORT = JVM_SUPPORT_;
JVM_PUSH_LIMIT = JVM_PUSH_LIMIT_; JVM_PUSH_LIMIT = JVM_PUSH_LIMIT_;
JVM_STACK_MOVE_UNIT = JVM_STACK_MOVE_UNIT_; JVM_STACK_MOVE_UNIT = JVM_STACK_MOVE_UNIT_;
if (CONV_OP_IMPLEMENTED_MASK_ == 0) if (CONV_OP_IMPLEMENTED_MASK_ == 0)
...@@ -189,9 +173,15 @@ class MethodHandleNatives { ...@@ -189,9 +173,15 @@ class MethodHandleNatives {
MN_SEARCH_INTERFACES = 0x00200000, // for MHN.getMembers MN_SEARCH_INTERFACES = 0x00200000, // for MHN.getMembers
VM_INDEX_UNINITIALIZED = -99; VM_INDEX_UNINITIALIZED = -99;
// BoundMethodHandle
/** Constants for decoding the vmargslot field, which contains 2 values. */
static final int
ARG_SLOT_PUSH_SHIFT = 16,
ARG_SLOT_MASK = (1<<ARG_SLOT_PUSH_SHIFT)-1;
// AdapterMethodHandle // AdapterMethodHandle
/** Conversions recognized by the JVM. /** Conversions recognized by the JVM.
* They must align with the constants in sun.dyn_AdapterMethodHandle, * They must align with the constants in java.lang.invoke.AdapterMethodHandle,
* in the JVM file hotspot/src/share/vm/classfile/javaClasses.hpp. * in the JVM file hotspot/src/share/vm/classfile/javaClasses.hpp.
*/ */
static final int static final int
...@@ -292,7 +282,7 @@ class MethodHandleNatives { ...@@ -292,7 +282,7 @@ class MethodHandleNatives {
return true; return true;
} }
static { static {
if (JVM_SUPPORT) verifyConstants(); verifyConstants();
} }
// Up-calls from the JVM. // Up-calls from the JVM.
...@@ -305,28 +295,47 @@ class MethodHandleNatives { ...@@ -305,28 +295,47 @@ class MethodHandleNatives {
String name, MethodType type, String name, MethodType type,
Object info, Object info,
MemberName callerMethod, int callerBCI) { MemberName callerMethod, int callerBCI) {
return CallSiteImpl.makeSite(bootstrapMethod, name, type, info, callerMethod, callerBCI); return CallSite.makeSite(bootstrapMethod, name, type, info, callerMethod, callerBCI);
}
/**
* Called by the JVM to check the length of a spread array.
*/
static void checkSpreadArgument(Object av, int n) {
MethodHandleStatics.checkSpreadArgument(av, n);
} }
/** /**
* The JVM wants a pointer to a MethodType. Oblige it by finding or creating one. * The JVM wants a pointer to a MethodType. Oblige it by finding or creating one.
*/ */
static MethodType findMethodHandleType(Class<?> rtype, Class<?>[] ptypes) { static MethodType findMethodHandleType(Class<?> rtype, Class<?>[] ptypes) {
MethodType.genericMethodType(0); // trigger initialization return MethodType.makeImpl(rtype, ptypes, true);
return MethodTypeImpl.makeImpl(Access.TOKEN, rtype, ptypes, true);
} }
/** /**
* The JVM wants to use a MethodType with invokeGeneric. Give the runtime fair warning. * The JVM wants to use a MethodType with invokeGeneric. Give the runtime fair warning.
*/ */
static void notifyGenericMethodType(MethodType type) { static void notifyGenericMethodType(MethodType type) {
try { type.form().notifyGenericMethodType();
// Trigger adapter creation. }
InvokeGeneric.genericInvokerOf(type);
} catch (Exception ex) { /**
Error err = new InternalError("Exception while resolving invokeGeneric"); * The JVM wants to raise an exception. Here's the path.
err.initCause(ex); */
throw err; static void raiseException(int code, Object actual, Object required) {
String message;
// disregard the identity of the actual object, if it is not a class:
if (!(actual instanceof Class) && !(actual instanceof MethodType))
actual = actual.getClass();
if (actual != null)
message = "required "+required+" but encountered "+actual;
else
message = "required "+required;
switch (code) {
case 192: // checkcast
throw new ClassCastException(message);
default:
throw new InternalError("unexpected code "+code+": "+message);
} }
} }
......
src/share/classes/java/lang/invoke/MethodHandleStatics.java 0 → 100644
浏览文件 @ 33ee9ccf
/*
* Copyright (c) 2011, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.lang.invoke;
/**
* This class consists exclusively of static names internal to the
* method handle implementation.
* Usage: {@code import static java.lang.invoke.MethodHandleStatics.*}
* @author John Rose, JSR 292 EG
*/
/*non-public*/ class MethodHandleStatics {
private MethodHandleStatics() { } // do not instantiate
/*non-public*/ static String getNameString(MethodHandle target, MethodType type) {
if (type == null)
type = target.type();
MemberName name = null;
if (target != null)
name = MethodHandleNatives.getMethodName(target);
if (name == null)
return "invoke" + type;
return name.getName() + type;
}
/*non-public*/ static String getNameString(MethodHandle target, MethodHandle typeHolder) {
return getNameString(target, typeHolder == null ? (MethodType) null : typeHolder.type());
}
/*non-public*/ static String getNameString(MethodHandle target) {
return getNameString(target, (MethodType) null);
}
/*non-public*/ static String addTypeString(Object obj, MethodHandle target) {
String str = String.valueOf(obj);
if (target == null) return str;
int paren = str.indexOf('(');
if (paren >= 0) str = str.substring(0, paren);
return str + target.type();
}
static void checkSpreadArgument(Object av, int n) {
if (av == null ? n != 0 : ((Object[])av).length != n)
throw newIllegalArgumentException("Array is not of length "+n);
}
// handy shared exception makers (they simplify the common case code)
/*non-public*/ static RuntimeException newIllegalStateException(String message) {
return new IllegalStateException(message);
}
/*non-public*/ static RuntimeException newIllegalStateException(String message, Object obj) {
return new IllegalStateException(message(message, obj));
}
/*non-public*/ static RuntimeException newIllegalArgumentException(String message) {
return new IllegalArgumentException(message);
}
/*non-public*/ static RuntimeException newIllegalArgumentException(String message, Object obj) {
return new IllegalArgumentException(message(message, obj));
}
/*non-public*/ static Error uncaughtException(Exception ex) {
Error err = new InternalError("uncaught exception");
err.initCause(ex);
return err;
}
private static String message(String message, Object obj) {
if (obj != null) message = message + ": " + obj;
return message;
}
}
src/share/classes/java/dyn/MethodType.java → src/share/classes/java/lang/invoke/MethodType.java
浏览文件 @ 33ee9ccf
...@@ -23,18 +23,14 @@ ...@@ -23,18 +23,14 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import sun.dyn.Access; import sun.invoke.util.BytecodeDescriptor;
import sun.dyn.Invokers; import static java.lang.invoke.MethodHandleStatics.*;
import sun.dyn.MethodHandleImpl;
import sun.dyn.MethodTypeImpl;
import sun.dyn.util.BytecodeDescriptor;
import static sun.dyn.MemberName.newIllegalArgumentException;
/** /**
* A method type represents the arguments and return type accepted and * A method type represents the arguments and return type accepted and
...@@ -96,34 +92,6 @@ class MethodType implements java.io.Serializable { ...@@ -96,34 +92,6 @@ class MethodType implements java.io.Serializable {
private MethodType wrapAlt; // alternative wrapped/unwrapped version private MethodType wrapAlt; // alternative wrapped/unwrapped version
private Invokers invokers; // cache of handy higher-order adapters private Invokers invokers; // cache of handy higher-order adapters
private static final Access IMPL_TOKEN = Access.getToken();
// share a cache with a friend in this package
Invokers getInvokers() { return invokers; }
void setInvokers(Invokers inv) { invokers = inv; }
static {
// This hack allows the implementation package special access to
// the internals of MethodType. In particular, the MTImpl has all sorts
// of cached information useful to the implementation code.
MethodTypeImpl.setMethodTypeFriend(IMPL_TOKEN, new MethodTypeImpl.MethodTypeFriend() {
public Class<?>[] ptypes(MethodType mt) { return mt.ptypes; }
public MethodTypeImpl form(MethodType mt) { return mt.form; }
public void setForm(MethodType mt, MethodTypeImpl form) {
assert(mt.form == null);
mt.form = (MethodTypeForm) form;
}
public MethodType makeImpl(Class<?> rtype, Class<?>[] ptypes, boolean trusted) {
return MethodType.makeImpl(rtype, ptypes, trusted);
}
public MethodTypeImpl newMethodTypeForm(MethodType mt) {
return new MethodTypeForm(mt);
}
public Invokers getInvokers(MethodType mt) { return mt.invokers; }
public void setInvokers(MethodType mt, Invokers inv) { mt.invokers = inv; }
});
}
/** /**
* Check the given parameters for validity and store them into the final fields. * Check the given parameters for validity and store them into the final fields.
*/ */
...@@ -134,6 +102,10 @@ class MethodType implements java.io.Serializable { ...@@ -134,6 +102,10 @@ class MethodType implements java.io.Serializable {
this.ptypes = ptypes; this.ptypes = ptypes;
} }
/*trusted*/ MethodTypeForm form() { return form; }
/*trusted*/ Class<?> rtype() { return rtype; }
/*trusted*/ Class<?>[] ptypes() { return ptypes; }
private static void checkRtype(Class<?> rtype) { private static void checkRtype(Class<?> rtype) {
rtype.equals(rtype); // null check rtype.equals(rtype); // null check
} }
...@@ -168,7 +140,7 @@ class MethodType implements java.io.Serializable { ...@@ -168,7 +140,7 @@ class MethodType implements java.io.Serializable {
static final Class<?>[] NO_PTYPES = {}; static final Class<?>[] NO_PTYPES = {};
/** /**
* Find or create an instance of the given method type. * Finds or creates an instance of the given method type.
* @param rtype the return type * @param rtype the return type
* @param ptypes the parameter types * @param ptypes the parameter types
* @return a method type with the given components * @return a method type with the given components
...@@ -253,7 +225,7 @@ class MethodType implements java.io.Serializable { ...@@ -253,7 +225,7 @@ class MethodType implements java.io.Serializable {
* @param trusted whether the ptypes can be used without cloning * @param trusted whether the ptypes can be used without cloning
* @return the unique method type of the desired structure * @return the unique method type of the desired structure
*/ */
private static /*trusted*/ static
MethodType makeImpl(Class<?> rtype, Class<?>[] ptypes, boolean trusted) { MethodType makeImpl(Class<?> rtype, Class<?>[] ptypes, boolean trusted) {
if (ptypes == null || ptypes.length == 0) { if (ptypes == null || ptypes.length == 0) {
ptypes = NO_PTYPES; trusted = true; ptypes = NO_PTYPES; trusted = true;
...@@ -269,7 +241,12 @@ class MethodType implements java.io.Serializable { ...@@ -269,7 +241,12 @@ class MethodType implements java.io.Serializable {
// defensively copy the array passed in by the user // defensively copy the array passed in by the user
mt1 = new MethodType(rtype, ptypes.clone()); mt1 = new MethodType(rtype, ptypes.clone());
// promote the object to the Real Thing, and reprobe // promote the object to the Real Thing, and reprobe
MethodTypeImpl.initForm(IMPL_TOKEN, mt1); MethodTypeForm form = MethodTypeForm.findForm(mt1);
mt1.form = form;
if (form.erasedType == mt1) {
// This is a principal (erased) type; show it to the JVM.
MethodHandleNatives.init(mt1);
}
synchronized (internTable) { synchronized (internTable) {
mt0 = internTable.get(mt1); mt0 = internTable.get(mt1);
if (mt0 != null) if (mt0 != null)
...@@ -279,12 +256,6 @@ class MethodType implements java.io.Serializable { ...@@ -279,12 +256,6 @@ class MethodType implements java.io.Serializable {
return mt1; return mt1;
} }
// Entry point from JVM. TODO: Change the name & signature.
private static MethodType makeImpl(Class<?> rtype, Class<?>[] ptypes,
boolean ignore1, boolean ignore2) {
return makeImpl(rtype, ptypes, true);
}
private static final MethodType[] objectOnlyTypes = new MethodType[20]; private static final MethodType[] objectOnlyTypes = new MethodType[20];
/** /**
...@@ -519,7 +490,7 @@ class MethodType implements java.io.Serializable { ...@@ -519,7 +490,7 @@ class MethodType implements java.io.Serializable {
} }
/** /**
* Convert all wrapper types to their corresponding primitive types. * Converts all wrapper types to their corresponding primitive types.
* Convenience method for {@link #methodType(java.lang.Class, java.lang.Class[]) methodType}. * Convenience method for {@link #methodType(java.lang.Class, java.lang.Class[]) methodType}.
* All primitive types (including {@code void}) will remain unchanged. * All primitive types (including {@code void}) will remain unchanged.
* A return type of {@code java.lang.Void} is changed to {@code void}. * A return type of {@code java.lang.Void} is changed to {@code void}.
...@@ -535,7 +506,7 @@ class MethodType implements java.io.Serializable { ...@@ -535,7 +506,7 @@ class MethodType implements java.io.Serializable {
MethodType wt = pt.wrapAlt; MethodType wt = pt.wrapAlt;
if (wt == null) { if (wt == null) {
// fill in lazily // fill in lazily
wt = MethodTypeImpl.canonicalize(pt, MethodTypeImpl.WRAP, MethodTypeImpl.WRAP); wt = MethodTypeForm.canonicalize(pt, MethodTypeForm.WRAP, MethodTypeForm.WRAP);
assert(wt != null); assert(wt != null);
pt.wrapAlt = wt; pt.wrapAlt = wt;
} }
...@@ -547,7 +518,7 @@ class MethodType implements java.io.Serializable { ...@@ -547,7 +518,7 @@ class MethodType implements java.io.Serializable {
MethodType uwt = wt.wrapAlt; MethodType uwt = wt.wrapAlt;
if (uwt == null) { if (uwt == null) {
// fill in lazily // fill in lazily
uwt = MethodTypeImpl.canonicalize(wt, MethodTypeImpl.UNWRAP, MethodTypeImpl.UNWRAP); uwt = MethodTypeForm.canonicalize(wt, MethodTypeForm.UNWRAP, MethodTypeForm.UNWRAP);
if (uwt == null) if (uwt == null)
uwt = wt; // type has no wrappers or prims at all uwt = wt; // type has no wrappers or prims at all
wt.wrapAlt = uwt; wt.wrapAlt = uwt;
...@@ -658,7 +629,7 @@ class MethodType implements java.io.Serializable { ...@@ -658,7 +629,7 @@ class MethodType implements java.io.Serializable {
/// Queries which have to do with the bytecode architecture /// Queries which have to do with the bytecode architecture
/** Reports the number of JVM stack slots required to invoke a method /** Reports the number of JVM stack slots required to invoke a method
* of this type. Note that (for historic reasons) the JVM requires * of this type. Note that (for historical reasons) the JVM requires
* a second stack slot to pass long and double arguments. * a second stack slot to pass long and double arguments.
* So this method returns {@link #parameterCount() parameterCount} plus the * So this method returns {@link #parameterCount() parameterCount} plus the
* number of long and double parameters (if any). * number of long and double parameters (if any).
...@@ -666,12 +637,18 @@ class MethodType implements java.io.Serializable { ...@@ -666,12 +637,18 @@ class MethodType implements java.io.Serializable {
* This method is included for the benfit of applications that must * This method is included for the benfit of applications that must
* generate bytecodes that process method handles and invokedynamic. * generate bytecodes that process method handles and invokedynamic.
* @return the number of JVM stack slots for this type's parameters * @return the number of JVM stack slots for this type's parameters
* @deprecated Will be removed for PFD.
*/ */
public int parameterSlotCount() { /*non-public*/ int parameterSlotCount() {
return form.parameterSlotCount(); return form.parameterSlotCount();
} }
/*non-public*/ Invokers invokers() {
Invokers inv = invokers;
if (inv != null) return inv;
invokers = inv = new Invokers(this);
return inv;
}
/** Reports the number of JVM stack slots which carry all parameters including and after /** Reports the number of JVM stack slots which carry all parameters including and after
* the given position, which must be in the range of 0 to * the given position, which must be in the range of 0 to
* {@code parameterCount} inclusive. Successive parameters are * {@code parameterCount} inclusive. Successive parameters are
...@@ -694,9 +671,8 @@ class MethodType implements java.io.Serializable { ...@@ -694,9 +671,8 @@ class MethodType implements java.io.Serializable {
* @return the index of the (shallowest) JVM stack slot transmitting the * @return the index of the (shallowest) JVM stack slot transmitting the
* given parameter * given parameter
* @throws IllegalArgumentException if {@code num} is negative or greater than {@code parameterCount()} * @throws IllegalArgumentException if {@code num} is negative or greater than {@code parameterCount()}
* @deprecated Will be removed for PFD.
*/ */
public int parameterSlotDepth(int num) { /*non-public*/ int parameterSlotDepth(int num) {
if (num < 0 || num > ptypes.length) if (num < 0 || num > ptypes.length)
parameterType(num); // force a range check parameterType(num); // force a range check
return form.parameterToArgSlot(num-1); return form.parameterToArgSlot(num-1);
...@@ -710,14 +686,14 @@ class MethodType implements java.io.Serializable { ...@@ -710,14 +686,14 @@ class MethodType implements java.io.Serializable {
* This method is included for the benfit of applications that must * This method is included for the benfit of applications that must
* generate bytecodes that process method handles and invokedynamic. * generate bytecodes that process method handles and invokedynamic.
* @return the number of JVM stack slots (0, 1, or 2) for this type's return value * @return the number of JVM stack slots (0, 1, or 2) for this type's return value
* @deprecated Will be removed for PFD. * Will be removed for PFD.
*/ */
public int returnSlotCount() { /*non-public*/ int returnSlotCount() {
return form.returnSlotCount(); return form.returnSlotCount();
} }
/** /**
* Find or create an instance of a method type, given the spelling of its bytecode descriptor. * Finds or creates an instance of a method type, given the spelling of its bytecode descriptor.
* Convenience method for {@link #methodType(java.lang.Class, java.lang.Class[]) methodType}. * Convenience method for {@link #methodType(java.lang.Class, java.lang.Class[]) methodType}.
* Any class or interface name embedded in the descriptor string * Any class or interface name embedded in the descriptor string
* will be resolved by calling {@link ClassLoader#loadClass(java.lang.String)} * will be resolved by calling {@link ClassLoader#loadClass(java.lang.String)}
......
src/share/classes/sun/dyn/MethodTypeImpl.java → src/share/classes/java/lang/invoke/MethodTypeForm.java
浏览文件 @ 33ee9ccf
...@@ -23,11 +23,10 @@ ...@@ -23,11 +23,10 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import sun.invoke.util.Wrapper;
import sun.dyn.util.Wrapper; import static java.lang.invoke.MethodHandleStatics.*;
import static sun.dyn.MemberName.newIllegalArgumentException;
/** /**
* Shared information for a group of method types, which differ * Shared information for a group of method types, which differ
...@@ -42,7 +41,7 @@ import static sun.dyn.MemberName.newIllegalArgumentException; ...@@ -42,7 +41,7 @@ import static sun.dyn.MemberName.newIllegalArgumentException;
* No more than half of these are likely to be loaded at once. * No more than half of these are likely to be loaded at once.
* @author John Rose * @author John Rose
*/ */
public class MethodTypeImpl { class MethodTypeForm {
final int[] argToSlotTable, slotToArgTable; final int[] argToSlotTable, slotToArgTable;
final long argCounts; // packed slot & value counts final long argCounts; // packed slot & value counts
final long primCounts; // packed prim & double counts final long primCounts; // packed prim & double counts
...@@ -66,39 +65,10 @@ public class MethodTypeImpl { ...@@ -66,39 +65,10 @@ public class MethodTypeImpl {
return erasedType; return erasedType;
} }
public static MethodTypeImpl of(MethodType type) { protected MethodTypeForm(MethodType erasedType) {
return METHOD_TYPE_FRIEND.form(type);
}
/** Access methods for the internals of MethodType, supplied to
* MethodTypeImpl as a trusted agent.
*/
static public interface MethodTypeFriend {
Class<?>[] ptypes(MethodType mt);
MethodTypeImpl form(MethodType mt);
void setForm(MethodType mt, MethodTypeImpl form);
MethodType makeImpl(Class<?> rtype, Class<?>[] ptypes, boolean trusted);
MethodTypeImpl newMethodTypeForm(MethodType mt);
Invokers getInvokers(MethodType mt);
void setInvokers(MethodType mt, Invokers inv);
}
public static void setMethodTypeFriend(Access token, MethodTypeFriend am) {
Access.check(token);
if (METHOD_TYPE_FRIEND != null)
throw new InternalError(); // just once
METHOD_TYPE_FRIEND = am;
}
static private MethodTypeFriend METHOD_TYPE_FRIEND;
static MethodType makeImpl(Access token, Class<?> rtype, Class<?>[] ptypes, boolean trusted) {
Access.check(token);
return METHOD_TYPE_FRIEND.makeImpl(rtype, ptypes, trusted);
}
protected MethodTypeImpl(MethodType erasedType) {
this.erasedType = erasedType; this.erasedType = erasedType;
Class<?>[] ptypes = METHOD_TYPE_FRIEND.ptypes(erasedType); Class<?>[] ptypes = erasedType.ptypes();
int ptypeCount = ptypes.length; int ptypeCount = ptypes.length;
int pslotCount = ptypeCount; // temp. estimate int pslotCount = ptypeCount; // temp. estimate
int rtypeCount = 1; // temp. estimate int rtypeCount = 1; // temp. estimate
...@@ -260,7 +230,7 @@ public class MethodTypeImpl { ...@@ -260,7 +230,7 @@ public class MethodTypeImpl {
* the type {@code (Object,int)Object} produces {@code null}. * the type {@code (Object,int)Object} produces {@code null}.
*/ */
public static int[] primsAtEndOrder(MethodType mt) { public static int[] primsAtEndOrder(MethodType mt) {
MethodTypeImpl form = METHOD_TYPE_FRIEND.form(mt); MethodTypeForm form = mt.form();
if (form.primsAtEnd == form.erasedType) if (form.primsAtEnd == form.erasedType)
// quick check shows no reordering is necessary // quick check shows no reordering is necessary
return null; return null;
...@@ -273,7 +243,7 @@ public class MethodTypeImpl { ...@@ -273,7 +243,7 @@ public class MethodTypeImpl {
int lac = form.longPrimitiveParameterCount(); int lac = form.longPrimitiveParameterCount();
int rfill = 0, ifill = argc - pac, lfill = argc - lac; int rfill = 0, ifill = argc - pac, lfill = argc - lac;
Class<?>[] ptypes = METHOD_TYPE_FRIEND.ptypes(mt); Class<?>[] ptypes = mt.ptypes();
boolean changed = false; boolean changed = false;
for (int i = 0; i < ptypes.length; i++) { for (int i = 0; i < ptypes.length; i++) {
Class<?> pt = ptypes[i]; Class<?> pt = ptypes[i];
...@@ -300,7 +270,7 @@ public class MethodTypeImpl { ...@@ -300,7 +270,7 @@ public class MethodTypeImpl {
*/ */
public static MethodType reorderParameters(MethodType mt, int[] newParamOrder, Class<?>[] moreParams) { public static MethodType reorderParameters(MethodType mt, int[] newParamOrder, Class<?>[] moreParams) {
if (newParamOrder == null) return mt; // no-op reordering if (newParamOrder == null) return mt; // no-op reordering
Class<?>[] ptypes = METHOD_TYPE_FRIEND.ptypes(mt); Class<?>[] ptypes = mt.ptypes();
Class<?>[] ntypes = new Class<?>[newParamOrder.length]; Class<?>[] ntypes = new Class<?>[newParamOrder.length];
int maxParam = ptypes.length + (moreParams == null ? 0 : moreParams.length); int maxParam = ptypes.length + (moreParams == null ? 0 : moreParams.length);
boolean changed = (ntypes.length != ptypes.length); boolean changed = (ntypes.length != ptypes.length);
...@@ -314,7 +284,7 @@ public class MethodTypeImpl { ...@@ -314,7 +284,7 @@ public class MethodTypeImpl {
ntypes[i] = nt; ntypes[i] = nt;
} }
if (!changed) return mt; if (!changed) return mt;
return METHOD_TYPE_FRIEND.makeImpl(mt.returnType(), ntypes, true); return MethodType.makeImpl(mt.returnType(), ntypes, true);
} }
private static boolean hasTwoArgSlots(Class<?> type) { private static boolean hasTwoArgSlots(Class<?> type) {
...@@ -376,28 +346,18 @@ public class MethodTypeImpl { ...@@ -376,28 +346,18 @@ public class MethodTypeImpl {
return slotToArgTable[argSlot] - 1; return slotToArgTable[argSlot] - 1;
} }
public static void initForm(Access token, MethodType mt) { static MethodTypeForm findForm(MethodType mt) {
Access.check(token);
MethodTypeImpl form = findForm(mt);
METHOD_TYPE_FRIEND.setForm(mt, form);
if (form.erasedType == mt) {
// This is a principal (erased) type; show it to the JVM.
MethodHandleImpl.init(token, mt);
}
}
static MethodTypeImpl findForm(MethodType mt) {
MethodType erased = canonicalize(mt, ERASE, ERASE); MethodType erased = canonicalize(mt, ERASE, ERASE);
if (erased == null) { if (erased == null) {
// It is already erased. Make a new MethodTypeImpl. // It is already erased. Make a new MethodTypeForm.
return METHOD_TYPE_FRIEND.newMethodTypeForm(mt); return new MethodTypeForm(mt);
} else { } else {
// Share the MethodTypeImpl with the erased version. // Share the MethodTypeForm with the erased version.
return METHOD_TYPE_FRIEND.form(erased); return erased.form();
} }
} }
/** Codes for {@link #canonicalize(java.lang.Class, int). /** Codes for {@link #canonicalize(java.lang.Class, int)}.
* ERASE means change every reference to {@code Object}. * ERASE means change every reference to {@code Object}.
* WRAP means convert primitives (including {@code void} to their * WRAP means convert primitives (including {@code void} to their
* corresponding wrapper types. UNWRAP means the reverse of WRAP. * corresponding wrapper types. UNWRAP means the reverse of WRAP.
...@@ -414,10 +374,10 @@ public class MethodTypeImpl { ...@@ -414,10 +374,10 @@ public class MethodTypeImpl {
* Otherwise return null. * Otherwise return null.
*/ */
public static MethodType canonicalize(MethodType mt, int howRet, int howArgs) { public static MethodType canonicalize(MethodType mt, int howRet, int howArgs) {
Class<?>[] ptypes = METHOD_TYPE_FRIEND.ptypes(mt); Class<?>[] ptypes = mt.ptypes();
Class<?>[] ptc = MethodTypeImpl.canonicalizes(ptypes, howArgs); Class<?>[] ptc = MethodTypeForm.canonicalizes(ptypes, howArgs);
Class<?> rtype = mt.returnType(); Class<?> rtype = mt.returnType();
Class<?> rtc = MethodTypeImpl.canonicalize(rtype, howRet); Class<?> rtc = MethodTypeForm.canonicalize(rtype, howRet);
if (ptc == null && rtc == null) { if (ptc == null && rtc == null) {
// It is already canonical. // It is already canonical.
return null; return null;
...@@ -425,7 +385,7 @@ public class MethodTypeImpl { ...@@ -425,7 +385,7 @@ public class MethodTypeImpl {
// Find the erased version of the method type: // Find the erased version of the method type:
if (rtc == null) rtc = rtype; if (rtc == null) rtc = rtype;
if (ptc == null) ptc = ptypes; if (ptc == null) ptc = ptypes;
return METHOD_TYPE_FRIEND.makeImpl(rtc, ptc, true); return MethodType.makeImpl(rtc, ptc, true);
} }
/** Canonicalize the given return or param type. /** Canonicalize the given return or param type.
...@@ -496,16 +456,16 @@ public class MethodTypeImpl { ...@@ -496,16 +456,16 @@ public class MethodTypeImpl {
return cs; return cs;
} }
public static Invokers invokers(Access token, MethodType type) { /*non-public*/ void notifyGenericMethodType() {
Access.check(token); if (genericInvoker != null) return;
return invokers(type); try {
// Trigger adapter creation.
genericInvoker = InvokeGeneric.genericInvokerOf(erasedType);
} catch (Exception ex) {
Error err = new InternalError("Exception while resolving invokeGeneric");
err.initCause(ex);
throw err;
} }
/*non-public*/ static Invokers invokers(MethodType type) {
Invokers inv = METHOD_TYPE_FRIEND.getInvokers(type);
if (inv != null) return inv;
inv = new Invokers(type);
METHOD_TYPE_FRIEND.setInvokers(type, inv);
return inv;
} }
@Override @Override
......
src/share/classes/java/dyn/MutableCallSite.java → src/share/classes/java/lang/invoke/MutableCallSite.java
浏览文件 @ 33ee9ccf
...@@ -23,10 +23,8 @@ ...@@ -23,10 +23,8 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
import sun.dyn.*;
import sun.dyn.empty.Empty;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
......
src/share/classes/sun/dyn/SpreadGeneric.java → src/share/classes/java/lang/invoke/SpreadGeneric.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*; import sun.invoke.util.ValueConversions;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import sun.dyn.util.ValueConversions; import static java.lang.invoke.MethodHandleStatics.*;
import static sun.dyn.MemberName.newIllegalArgumentException; import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* Generic spread adapter. * Generic spread adapter.
...@@ -110,7 +110,7 @@ class SpreadGeneric { ...@@ -110,7 +110,7 @@ class SpreadGeneric {
static SpreadGeneric of(MethodType targetType, int spreadCount) { static SpreadGeneric of(MethodType targetType, int spreadCount) {
if (targetType != targetType.generic()) if (targetType != targetType.generic())
throw new UnsupportedOperationException("NYI type="+targetType); throw new UnsupportedOperationException("NYI type="+targetType);
MethodTypeImpl form = MethodTypeImpl.of(targetType); MethodTypeForm form = targetType.form();
int outcount = form.parameterCount(); int outcount = form.parameterCount();
assert(spreadCount <= outcount); assert(spreadCount <= outcount);
SpreadGeneric[] spreadGens = form.spreadGeneric; SpreadGeneric[] spreadGens = form.spreadGeneric;
...@@ -129,7 +129,7 @@ class SpreadGeneric { ...@@ -129,7 +129,7 @@ class SpreadGeneric {
// This mini-api is called from an Adapter to manage the spread. // This mini-api is called from an Adapter to manage the spread.
/** A check/coercion that happens once before any selections. */ /** A check/coercion that happens once before any selections. */
protected Object check(Object av, int n) { protected Object check(Object av, int n) {
MethodHandleImpl.checkSpreadArgument(av, n); checkSpreadArgument(av, n);
return av; return av;
} }
...@@ -166,7 +166,7 @@ class SpreadGeneric { ...@@ -166,7 +166,7 @@ class SpreadGeneric {
// see if it has the required invoke method // see if it has the required invoke method
MethodHandle entryPoint = null; MethodHandle entryPoint = null;
try { try {
entryPoint = MethodHandleImpl.IMPL_LOOKUP.findSpecial(acls, iname, entryType, acls); entryPoint = IMPL_LOOKUP.findSpecial(acls, iname, entryType, acls);
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
} }
if (entryPoint == null) continue; if (entryPoint == null) continue;
...@@ -221,21 +221,21 @@ class SpreadGeneric { ...@@ -221,21 +221,21 @@ class SpreadGeneric {
@Override @Override
public String toString() { public String toString() {
return MethodHandleImpl.addTypeString(target, this); return addTypeString(target, this);
} }
static final MethodHandle NO_ENTRY = ValueConversions.identity(); static final MethodHandle NO_ENTRY = ValueConversions.identity();
protected boolean isPrototype() { return target == null; } protected boolean isPrototype() { return target == null; }
protected Adapter(SpreadGeneric outer) { protected Adapter(SpreadGeneric outer) {
super(Access.TOKEN, NO_ENTRY); super(NO_ENTRY);
this.outer = outer; this.outer = outer;
this.target = null; this.target = null;
assert(isPrototype()); assert(isPrototype());
} }
protected Adapter(SpreadGeneric outer, MethodHandle target) { protected Adapter(SpreadGeneric outer, MethodHandle target) {
super(Access.TOKEN, outer.entryPoint); super(outer.entryPoint);
this.outer = outer; this.outer = outer;
this.target = target; this.target = target;
} }
...@@ -251,7 +251,7 @@ class SpreadGeneric { ...@@ -251,7 +251,7 @@ class SpreadGeneric {
return outer.select(av, n); return outer.select(av, n);
} }
static private final String CLASS_PREFIX; // "sun.dyn.SpreadGeneric$" static private final String CLASS_PREFIX; // "java.lang.invoke.SpreadGeneric$"
static { static {
String aname = Adapter.class.getName(); String aname = Adapter.class.getName();
String sname = Adapter.class.getSimpleName(); String sname = Adapter.class.getSimpleName();
......
src/share/classes/java/dyn/SwitchPoint.java → src/share/classes/java/lang/invoke/SwitchPoint.java
浏览文件 @ 33ee9ccf
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
/** /**
* <p> * <p>
...@@ -73,6 +73,10 @@ assertEquals("hodmet", (String) worker.invokeExact("met", "hod")); ...@@ -73,6 +73,10 @@ assertEquals("hodmet", (String) worker.invokeExact("met", "hod"));
* Switch points are useful without subclassing. They may also be subclassed. * Switch points are useful without subclassing. They may also be subclassed.
* This may be useful in order to associate application-specific invalidation logic * This may be useful in order to associate application-specific invalidation logic
* with the switch point. * with the switch point.
* Notice that there is no permanent association between a switch point and
* the method handles it produces and consumes.
* The garbage collector may collect method handles produced or consumed
* by a switch point independently of the lifetime of the switch point itself.
* <p style="font-size:smaller;"> * <p style="font-size:smaller;">
* <em>Implementation Note:</em> * <em>Implementation Note:</em>
* A switch point behaves as if implemented on top of {@link MutableCallSite}, * A switch point behaves as if implemented on top of {@link MutableCallSite},
......
src/share/classes/sun/dyn/ToGeneric.java → src/share/classes/java/lang/invoke/ToGeneric.java
浏览文件 @ 33ee9ccf
...@@ -23,15 +23,14 @@ ...@@ -23,15 +23,14 @@
* questions. * questions.
*/ */
package sun.dyn; package java.lang.invoke;
import java.dyn.*;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import sun.dyn.util.ValueConversions; import sun.invoke.util.ValueConversions;
import sun.dyn.util.Wrapper; import sun.invoke.util.Wrapper;
import static sun.dyn.MemberName.newIllegalArgumentException; import static java.lang.invoke.MethodHandleStatics.*;
import static sun.dyn.MethodTypeImpl.invokers; import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
/** /**
* Adapters which mediate between incoming calls which are not generic * Adapters which mediate between incoming calls which are not generic
...@@ -73,7 +72,7 @@ class ToGeneric { ...@@ -73,7 +72,7 @@ class ToGeneric {
assert(entryType.erase() == entryType); // for now assert(entryType.erase() == entryType); // for now
// incoming call will first "forget" all reference types except Object // incoming call will first "forget" all reference types except Object
this.entryType = entryType; this.entryType = entryType;
MethodHandle invoker0 = invokers(entryType.generic()).exactInvoker(); MethodHandle invoker0 = entryType.generic().invokers().exactInvoker();
MethodType rawEntryTypeInit; MethodType rawEntryTypeInit;
Adapter ad = findAdapter(rawEntryTypeInit = entryType); Adapter ad = findAdapter(rawEntryTypeInit = entryType);
if (ad != null) { if (ad != null) {
...@@ -89,15 +88,15 @@ class ToGeneric { ...@@ -89,15 +88,15 @@ class ToGeneric {
} }
// next, it will reorder primitives after references // next, it will reorder primitives after references
MethodType primsAtEnd = MethodTypeImpl.of(entryType).primsAtEnd(); MethodType primsAtEnd = entryType.form().primsAtEnd();
// at the same time, it will "forget" all primitive types except int/long // at the same time, it will "forget" all primitive types except int/long
this.primsAtEndOrder = MethodTypeImpl.primsAtEndOrder(entryType); this.primsAtEndOrder = MethodTypeForm.primsAtEndOrder(entryType);
if (primsAtEndOrder != null) { if (primsAtEndOrder != null) {
// reordering is required; build on top of a simpler ToGeneric // reordering is required; build on top of a simpler ToGeneric
ToGeneric va2 = ToGeneric.of(primsAtEnd); ToGeneric va2 = ToGeneric.of(primsAtEnd);
this.adapter = va2.adapter; this.adapter = va2.adapter;
if (true) throw new UnsupportedOperationException("NYI: primitive parameters must follow references; entryType = "+entryType); if (true) throw new UnsupportedOperationException("NYI: primitive parameters must follow references; entryType = "+entryType);
this.entryPoint = MethodHandleImpl.convertArguments(Access.TOKEN, this.entryPoint = MethodHandleImpl.convertArguments(
va2.entryPoint, primsAtEnd, entryType, primsAtEndOrder); va2.entryPoint, primsAtEnd, entryType, primsAtEndOrder);
// example: for entryType of (int,Object,Object), the reordered // example: for entryType of (int,Object,Object), the reordered
// type is (Object,Object,int) and the order is {1,2,0}, // type is (Object,Object,int) and the order is {1,2,0},
...@@ -107,7 +106,7 @@ class ToGeneric { ...@@ -107,7 +106,7 @@ class ToGeneric {
// after any needed argument reordering, it will reinterpret // after any needed argument reordering, it will reinterpret
// primitive arguments according to their "raw" types int/long // primitive arguments according to their "raw" types int/long
MethodType intsAtEnd = MethodTypeImpl.of(primsAtEnd).primsAsInts(); MethodType intsAtEnd = primsAtEnd.form().primsAsInts();
ad = findAdapter(rawEntryTypeInit = intsAtEnd); ad = findAdapter(rawEntryTypeInit = intsAtEnd);
MethodHandle rawEntryPoint; MethodHandle rawEntryPoint;
if (ad != null) { if (ad != null) {
...@@ -116,7 +115,7 @@ class ToGeneric { ...@@ -116,7 +115,7 @@ class ToGeneric {
// Perhaps the adapter is available only for longs. // Perhaps the adapter is available only for longs.
// If so, we can use it, but there will have to be a little // If so, we can use it, but there will have to be a little
// more stack motion on each call. // more stack motion on each call.
MethodType longsAtEnd = MethodTypeImpl.of(primsAtEnd).primsAsLongs(); MethodType longsAtEnd = primsAtEnd.form().primsAsLongs();
ad = findAdapter(rawEntryTypeInit = longsAtEnd); ad = findAdapter(rawEntryTypeInit = longsAtEnd);
if (ad != null) { if (ad != null) {
MethodType eptWithLongs = longsAtEnd.insertParameterTypes(0, ad.getClass()); MethodType eptWithLongs = longsAtEnd.insertParameterTypes(0, ad.getClass());
...@@ -128,7 +127,7 @@ class ToGeneric { ...@@ -128,7 +127,7 @@ class ToGeneric {
assert(midType.parameterType(i) == long.class); assert(midType.parameterType(i) == long.class);
assert(eptWithInts.parameterType(i) == int.class); assert(eptWithInts.parameterType(i) == int.class);
MethodType nextType = midType.changeParameterType(i, int.class); MethodType nextType = midType.changeParameterType(i, int.class);
rawEntryPoint = MethodHandle.convertArguments(Access.TOKEN, rawEntryPoint = MethodHandleImpl.convertArguments(
rawEntryPoint, nextType, midType, null); rawEntryPoint, nextType, midType, null);
midType = nextType; midType = nextType;
} }
...@@ -143,7 +142,7 @@ class ToGeneric { ...@@ -143,7 +142,7 @@ class ToGeneric {
} }
MethodType tepType = entryType.insertParameterTypes(0, ad.getClass()); MethodType tepType = entryType.insertParameterTypes(0, ad.getClass());
this.entryPoint = this.entryPoint =
AdapterMethodHandle.makeRetypeRaw(Access.TOKEN, tepType, rawEntryPoint); AdapterMethodHandle.makeRetypeRaw(tepType, rawEntryPoint);
if (this.entryPoint == null) if (this.entryPoint == null)
throw new UnsupportedOperationException("cannot retype to "+entryType throw new UnsupportedOperationException("cannot retype to "+entryType
+" from "+rawEntryPoint.type().dropParameterTypes(0, 1)); +" from "+rawEntryPoint.type().dropParameterTypes(0, 1));
...@@ -168,7 +167,7 @@ class ToGeneric { ...@@ -168,7 +167,7 @@ class ToGeneric {
assert(src.isPrimitive() && dst.isPrimitive()); assert(src.isPrimitive() && dst.isPrimitive());
if (filteredInvoker == null) { if (filteredInvoker == null) {
filteredInvoker = filteredInvoker =
AdapterMethodHandle.makeCheckCast(Access.TOKEN, AdapterMethodHandle.makeCheckCast(
invoker.type().generic(), invoker, 0, MethodHandle.class); invoker.type().generic(), invoker, 0, MethodHandle.class);
if (filteredInvoker == null) throw new UnsupportedOperationException("NYI"); if (filteredInvoker == null) throw new UnsupportedOperationException("NYI");
} }
...@@ -177,7 +176,7 @@ class ToGeneric { ...@@ -177,7 +176,7 @@ class ToGeneric {
if (filteredInvoker == null) throw new InternalError(); if (filteredInvoker == null) throw new InternalError();
} }
if (filteredInvoker == null) return invoker; if (filteredInvoker == null) return invoker;
return AdapterMethodHandle.makeRetypeOnly(Access.TOKEN, invoker.type(), filteredInvoker); return AdapterMethodHandle.makeRetypeOnly(invoker.type(), filteredInvoker);
} }
/** /**
...@@ -227,7 +226,7 @@ class ToGeneric { ...@@ -227,7 +226,7 @@ class ToGeneric {
// retype erased reference arguments (the cast makes it safe to do this) // retype erased reference arguments (the cast makes it safe to do this)
MethodType tepType = type.insertParameterTypes(0, adapter.getClass()); MethodType tepType = type.insertParameterTypes(0, adapter.getClass());
MethodHandle typedEntryPoint = MethodHandle typedEntryPoint =
AdapterMethodHandle.makeRetypeRaw(Access.TOKEN, tepType, entryPoint); AdapterMethodHandle.makeRetypeRaw(tepType, entryPoint);
return adapter.makeInstance(typedEntryPoint, invoker, convert, genericTarget); return adapter.makeInstance(typedEntryPoint, invoker, convert, genericTarget);
} }
...@@ -248,7 +247,7 @@ class ToGeneric { ...@@ -248,7 +247,7 @@ class ToGeneric {
/** Return the adapter information for this type's erasure. */ /** Return the adapter information for this type's erasure. */
static ToGeneric of(MethodType type) { static ToGeneric of(MethodType type) {
MethodTypeImpl form = MethodTypeImpl.of(type); MethodTypeForm form = type.form();
ToGeneric toGen = form.toGeneric; ToGeneric toGen = form.toGeneric;
if (toGen == null) if (toGen == null)
form.toGeneric = toGen = new ToGeneric(form.erasedType()); form.toGeneric = toGen = new ToGeneric(form.erasedType());
...@@ -262,7 +261,7 @@ class ToGeneric { ...@@ -262,7 +261,7 @@ class ToGeneric {
/* Create an adapter for the given incoming call type. */ /* Create an adapter for the given incoming call type. */
static Adapter findAdapter(MethodType entryPointType) { static Adapter findAdapter(MethodType entryPointType) {
MethodTypeImpl form = MethodTypeImpl.of(entryPointType); MethodTypeForm form = entryPointType.form();
Class<?> rtype = entryPointType.returnType(); Class<?> rtype = entryPointType.returnType();
int argc = form.parameterCount(); int argc = form.parameterCount();
int lac = form.longPrimitiveParameterCount(); int lac = form.longPrimitiveParameterCount();
...@@ -283,7 +282,7 @@ class ToGeneric { ...@@ -283,7 +282,7 @@ class ToGeneric {
for (String iname : inames) { for (String iname : inames) {
MethodHandle entryPoint = null; MethodHandle entryPoint = null;
try { try {
entryPoint = MethodHandleImpl.IMPL_LOOKUP. entryPoint = IMPL_LOOKUP.
findSpecial(acls, iname, entryPointType, acls); findSpecial(acls, iname, entryPointType, acls);
} catch (ReflectiveOperationException ex) { } catch (ReflectiveOperationException ex) {
} }
...@@ -338,13 +337,13 @@ class ToGeneric { ...@@ -338,13 +337,13 @@ class ToGeneric {
@Override @Override
public String toString() { public String toString() {
return target == null ? "prototype:"+convert : MethodHandleImpl.addTypeString(target, this); return target == null ? "prototype:"+convert : addTypeString(target, this);
} }
protected boolean isPrototype() { return target == null; } protected boolean isPrototype() { return target == null; }
/* Prototype constructor. */ /* Prototype constructor. */
protected Adapter(MethodHandle entryPoint) { protected Adapter(MethodHandle entryPoint) {
super(Access.TOKEN, entryPoint); super(entryPoint);
this.invoker = null; this.invoker = null;
this.convert = entryPoint; this.convert = entryPoint;
this.target = null; this.target = null;
...@@ -356,7 +355,7 @@ class ToGeneric { ...@@ -356,7 +355,7 @@ class ToGeneric {
} }
protected Adapter(MethodHandle entryPoint, MethodHandle invoker, MethodHandle convert, MethodHandle target) { protected Adapter(MethodHandle entryPoint, MethodHandle invoker, MethodHandle convert, MethodHandle target) {
super(Access.TOKEN, entryPoint); super(entryPoint);
this.invoker = invoker; this.invoker = invoker;
this.convert = convert; this.convert = convert;
this.target = target; this.target = target;
...@@ -396,7 +395,7 @@ class ToGeneric { ...@@ -396,7 +395,7 @@ class ToGeneric {
protected float return_F(Object res) throws Throwable { return (float) convert.invokeExact(res); } protected float return_F(Object res) throws Throwable { return (float) convert.invokeExact(res); }
protected double return_D(Object res) throws Throwable { return (double)convert.invokeExact(res); } protected double return_D(Object res) throws Throwable { return (double)convert.invokeExact(res); }
static private final String CLASS_PREFIX; // "sun.dyn.ToGeneric$" static private final String CLASS_PREFIX; // "java.lang.invoke.ToGeneric$"
static { static {
String aname = Adapter.class.getName(); String aname = Adapter.class.getName();
String sname = Adapter.class.getSimpleName(); String sname = Adapter.class.getSimpleName();
...@@ -452,14 +451,15 @@ class genclasses { ...@@ -452,14 +451,15 @@ class genclasses {
static String[] TCHARS = { "L", "I", "J", "F", "D", "A" }; static String[] TCHARS = { "L", "I", "J", "F", "D", "A" };
static String[][] TEMPLATES = { { static String[][] TEMPLATES = { {
"@for@ arity=0..3 rcat<=4 nrefs<=99 nints<=99 nlongs<=99", "@for@ arity=0..3 rcat<=4 nrefs<=99 nints<=99 nlongs<=99",
"@for@ arity=4..5 rcat<=2 nrefs<=99 nints<=99 nlongs<=99", "@for@ arity=4..4 rcat<=4 nrefs<=99 nints<=99 nlongs<=99",
"@for@ arity=5..5 rcat<=2 nrefs<=99 nints<=99 nlongs<=99",
"@for@ arity=6..10 rcat<=2 nrefs<=99 nints=0 nlongs<=99", "@for@ arity=6..10 rcat<=2 nrefs<=99 nints=0 nlongs<=99",
" //@each-cat@", " //@each-cat@",
" static class @cat@ extends Adapter {", " static class @cat@ extends Adapter {",
" protected @cat@(MethodHandle entryPoint) { super(entryPoint); } // to build prototype", " protected @cat@(MethodHandle entryPoint) { super(entryPoint); } // to build prototype",
" protected @cat@(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); }", " protected @cat@(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); }",
" protected @cat@ makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new @cat@(e, i, c, t); }", " protected @cat@ makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new @cat@(e, i, c, t); }",
" protected Object target(@Ovav@) throws Throwable { return invoker.invokeExact(target, @av@); }", " protected Object target(@Ovav@) throws Throwable { return invoker.invokeExact(target@comma@@av@); }",
" //@each-Tv@", " //@each-Tv@",
" protected Object target@cat@(@Tvav@) throws Throwable { return target(@av@); }", " protected Object target@cat@(@Tvav@) throws Throwable { return target(@av@); }",
" //@end-Tv@", " //@end-Tv@",
...@@ -471,7 +471,7 @@ class genclasses { ...@@ -471,7 +471,7 @@ class genclasses {
" }", " }",
} }; } };
enum VAR { enum VAR {
cat, R, Rc, Tv, av, Tvav, Ovav; cat, R, Rc, Tv, av, comma, Tvav, Ovav;
public final String pattern = "@"+toString().replace('_','.')+"@"; public final String pattern = "@"+toString().replace('_','.')+"@";
public String binding; public String binding;
static void makeBindings(boolean topLevel, int rcat, int nrefs, int nints, int nlongs) { static void makeBindings(boolean topLevel, int rcat, int nrefs, int nints, int nlongs) {
...@@ -493,12 +493,13 @@ class genclasses { ...@@ -493,12 +493,13 @@ class genclasses {
} }
VAR.Tv.binding = comma(Tv); VAR.Tv.binding = comma(Tv);
VAR.av.binding = comma(av); VAR.av.binding = comma(av);
VAR.comma.binding = (av.length == 0 ? "" : ", ");
VAR.Tvav.binding = comma(Tvav); VAR.Tvav.binding = comma(Tvav);
VAR.Ovav.binding = comma(Ovav); VAR.Ovav.binding = comma(Ovav);
} }
static String arg(int i) { return "a"+i; } static String arg(int i) { return "a"+i; }
static String param(String t, String a) { return t+" "+a; } static String param(String t, String a) { return t+" "+a; }
static String comma(String[] v) { return comma(v, ""); } static String comma(String[] v) { return comma("", v); }
static String comma(String sep, String[] v) { static String comma(String sep, String[] v) {
if (v.length == 0) return ""; if (v.length == 0) return "";
String res = sep+v[0]; String res = sep+v[0];
...@@ -735,7 +736,7 @@ class genclasses { ...@@ -735,7 +736,7 @@ class genclasses {
protected float invoke_F(long a0, long a1, long a2) throws Throwable { return return_F(targetA3(a0, a1, a2)); } protected float invoke_F(long a0, long a1, long a2) throws Throwable { return return_F(targetA3(a0, a1, a2)); }
protected double invoke_D(long a0, long a1, long a2) throws Throwable { return return_D(targetA3(a0, a1, a2)); } protected double invoke_D(long a0, long a1, long a2) throws Throwable { return return_D(targetA3(a0, a1, a2)); }
} }
//params=[4, 5, 2, 99, 99, 99] //params=[4, 4, 4, 99, 99, 99]
static class A4 extends Adapter { static class A4 extends Adapter {
protected A4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
protected A4(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A4(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); }
...@@ -753,31 +754,50 @@ class genclasses { ...@@ -753,31 +754,50 @@ class genclasses {
protected Object invoke_L(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(Object a0, Object a1, Object a2, Object a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(Object a0, Object a1, Object a2, int a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(Object a0, Object a1, int a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(Object a0, Object a1, int a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(Object a0, Object a1, int a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(Object a0, Object a1, int a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(Object a0, Object a1, int a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(Object a0, Object a1, int a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(Object a0, Object a1, int a2, int a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(Object a0, Object a1, int a2, int a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(Object a0, int a1, int a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(Object a0, int a1, int a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(Object a0, int a1, int a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(Object a0, int a1, int a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(Object a0, int a1, int a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(Object a0, int a1, int a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(Object a0, int a1, int a2, int a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(Object a0, int a1, int a2, int a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(int a0, int a1, int a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(int a0, int a1, int a2, int a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(int a0, int a1, int a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(int a0, int a1, int a2, int a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(int a0, int a1, int a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(int a0, int a1, int a2, int a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(int a0, int a1, int a2, int a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(int a0, int a1, int a2, int a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(Object a0, Object a1, Object a2, long a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(Object a0, Object a1, long a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(Object a0, Object a1, long a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(Object a0, Object a1, long a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(Object a0, Object a1, long a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(Object a0, Object a1, long a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(Object a0, Object a1, long a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(Object a0, Object a1, long a2, long a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(Object a0, Object a1, long a2, long a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(Object a0, long a1, long a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(Object a0, long a1, long a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(Object a0, long a1, long a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(Object a0, long a1, long a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(Object a0, long a1, long a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(Object a0, long a1, long a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(Object a0, long a1, long a2, long a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(Object a0, long a1, long a2, long a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
protected Object invoke_L(long a0, long a1, long a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); } protected Object invoke_L(long a0, long a1, long a2, long a3) throws Throwable { return return_L(targetA4(a0, a1, a2, a3)); }
protected int invoke_I(long a0, long a1, long a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); } protected int invoke_I(long a0, long a1, long a2, long a3) throws Throwable { return return_I(targetA4(a0, a1, a2, a3)); }
protected long invoke_J(long a0, long a1, long a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); } protected long invoke_J(long a0, long a1, long a2, long a3) throws Throwable { return return_J(targetA4(a0, a1, a2, a3)); }
protected float invoke_F(long a0, long a1, long a2, long a3) throws Throwable { return return_F(targetA4(a0, a1, a2, a3)); }
protected double invoke_D(long a0, long a1, long a2, long a3) throws Throwable { return return_D(targetA4(a0, a1, a2, a3)); }
} }
//params=[5, 5, 2, 99, 99, 99]
static class A5 extends Adapter { static class A5 extends Adapter {
protected A5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype
protected A5(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A5(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); }
......
src/share/classes/java/dyn/VolatileCallSite.java → src/share/classes/java/lang/invoke/VolatileCallSite.java
浏览文件 @ 33ee9ccf
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
import java.util.List;
/** /**
* A {@code VolatileCallSite} is a {@link CallSite} whose target acts like a volatile variable. * A {@code VolatileCallSite} is a {@link CallSite} whose target acts like a volatile variable.
......
src/share/classes/java/dyn/WrongMethodTypeException.java → src/share/classes/java/lang/invoke/WrongMethodTypeException.java
浏览文件 @ 33ee9ccf
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package java.dyn; package java.lang.invoke;
/** /**
* Thrown to indicate that code has attempted to call a method handle * Thrown to indicate that code has attempted to call a method handle
......
src/share/classes/java/dyn/package-info.java → src/share/classes/java/lang/invoke/package-info.java
浏览文件 @ 33ee9ccf
...@@ -27,21 +27,18 @@ ...@@ -27,21 +27,18 @@
* The {@code java.lang.invoke} package contains dynamic language support provided directly by * The {@code java.lang.invoke} package contains dynamic language support provided directly by
* the Java core class libraries and virtual machine. * the Java core class libraries and virtual machine.
* *
* <p style="font-size:smaller;">
* <em>Historic Note:</em> In some early versions of Java SE 7,
* the name of this package is {@code java.dyn}.
* <p> * <p>
* Certain types in this package have special relations to dynamic * Certain types in this package have special relations to dynamic
* language support in the virtual machine: * language support in the virtual machine:
* <ul> * <ul>
* <li>The class {@link java.dyn.MethodHandle MethodHandle} contains * <li>The class {@link java.lang.invoke.MethodHandle MethodHandle} contains
* <a href="MethodHandle.html#sigpoly">signature polymorphic methods</a> * <a href="MethodHandle.html#sigpoly">signature polymorphic methods</a>
* which can be linked regardless of their type descriptor. * which can be linked regardless of their type descriptor.
* Normally, method linkage requires exact matching of type descriptors. * Normally, method linkage requires exact matching of type descriptors.
* </li> * </li>
* *
* <li>The JVM bytecode format supports immediate constants of * <li>The JVM bytecode format supports immediate constants of
* the classes {@link java.dyn.MethodHandle MethodHandle} and {@link java.dyn.MethodType MethodType}. * the classes {@link java.lang.invoke.MethodHandle MethodHandle} and {@link java.lang.invoke.MethodType MethodType}.
* </li> * </li>
* </ul> * </ul>
* *
...@@ -59,7 +56,7 @@ ...@@ -59,7 +56,7 @@
* with tag {@code CONSTANT_InvokeDynamic} (decimal 18). See below for its format. * with tag {@code CONSTANT_InvokeDynamic} (decimal 18). See below for its format.
* The entry specifies the following information: * The entry specifies the following information:
* <ul> * <ul>
* <li>a bootstrap method (a {@link java.dyn.MethodHandle MethodHandle} constant)</li> * <li>a bootstrap method (a {@link java.lang.invoke.MethodHandle MethodHandle} constant)</li>
* <li>the dynamic invocation name (a UTF8 string)</li> * <li>the dynamic invocation name (a UTF8 string)</li>
* <li>the argument and return types of the call (encoded as a type descriptor in a UTF8 string)</li> * <li>the argument and return types of the call (encoded as a type descriptor in a UTF8 string)</li>
* <li>optionally, a sequence of additional <em>static arguments</em> to the bootstrap method ({@code ldc}-type constants)</li> * <li>optionally, a sequence of additional <em>static arguments</em> to the bootstrap method ({@code ldc}-type constants)</li>
...@@ -75,11 +72,6 @@ ...@@ -75,11 +72,6 @@
* A dynamic call site is linked by means of a bootstrap method, * A dynamic call site is linked by means of a bootstrap method,
* as <a href="#bsm">described below</a>. * as <a href="#bsm">described below</a>.
* *
* <p style="font-size:smaller;">
* <em>Historic Note:</em> Some older JVMs may allow the index of a {@code CONSTANT_NameAndType}
* instead of a {@code CONSTANT_InvokeDynamic}. In earlier, obsolete versions of this API, the
* bootstrap method was specified dynamically, in a per-class basis, during class initialization.
*
* <h3><a name="indycon"></a>constant pool entries for {@code invokedynamic} instructions</h3> * <h3><a name="indycon"></a>constant pool entries for {@code invokedynamic} instructions</h3>
* If a constant pool entry has the tag {@code CONSTANT_InvokeDynamic} (decimal 18), * If a constant pool entry has the tag {@code CONSTANT_InvokeDynamic} (decimal 18),
* it must contain exactly four more bytes after the tag. * it must contain exactly four more bytes after the tag.
...@@ -95,20 +87,20 @@ ...@@ -95,20 +87,20 @@
* except that the bootstrap method specifier reference replaces * except that the bootstrap method specifier reference replaces
* the {@code CONSTANT_Class} reference of a {@code CONSTANT_Methodref} entry. * the {@code CONSTANT_Class} reference of a {@code CONSTANT_Methodref} entry.
* *
* <h3><a name="mtcon"></a>constant pool entries for {@linkplain java.dyn.MethodType method types}</h3> * <h3><a name="mtcon"></a>constant pool entries for {@linkplain java.lang.invoke.MethodType method types}</h3>
* If a constant pool entry has the tag {@code CONSTANT_MethodType} (decimal 16), * If a constant pool entry has the tag {@code CONSTANT_MethodType} (decimal 16),
* it must contain exactly two more bytes, which must be an index to a {@code CONSTANT_Utf8} * it must contain exactly two more bytes, which must be an index to a {@code CONSTANT_Utf8}
* entry which represents a method type descriptor. * entry which represents a method type descriptor.
* <p> * <p>
* The JVM will ensure that on first * The JVM will ensure that on first
* execution of an {@code ldc} instruction for this entry, a {@link java.dyn.MethodType MethodType} * execution of an {@code ldc} instruction for this entry, a {@link java.lang.invoke.MethodType MethodType}
* will be created which represents the type descriptor. * will be created which represents the type descriptor.
* Any classes mentioned in the {@code MethodType} will be loaded if necessary, * Any classes mentioned in the {@code MethodType} will be loaded if necessary,
* but not initialized. * but not initialized.
* Access checking and error reporting is performed exactly as it is for * Access checking and error reporting is performed exactly as it is for
* references by {@code ldc} instructions to {@code CONSTANT_Class} constants. * references by {@code ldc} instructions to {@code CONSTANT_Class} constants.
* *
* <h3><a name="mhcon"></a>constant pool entries for {@linkplain java.dyn.MethodHandle method handles}</h3> * <h3><a name="mhcon"></a>constant pool entries for {@linkplain java.lang.invoke.MethodHandle method handles}</h3>
* If a constant pool entry has the tag {@code CONSTANT_MethodHandle} (decimal 15), * If a constant pool entry has the tag {@code CONSTANT_MethodHandle} (decimal 15),
* it must contain exactly three more bytes. The first byte after the tag is a subtag * it must contain exactly three more bytes. The first byte after the tag is a subtag
* value which must be in the range 1 through 9, and the last two must be an index to a * value which must be in the range 1 through 9, and the last two must be an index to a
...@@ -119,7 +111,7 @@ ...@@ -119,7 +111,7 @@
* must agree according to the table below. * must agree according to the table below.
* <p> * <p>
* The JVM will ensure that on first execution of an {@code ldc} instruction * The JVM will ensure that on first execution of an {@code ldc} instruction
* for this entry, a {@link java.dyn.MethodHandle MethodHandle} will be created which represents * for this entry, a {@link java.lang.invoke.MethodHandle MethodHandle} will be created which represents
* the field or method reference, according to the specific mode implied by the subtag. * the field or method reference, according to the specific mode implied by the subtag.
* <p> * <p>
* As with {@code CONSTANT_Class} and {@code CONSTANT_MethodType} constants, * As with {@code CONSTANT_Class} and {@code CONSTANT_MethodType} constants,
...@@ -135,23 +127,23 @@ ...@@ -135,23 +127,23 @@
* <table border=1 cellpadding=5 summary="CONSTANT_MethodHandle subtypes"> * <table border=1 cellpadding=5 summary="CONSTANT_MethodHandle subtypes">
* <tr><th>N</th><th>subtag name</th><th>member</th><th>MH type</th><th>bytecode behavior</th><th>lookup expression</th></tr> * <tr><th>N</th><th>subtag name</th><th>member</th><th>MH type</th><th>bytecode behavior</th><th>lookup expression</th></tr>
* <tr><td>1</td><td>REF_getField</td><td>C.f:T</td><td>(C)T</td><td>getfield C.f:T</td> * <tr><td>1</td><td>REF_getField</td><td>C.f:T</td><td>(C)T</td><td>getfield C.f:T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findGetter findGetter(C.class,"f",T.class)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findGetter findGetter(C.class,"f",T.class)}</td></tr>
* <tr><td>2</td><td>REF_getStatic</td><td>C.f:T</td><td>(&nbsp;)T</td><td>getstatic C.f:T</td> * <tr><td>2</td><td>REF_getStatic</td><td>C.f:T</td><td>(&nbsp;)T</td><td>getstatic C.f:T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findStaticGetter findStaticGetter(C.class,"f",T.class)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findStaticGetter findStaticGetter(C.class,"f",T.class)}</td></tr>
* <tr><td>3</td><td>REF_putField</td><td>C.f:T</td><td>(C,T)void</td><td>putfield C.f:T</td> * <tr><td>3</td><td>REF_putField</td><td>C.f:T</td><td>(C,T)void</td><td>putfield C.f:T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findSetter findSetter(C.class,"f",T.class)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findSetter findSetter(C.class,"f",T.class)}</td></tr>
* <tr><td>4</td><td>REF_putStatic</td><td>C.f:T</td><td>(T)void</td><td>putstatic C.f:T</td> * <tr><td>4</td><td>REF_putStatic</td><td>C.f:T</td><td>(T)void</td><td>putstatic C.f:T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findStaticSetter findStaticSetter(C.class,"f",T.class)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findStaticSetter findStaticSetter(C.class,"f",T.class)}</td></tr>
* <tr><td>5</td><td>REF_invokeVirtual</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokevirtual C.m(A*)T</td> * <tr><td>5</td><td>REF_invokeVirtual</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokevirtual C.m(A*)T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findVirtual findVirtual(C.class,"m",MT)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findVirtual findVirtual(C.class,"m",MT)}</td></tr>
* <tr><td>6</td><td>REF_invokeStatic</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokestatic C.m(A*)T</td> * <tr><td>6</td><td>REF_invokeStatic</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokestatic C.m(A*)T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findStatic findStatic(C.class,"m",MT)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findStatic findStatic(C.class,"m",MT)}</td></tr>
* <tr><td>7</td><td>REF_invokeSpecial</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokespecial C.m(A*)T</td> * <tr><td>7</td><td>REF_invokeSpecial</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokespecial C.m(A*)T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findSpecial findSpecial(C.class,"m",MT,this.class)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findSpecial findSpecial(C.class,"m",MT,this.class)}</td></tr>
* <tr><td>8</td><td>REF_newInvokeSpecial</td><td>C.&lt;init&gt;(A*)void</td><td>(A*)C</td><td>new C; dup; invokespecial C.&lt;init&gt;(A*)void</td> * <tr><td>8</td><td>REF_newInvokeSpecial</td><td>C.&lt;init&gt;(A*)void</td><td>(A*)C</td><td>new C; dup; invokespecial C.&lt;init&gt;(A*)void</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findConstructor findConstructor(C.class,MT)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findConstructor findConstructor(C.class,MT)}</td></tr>
* <tr><td>9</td><td>REF_invokeInterface</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokeinterface C.m(A*)T</td> * <tr><td>9</td><td>REF_invokeInterface</td><td>C.m(A*)T</td><td>(C,A*)T</td><td>invokeinterface C.m(A*)T</td>
* <td>{@linkplain java.dyn.MethodHandles.Lookup#findVirtual findVirtual(C.class,"m",MT)}</td></tr> * <td>{@linkplain java.lang.invoke.MethodHandles.Lookup#findVirtual findVirtual(C.class,"m",MT)}</td></tr>
* </table> * </table>
* </code> * </code>
* Here, the type {@code C} is taken from the {@code CONSTANT_Class} reference associated * Here, the type {@code C} is taken from the {@code CONSTANT_Class} reference associated
...@@ -169,7 +161,7 @@ ...@@ -169,7 +161,7 @@
* and returns the same result (if any) as the corresponding <em>bytecode behavior</em>. * and returns the same result (if any) as the corresponding <em>bytecode behavior</em>.
* <p> * <p>
* Each method handle constant also has an equivalent reflective <em>lookup expression</em>, * Each method handle constant also has an equivalent reflective <em>lookup expression</em>,
* which is a query to a method in {@link java.dyn.MethodHandles.Lookup}. * which is a query to a method in {@link java.lang.invoke.MethodHandles.Lookup}.
* In the example lookup method expression given in the table above, the name {@code MT} * In the example lookup method expression given in the table above, the name {@code MT}
* stands for a {@code MethodType} built from {@code T} and the sequence of argument types {@code A*}. * stands for a {@code MethodType} built from {@code T} and the sequence of argument types {@code A*}.
* (Note that the type {@code C} is not prepended to the query type {@code MT} even if the member is non-static.) * (Note that the type {@code C} is not prepended to the query type {@code MT} even if the member is non-static.)
...@@ -191,7 +183,7 @@ ...@@ -191,7 +183,7 @@
* A constant may refer to a method or constructor with the {@code varargs} * A constant may refer to a method or constructor with the {@code varargs}
* bit (hexadecimal {@code 0x0080}) set in its modifier bitmask. * bit (hexadecimal {@code 0x0080}) set in its modifier bitmask.
* The method handle constant produced for such a method behaves as if * The method handle constant produced for such a method behaves as if
* it were created by {@link java.dyn.MethodHandle#asVarargsCollector asVarargsCollector}. * it were created by {@link java.lang.invoke.MethodHandle#asVarargsCollector asVarargsCollector}.
* In other words, the constant method handle will exhibit variable arity, * In other words, the constant method handle will exhibit variable arity,
* when invoked via {@code invokeGeneric}. * when invoked via {@code invokeGeneric}.
* On the other hand, its behavior with respect to {@code invokeExact} will be the same * On the other hand, its behavior with respect to {@code invokeExact} will be the same
...@@ -225,7 +217,7 @@ ...@@ -225,7 +217,7 @@
* the call site must first be <em>linked</em>. * the call site must first be <em>linked</em>.
* Linking is accomplished by calling a <em>bootstrap method</em> * Linking is accomplished by calling a <em>bootstrap method</em>
* which is given the static information content of the call site, * which is given the static information content of the call site,
* and which must produce a {@link java.dyn.MethodHandle method handle} * and which must produce a {@link java.lang.invoke.MethodHandle method handle}
* that gives the behavior of the call site. * that gives the behavior of the call site.
* <p> * <p>
* Each {@code invokedynamic} instruction statically specifies its own * Each {@code invokedynamic} instruction statically specifies its own
...@@ -234,7 +226,7 @@ ...@@ -234,7 +226,7 @@
* just like {@code invokevirtual} and the other invoke instructions. * just like {@code invokevirtual} and the other invoke instructions.
* <p> * <p>
* Linking starts with resolving the constant pool entry for the * Linking starts with resolving the constant pool entry for the
* bootstrap method, and resolving a {@link java.dyn.MethodType MethodType} object for * bootstrap method, and resolving a {@link java.lang.invoke.MethodType MethodType} object for
* the type descriptor of the dynamic call site. * the type descriptor of the dynamic call site.
* This resolution process may trigger class loading. * This resolution process may trigger class loading.
* It may therefore throw an error if a class fails to load. * It may therefore throw an error if a class fails to load.
...@@ -251,8 +243,8 @@ ...@@ -251,8 +243,8 @@
* <li>optionally, one or more <a href="#args">additional static arguments</a> </li> * <li>optionally, one or more <a href="#args">additional static arguments</a> </li>
* </ul> * </ul>
* The method handle is then applied to the other values as if by * The method handle is then applied to the other values as if by
* {@link java.dyn.MethodHandle#invokeGeneric invokeGeneric}. * {@link java.lang.invoke.MethodHandle#invokeGeneric invokeGeneric}.
* The returned result must be a {@link java.dyn.CallSite CallSite} (or a subclass). * The returned result must be a {@link java.lang.invoke.CallSite CallSite} (or a subclass).
* The type of the call site's target must be exactly equal to the type * The type of the call site's target must be exactly equal to the type
* derived from the dynamic call site's type descriptor and passed to * derived from the dynamic call site's type descriptor and passed to
* the bootstrap method. * the bootstrap method.
...@@ -263,18 +255,12 @@ ...@@ -263,18 +255,12 @@
* For example, the first argument could be {@code Object} * For example, the first argument could be {@code Object}
* instead of {@code MethodHandles.Lookup}, and the return type * instead of {@code MethodHandles.Lookup}, and the return type
* could also be {@code Object} instead of {@code CallSite}. * could also be {@code Object} instead of {@code CallSite}.
* <p> * (Note that the types and number of the stacked arguments limit
* As with any method handle constant, a {@code varargs} modifier bit * the legal kinds of bootstrap methods to appropriately typed
* on the bootstrap method is ignored. * static methods and constructors of {@code CallSite} subclasses.)
* <p>
* Note that the first argument of the bootstrap method cannot be
* a simple {@code Class} reference. (This is a change from earlier
* versions of this specification. If the caller class is needed,
* it is easy to {@linkplain java.dyn.MethodHandles.Lookup#lookupClass() extract it}
* from the {@code Lookup} object.)
* <p> * <p>
* After resolution, the linkage process may fail in a variety of ways. * After resolution, the linkage process may fail in a variety of ways.
* All failures are reported by an {@link java.dyn.InvokeDynamicBootstrapError InvokeDynamicBootstrapError}, * All failures are reported by a {@link java.lang.BootstrapMethodError BootstrapMethodError},
* which is thrown as the abnormal termination of the dynamic call * which is thrown as the abnormal termination of the dynamic call
* site execution. * site execution.
* The following circumstances will cause this: * The following circumstances will cause this:
...@@ -290,7 +276,7 @@ ...@@ -290,7 +276,7 @@
* <li>the bootstrap method has a wrong argument or return type </li> * <li>the bootstrap method has a wrong argument or return type </li>
* <li>the bootstrap method invocation completes abnormally </li> * <li>the bootstrap method invocation completes abnormally </li>
* <li>the result from the bootstrap invocation is not a reference to * <li>the result from the bootstrap invocation is not a reference to
* an object of type {@link java.dyn.CallSite CallSite} </li> * an object of type {@link java.lang.invoke.CallSite CallSite} </li>
* <li>the target of the {@code CallSite} does not have a target of * <li>the target of the {@code CallSite} does not have a target of
* the expected {@code MethodType} </li> * the expected {@code MethodType} </li>
* </ul> * </ul>
...@@ -309,7 +295,7 @@ ...@@ -309,7 +295,7 @@
* <p> * <p>
* In an application which requires dynamic call sites with individually * In an application which requires dynamic call sites with individually
* mutable behaviors, their bootstrap methods should produce distinct * mutable behaviors, their bootstrap methods should produce distinct
* {@link java.dyn.CallSite CallSite} objects, one for each linkage request. * {@link java.lang.invoke.CallSite CallSite} objects, one for each linkage request.
* Alternatively, an application can link a single {@code CallSite} object * Alternatively, an application can link a single {@code CallSite} object
* to several {@code invokedynamic} instructions, in which case * to several {@code invokedynamic} instructions, in which case
* a change to the target method will become visible at each of * a change to the target method will become visible at each of
...@@ -322,11 +308,12 @@ ...@@ -322,11 +308,12 @@
* chosen target object. * chosen target object.
* *
* <p style="font-size:smaller;"> * <p style="font-size:smaller;">
* <em>Historic Note:</em> Unlike some previous versions of this specification, * <em>Discussion:</em>
* these rules do not enable the JVM to duplicate dynamic call sites, * These rules do not enable the JVM to duplicate dynamic call sites,
* or to issue &ldquo;causeless&rdquo; bootstrap method calls. * or to issue &ldquo;causeless&rdquo; bootstrap method calls.
* Every dynamic call site transitions at most once from unlinked to linked, * Every dynamic call site transitions at most once from unlinked to linked,
* just before its first invocation. * just before its first invocation.
* There is no way to undo the effect of a completed bootstrap method call.
* *
* <h3><a name="bsmattr">the {@code BootstrapMethods} attribute </h3> * <h3><a name="bsmattr">the {@code BootstrapMethods} attribute </h3>
* Each {@code CONSTANT_InvokeDynamic} entry contains an index which references * Each {@code CONSTANT_InvokeDynamic} entry contains an index which references
...@@ -354,7 +341,7 @@ ...@@ -354,7 +341,7 @@
* <h3><a name="args">static arguments to the bootstrap method</h3> * <h3><a name="args">static arguments to the bootstrap method</h3>
* An {@code invokedynamic} instruction specifies at least three arguments * An {@code invokedynamic} instruction specifies at least three arguments
* to pass to its bootstrap method: * to pass to its bootstrap method:
* The caller class (expressed as a {@link java.dyn.MethodHandles.Lookup Lookup object}, * The caller class (expressed as a {@link java.lang.invoke.MethodHandles.Lookup Lookup object},
* the name (extracted from the {@code CONSTANT_NameAndType} entry), * the name (extracted from the {@code CONSTANT_NameAndType} entry),
* and the type (also extracted from the {@code CONSTANT_NameAndType} entry). * and the type (also extracted from the {@code CONSTANT_NameAndType} entry).
* The {@code invokedynamic} instruction may specify additional metadata values * The {@code invokedynamic} instruction may specify additional metadata values
...@@ -382,8 +369,8 @@ ...@@ -382,8 +369,8 @@
* <tr><td>CONSTANT_Long</td><td><code>java.lang.Long</code></td><td>the indexed long value</td></tr> * <tr><td>CONSTANT_Long</td><td><code>java.lang.Long</code></td><td>the indexed long value</td></tr>
* <tr><td>CONSTANT_Float</td><td><code>java.lang.Float</code></td><td>the indexed float value</td></tr> * <tr><td>CONSTANT_Float</td><td><code>java.lang.Float</code></td><td>the indexed float value</td></tr>
* <tr><td>CONSTANT_Double</td><td><code>java.lang.Double</code></td><td>the indexed double value</td></tr> * <tr><td>CONSTANT_Double</td><td><code>java.lang.Double</code></td><td>the indexed double value</td></tr>
* <tr><td>CONSTANT_MethodHandle</td><td><code>java.dyn.MethodHandle</code></td><td>the indexed method handle constant</td></tr> * <tr><td>CONSTANT_MethodHandle</td><td><code>java.lang.invoke.MethodHandle</code></td><td>the indexed method handle constant</td></tr>
* <tr><td>CONSTANT_MethodType</td><td><code>java.dyn.MethodType</code></td><td>the indexed method type constant</td></tr> * <tr><td>CONSTANT_MethodType</td><td><code>java.lang.invoke.MethodType</code></td><td>the indexed method type constant</td></tr>
* </table> * </table>
* </code> * </code>
* <p> * <p>
...@@ -403,7 +390,7 @@ ...@@ -403,7 +390,7 @@
* then some or all of the arguments specified here may be collected into a trailing array parameter. * then some or all of the arguments specified here may be collected into a trailing array parameter.
* (This is not a special rule, but rather a useful consequence of the interaction * (This is not a special rule, but rather a useful consequence of the interaction
* between {@code CONSTANT_MethodHandle} constants, the modifier bit for variable arity methods, * between {@code CONSTANT_MethodHandle} constants, the modifier bit for variable arity methods,
* and the {@code java.dyn.MethodHandle#asVarargsCollector asVarargsCollector} transformation.) * and the {@code java.lang.invoke.MethodHandle#asVarargsCollector asVarargsCollector} transformation.)
* <p> * <p>
* Given these rules, here are examples of legal bootstrap method declarations, * Given these rules, here are examples of legal bootstrap method declarations,
* given various numbers {@code N} of extra arguments. * given various numbers {@code N} of extra arguments.
...@@ -436,7 +423,7 @@ ...@@ -436,7 +423,7 @@
* constant as an {@code Object}, but the type matching machinery of {@code invokeGeneric} * constant as an {@code Object}, but the type matching machinery of {@code invokeGeneric}
* will cast the reference back to {@code MethodHandle} before invoking the bootstrap method. * will cast the reference back to {@code MethodHandle} before invoking the bootstrap method.
* (If a string constant were passed instead, by badly generated code, that cast would then fail, * (If a string constant were passed instead, by badly generated code, that cast would then fail,
* resulting in an {@code InvokeDynamicBootstrapError}.) * resulting in a {@code BootstrapMethodError}.)
* <p> * <p>
* Extra bootstrap method arguments are intended to allow language implementors * Extra bootstrap method arguments are intended to allow language implementors
* to safely and compactly encode metadata. * to safely and compactly encode metadata.
...@@ -473,6 +460,7 @@ struct BootstrapMethods_attr { ...@@ -473,6 +460,7 @@ struct BootstrapMethods_attr {
* </pre></blockquote> * </pre></blockquote>
* *
* @author John Rose, JSR 292 EG * @author John Rose, JSR 292 EG
* @since 1.7
*/ */
package java.dyn; package java.lang.invoke;
src/share/classes/sun/dyn/Access.java 已删除 100644 → 0
浏览文件 @ a43c1c0e
/*
* Copyright (c) 2008, 2009, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package sun.dyn;
import sun.reflect.Reflection;
/**
* Access control to this package.
* Classes in other packages can attempt to acquire the access token,
* but will fail if they are not recognized as friends.
* Certain methods in this package, although public, require a non-null
* access token in order to proceed; they act like package-private methods.
* @author jrose
*/
public class Access {
private Access() { }
/**
* The heart of this pattern: The list of classes which are
* permitted to acquire the access token, and become honorary
* members of this package.
*/
private static final String[] FRIENDS = {
"java.dyn.", "sun.dyn."
};
/**
* The following object is NOT public. That's the point of the pattern.
* It is package-private, so that any member of this package
* can acquire the access token, and give it away to trusted friends.
*/
static final Access TOKEN = new Access();
/**
* @return Access.TOKEN, if the caller is a friend of this package
*/
public static Access getToken() {
Class<?> callc = Reflection.getCallerClass(2);
if (isFriend(callc))
return TOKEN;
else
throw new IllegalAccessError("bad caller: " + callc);
}
/** Is the given name the name of a class which could be our friend? */
public static boolean isFriendName(String name) {
for (String friend : FRIENDS) {
if (name.startsWith(friend))
return true;
}
return false;
}
/** Is the given class a friend? True if {@link #isFriendName},
* and the given class also shares a class loader with us.
*/
public static boolean isFriend(Class<?> c) {
return isFriendName(c.getName()) && c.getClassLoader() == CLASS_LOADER;
}
private static final ClassLoader CLASS_LOADER = Access.class.getClassLoader();
/**
* Throw an IllegalAccessError if the caller does not possess
* the Access.TOKEN.
* @param must be Access.TOKEN
*/
public static void check(Access token) {
if (token == null)
fail();
// else it must be the unique Access.TOKEN
assert(token == Access.TOKEN);
}
private static void fail() {
final int CALLER_DEPTH = 3;
// 0: Reflection.getCC, 1: this.fail, 2: Access.*, 3: caller
Class<?> callc = Reflection.getCallerClass(CALLER_DEPTH);
throw new IllegalAccessError("bad caller: " + callc);
}
static {
//sun.reflect.Reflection.registerMethodsToFilter(MH.class, "getToken");
}
}
src/share/classes/sun/dyn/CallSiteImpl.java 已删除 100644 → 0
浏览文件 @ a43c1c0e
/*
* Copyright (c) 2008, 2010, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package sun.dyn;
import java.dyn.*;
import static sun.dyn.MemberName.uncaughtException;
/**
* Parts of CallSite known to the JVM.
* @author jrose
*/
public class CallSiteImpl {
// this implements the upcall from the JVM, MethodHandleNatives.makeDynamicCallSite:
static CallSite makeSite(MethodHandle bootstrapMethod,
// Callee information:
String name, MethodType type,
// Extra arguments for BSM, if any:
Object info,
// Caller information:
MemberName callerMethod, int callerBCI) {
Class<?> callerClass = callerMethod.getDeclaringClass();
Object caller;
if (bootstrapMethod.type().parameterType(0) == Class.class && TRANSITIONAL_BEFORE_PFD)
caller = callerClass; // remove for PFD
else
caller = MethodHandleImpl.IMPL_LOOKUP.in(callerClass);
if (bootstrapMethod == null && TRANSITIONAL_BEFORE_PFD) {
// If there is no bootstrap method, throw IncompatibleClassChangeError.
// This is a valid generic error type for resolution (JLS 12.3.3).
throw new IncompatibleClassChangeError
("Class "+callerClass.getName()+" has not declared a bootstrap method for invokedynamic");
}
CallSite site;
try {
Object binding;
info = maybeReBox(info);
if (info == null) {
binding = bootstrapMethod.invokeGeneric(caller, name, type);
} else if (!info.getClass().isArray()) {
binding = bootstrapMethod.invokeGeneric(caller, name, type, info);
} else {
Object[] argv = (Object[]) info;
if (3 + argv.length > 255)
new InvokeDynamicBootstrapError("too many bootstrap method arguments");
MethodType bsmType = bootstrapMethod.type();
if (bsmType.parameterCount() == 4 && bsmType.parameterType(3) == Object[].class)
binding = bootstrapMethod.invokeGeneric(caller, name, type, argv);
else
binding = MethodHandles.spreadInvoker(bsmType, 3)
.invokeGeneric(bootstrapMethod, caller, name, type, argv);
}
//System.out.println("BSM for "+name+type+" => "+binding);
if (binding instanceof CallSite) {
site = (CallSite) binding;
} else if (binding instanceof MethodHandle && TRANSITIONAL_BEFORE_PFD) {
// Transitional!
MethodHandle target = (MethodHandle) binding;
site = new ConstantCallSite(target);
} else {
throw new ClassCastException("bootstrap method failed to produce a CallSite");
}
if (TRANSITIONAL_BEFORE_PFD)
PRIVATE_INITIALIZE_CALL_SITE.invokeExact(site, name, type,
callerMethod, callerBCI);
assert(site.getTarget() != null);
assert(site.getTarget().type().equals(type));
} catch (Throwable ex) {
InvokeDynamicBootstrapError bex;
if (ex instanceof InvokeDynamicBootstrapError)
bex = (InvokeDynamicBootstrapError) ex;
else
bex = new InvokeDynamicBootstrapError("call site initialization exception", ex);
throw bex;
}
return site;
}
private static boolean TRANSITIONAL_BEFORE_PFD = true; // FIXME: remove for PFD
private static Object maybeReBox(Object x) {
if (x instanceof Integer) {
int xi = (int) x;
if (xi == (byte) xi)
x = xi; // must rebox; see JLS 5.1.7
return x;
} else if (x instanceof Object[]) {
Object[] xa = (Object[]) x;
for (int i = 0; i < xa.length; i++) {
if (xa[i] instanceof Integer)
xa[i] = maybeReBox(xa[i]);
}
return xa;
} else {
return x;
}
}
// This method is private in CallSite because it touches private fields in CallSite.
// These private fields (vmmethod, vmindex) are specific to the JVM.
private static final MethodHandle PRIVATE_INITIALIZE_CALL_SITE;
static {
try {
PRIVATE_INITIALIZE_CALL_SITE =
!TRANSITIONAL_BEFORE_PFD ? null :
MethodHandleImpl.IMPL_LOOKUP.findVirtual(CallSite.class, "initializeFromJVM",
MethodType.methodType(void.class,
String.class, MethodType.class,
MemberName.class, int.class));
} catch (ReflectiveOperationException ex) {
throw uncaughtException(ex);
}
}
public static void setCallSiteTarget(Access token, CallSite site, MethodHandle target) {
Access.check(token);
MethodHandleNatives.setCallSiteTarget(site, target);
}
}
test/java/lang/invoke/6987555/Test6987555.java 0 → 100644
浏览文件 @ 33ee9ccf
此差异已折叠。
test/java/lang/invoke/6991596/Test6991596.java 0 → 100644
浏览文件 @ 33ee9ccf
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或