OpenJDK / mlvm / mlvm / jdk
changeset 406:8bf7abfe2a9d
meth: move misc. doc clarification into the big patch
| author | jrose |
|---|---|
| date | Fri, 13 Jul 2012 02:32:02 -0700 |
| parents | 8e60c519b9f8 |
| children | 22468f6f518d |
| files | meth-lazy-7023639.patch meth.patch |
| diffstat | 2 files changed, 17 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/meth-lazy-7023639.patch Fri Jul 13 02:18:29 2012 -0700 +++ b/meth-lazy-7023639.patch Fri Jul 13 02:32:02 2012 -0700 @@ -10493,6 +10493,23 @@ + } + } +diff --git a/src/share/classes/java/lang/invoke/package-info.java b/src/share/classes/java/lang/invoke/package-info.java +--- a/src/share/classes/java/lang/invoke/package-info.java ++++ b/src/share/classes/java/lang/invoke/package-info.java +@@ -191,6 +191,13 @@ + * (If a string constant were passed instead, by badly generated code, that cast would then fail, + * resulting in a {@code BootstrapMethodError}.) + * <p> ++ * Note that, as a consequence of the above rules, the bootstrap method may accept a primitive ++ * argument, if it can be represented by a constant pool entry. ++ * However, arguments of type {@code boolean}, {@code byte}, {@code short}, or {@code char} ++ * cannot be created for bootstrap methods, since such constants cannot be directly ++ * represented in the constant pool, and the invocation of the bootstrap method will ++ * not perform the necessary narrowing primitive conversions. ++ * <p> + * Extra bootstrap method arguments are intended to allow language implementors + * to safely and compactly encode metadata. + * In principle, the name and extra arguments are redundant, diff --git a/src/share/classes/sun/invoke/util/ValueConversions.java b/src/share/classes/sun/invoke/util/ValueConversions.java --- a/src/share/classes/sun/invoke/util/ValueConversions.java +++ b/src/share/classes/sun/invoke/util/ValueConversions.java
--- a/meth.patch Fri Jul 13 02:18:29 2012 -0700 +++ b/meth.patch Fri Jul 13 02:32:02 2012 -0700 @@ -1,32 +1,2 @@ # Unsorted changes to method handles are entrained here. -diff --git a/make/Makefile b/make/Makefile ---- a/make/Makefile -+++ b/make/Makefile -@@ -241,7 +241,9 @@ - SUBDIRS_misc += altclasses - endif - -+ifneq ($(BUILD_JDK_SUBDIRS),false) - include $(BUILDDIR)/common/Subdirs.gmk -+endif - - all build:: - $(SUBDIRS-loop) -diff --git a/src/share/classes/java/lang/invoke/package-info.java b/src/share/classes/java/lang/invoke/package-info.java ---- a/src/share/classes/java/lang/invoke/package-info.java -+++ b/src/share/classes/java/lang/invoke/package-info.java -@@ -191,6 +191,13 @@ - * (If a string constant were passed instead, by badly generated code, that cast would then fail, - * resulting in a {@code BootstrapMethodError}.) - * <p> -+ * Note that, as a consequence of the above rules, the bootstrap method may accept a primitive -+ * argument, if it can be represented by a constant pool entry. -+ * However, arguments of type {@code boolean}, {@code byte}, {@code short}, or {@code char} -+ * cannot be created for bootstrap methods, since such constants cannot be directly -+ * represented in the constant pool, and the invocation of the bootstrap method will -+ * not perform the necessary narrowing primitive conversions. -+ * <p> - * Extra bootstrap method arguments are intended to allow language implementors - * to safely and compactly encode metadata. - * In principle, the name and extra arguments are redundant,