| author | lana |
| Thu, 08 Jul 2010 11:28:01 -0700 | |
| changeset 5945 | 873dcaf7fa0a |
| parent 5944 | 1041870341a8 (current diff) |
| parent 5859 | 2d6ba7a22191 (diff) |
| child 5946 | 5330f39cf637 |
| child 6099 | b86331187c24 |
--- a/.hgtags Wed Jul 07 14:20:22 2010 +0400 +++ b/.hgtags Thu Jul 08 11:28:01 2010 -0700 @@ -71,3 +71,6 @@ 8bb281f0f91582104d65d032be22522bfd2d8110 jdk7-b94 654298d26561b76dfe3cfcffbbd7078080837300 jdk7-b95 d260f892491e040ae385a8e6df59557a7d721abf jdk7-b96 +7e406ebed9a5968b584f3c3e6b60893b5d6d9741 jdk7-b97 +db6e660120446c407e2d908d52ec046592b21726 jdk7-b98 +c4c8a5bc54f66abc68cd185d9294042121922154 jdk7-b99
--- a/.hgtags-top-repo Wed Jul 07 14:20:22 2010 +0400 +++ b/.hgtags-top-repo Thu Jul 08 11:28:01 2010 -0700 @@ -71,3 +71,6 @@ d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94 fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95 cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96 +5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97 +6cea9984d73d74de0cd01f30d07ac0a1ed196117 jdk7-b98 +e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99
--- a/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 @@ -29,10 +29,6 @@ TOPDIR:=. endif -ifndef CONTROL_TOPDIR - CONTROL_TOPDIR=$(TOPDIR) -endif - # Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true) OPENJDK_SOURCETREE=$(TOPDIR)/openjdk OPENJDK_BUILDDIR:=$(shell \ @@ -120,7 +116,7 @@ all_product_build:: @$(FINISH_ECHO) -# Generis build of basic repo series +# Generic build of basic repo series generic_build_repo_series:: $(MKDIR) -p $(OUTPUTDIR) $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image @@ -179,11 +175,15 @@ # The install process needs to know what the DEBUG_NAME is, so # look for INSTALL_DEBUG_NAME in the install rules. # +# NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME). +# Due to the use of short paths in $(ABS_OUTPUTDIR), this may +# not be the same location. +# # Location of fresh bootdir output ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/j2sdk-image -FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME)/j2sdk-image +FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME)/j2sdk-image create_fresh_product_bootdir: FRC @$(START_ECHO) @@ -248,10 +248,14 @@ generic_build_repo_series @$(FINISH_ECHO) +# NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME). +# Due to the use of short paths in $(ABS_OUTPUTDIR), this may +# not be the same location. + generic_debug_build: @$(START_ECHO) $(MAKE) \ - ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)-$(DEBUG_NAME) \ + ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME) \ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ $(BOOT_CYCLE_DEBUG_SETTINGS) \ @@ -348,8 +352,8 @@ clobber:: $(RM) -r $(OUTPUTDIR)/* - $(RM) -r $(OUTPUTDIR)-debug/* - $(RM) -r $(OUTPUTDIR)-fastdebug/* + $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/* + $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/* -($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE)) clean: clobber @@ -551,6 +555,56 @@ endif ################################################################ +# rule to test +################################################################ + +.NOTPARALLEL: test + +test: test_clean test_start test_summary + +test_start: + @$(ECHO) "Tests started at `$(DATE)`" + +test_clean: + $(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt + +test_summary: $(OUTPUTDIR)/test_failures.txt + @$(ECHO) "#################################################" + @$(ECHO) "Tests completed at `$(DATE)`" + @( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \ + || $(ECHO) "No TEST STATS seen in log" ) + @$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt" + @$(ECHO) "#################################################" + @if [ -s $< ] ; then \ + $(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \ + $(CAT) $<; \ + exit 1; \ + else \ + $(ECHO) "Success! No failures detected"; \ + fi + +# Get failure list from log +$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt + @$(RM) $@ + @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@ + +# Get log file of all tests run +JDK_TO_TEST := $(shell \ + if [ -d "$(ABS_OUTPUTDIR)/j2sdk-image" ] ; then \ + $(ECHO) "$(ABS_OUTPUTDIR)/j2sdk-image"; \ + elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then \ + $(ECHO) "$(ABS_OUTPUTDIR)"; \ + elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then \ + $(ECHO) "$(PRODUCT_HOME)"; \ + fi \ +) +$(OUTPUTDIR)/test_log.txt: + $(RM) $@ + ( $(CD) test && \ + $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \ + ) | tee $@ + +################################################################ # JPRT rule to build ################################################################ @@ -560,7 +614,7 @@ # PHONY ################################################################ -.PHONY: all \ +.PHONY: all test test_start test_summary test_clean \ generic_build_repo_series \ what clobber insane \ dev dev-build dev-sanity dev-clobber \
--- a/README-builds.html Wed Jul 07 14:20:22 2010 +0400 +++ b/README-builds.html Thu Jul 08 11:28:01 2010 -0700 @@ -65,8 +65,9 @@ <li><a href="#cacerts">Certificate Authority File (cacert)</a> </li> <li><a href="#compilers">Compilers</a> <ul> - <li><a href="#msvc">Microsoft Visual Studio</a> </li> - <li><a href="#mssdk">Microsoft Platform SDK</a> </li> + <li><a href="#msvc32">Microsoft Visual Studio Professional/Express for 32 bit</a> </li> + <li><a href="#msvc64">Microsoft Visual Studio Professional for 64 bit</a> </li> + <li><a href="#mssdk64">Microsoft Windows SDK for 64 bit</a> </li> <li><a href="#gcc">Linux gcc/binutils</a> </li> <li><a href="#studio">Sun Studio</a> </li> </ul> @@ -789,11 +790,11 @@ </li> <li> Install the - <a href="#msvc">Microsoft Visual Studio Compilers</a>). + <a href="#msvc32">Microsoft Visual Studio Compilers</a>). </li> <li> Setup all environment variables for compilers - (see <a href="#msvc">compilers</a>). + (see <a href="#msvc32">compilers</a>). </li> <li> Install @@ -958,7 +959,7 @@ are also an option, although these compilers have not been extensively used yet. </blockquote> - <strong><a name="msvc">Windows i586: Microsoft Visual Studio Compilers</a></strong> + <strong><a name="msvc32">Windows i586: Microsoft Visual Studio 2010 Compilers</a></strong> <blockquote> <p> <b>BEGIN WARNING</b>: At this time (Spring/Summer 2010) JDK 7 is starting a transition to @@ -971,14 +972,13 @@ We do not guarantee that VS2008 will work, although there is sufficient makefile support to make at least basic JDK builds plausible. Visual Studio 2010 Express compilers are now able to build all the -open source repositories, but this is 32 bit only, since -we have not yet seen the 7.1 Windows SDK with the 64 bit -compilers. <b>END WARNING.</b> +open source repositories, but this is 32 bit only. To build 64 bit +Windows binaries use the the 7.1 Windows SDK.<b>END WARNING.</b> <p> The 32-bit OpenJDK Windows build requires Microsoft Visual Studio C++ 2010 (VS2010) Professional - Edition compiler. + Edition or Express compiler. The compiler and other tools are expected to reside in the location defined by the variable <tt>VS100COMNTOOLS</tt> which @@ -1001,14 +1001,33 @@ The path <tt>/usr/bin</tt> must be after the path to the Visual Studio product. </blockquote> - <strong><a name="mssdk">Windows x64: Microsoft Visual Studio Compilers</a></strong> + <strong><a name="msvc64">Windows x64: Microsoft Visual Studio 2010 Professional Compiler</a></strong> <blockquote> - On <b>X64</b>, the set up is much the same in VS2010 + For <b>X64</b>, builds, when using the VS2010 Professional + compiler, the 64 bit build set up is much the same as 32 bit except that you run <tt>amd64\VCVARS64.BAT</tt> to set the compiler environment variables. - Previously 64 builds had used the 64 bit compiler in - an unbundled Windows SDK but this is no longer necessary. + Previously 64 bit builds had used the 64 bit compiler in + an unbundled Windows SDK but this is no longer necessary if + you have VS2010 Professional. </blockquote> + <strong><a name="mssdk64">Windows x64: Microsoft Windows 7.1 SDK 64 bit compilers.</a></strong> + For a free alternative for 64 bit builds, use the 7.1 SDK. + Microsoft say that to set up your paths for this run +<pre> + c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\setenv.cmd /x64. +</pre> + What was tested is just directly setting up LIB, INCLUDE, + PATH and based on the installation directories using the + DOS short name appropriate for the system, (you will + need to set them for yours, not just blindly copy this) eg : +<pre> + set VSINSTALLDIR=c:\PROGRA~2\MICROS~1.0 + set WindowsSdkDir=c:\PROGRA~1\MICROS~1\Windows\v7.1 + set PATH=%VSINSTALLDIR%\vc\bin\amd64;%VSINSTALLDIR%\Common7\IDE;%WindowsSdkDir%\bin;%PATH% + set INCLUDE=%VSINSTALLDIR%\vc\include;%WindowsSdkDir%\include + set LIB=%VSINSTALLDIR%\vc\lib\amd64;%WindowsSdkDir%\lib\x64 +</pre> </blockquote> <!-- ------------------------------------------------------ --> <h4><a name="zip">Zip and Unzip</a></h4>
--- a/corba/.hgtags Wed Jul 07 14:20:22 2010 +0400 +++ b/corba/.hgtags Thu Jul 08 11:28:01 2010 -0700 @@ -71,3 +71,6 @@ 533c11186b44e3a02d6c5fe69a73260505fcfe5e jdk7-b94 06dbf406818c789bb586c1de4c002024cd26ecd2 jdk7-b95 edc2a2659c77dabc55cb55bb617bad89e3a05bb3 jdk7-b96 +4ec9d59374caa1e5d72fa802291b4d66955a4936 jdk7-b97 +3b99409057e4c255da946f9f540d051a5ef4ab23 jdk7-b98 +95db968660e7d87c345d5cf3dc2e3db037fb7220 jdk7-b99
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java Wed Jul 07 14:20:22 2010 +0400 +++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java Thu Jul 08 11:28:01 2010 -0700 @@ -75,7 +75,7 @@ args[1] = (arg1 != null ? arg1.toString() : "null"); args[2] = (arg2 != null ? arg2.toString() : "null"); - return java.text.MessageFormat.format(format, args); + return java.text.MessageFormat.format(format, (Object[]) args); } private static boolean resourcesInitialized = false;
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java Wed Jul 07 14:20:22 2010 +0400 +++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java Thu Jul 08 11:28:01 2010 -0700 @@ -350,7 +350,7 @@ if (useToString) { try { - cls.getDeclaredMethod( "toString", null ) ; + cls.getDeclaredMethod( "toString", (Class[])null ) ; return true ; } catch (Exception exc) { return false ;
--- a/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java Wed Jul 07 14:20:22 2010 +0400 +++ b/corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java Thu Jul 08 11:28:01 2010 -0700 @@ -108,8 +108,8 @@ try { helperClass = Class.forName( helperName, true, loader ) ; - Method idMethod = helperClass.getDeclaredMethod( "id", null ) ; - setId( (String)idMethod.invoke( null, null ) ) ; + Method idMethod = helperClass.getDeclaredMethod( "id", (Class[])null ) ; + setId( (String)idMethod.invoke( null, (Object[])null ) ) ; } catch (Exception ex) { throw wrapper.badHelperIdMethod( ex, helperName ) ; }
--- a/corba/src/share/classes/org/omg/CORBA/ORB.java Wed Jul 07 14:20:22 2010 +0400 +++ b/corba/src/share/classes/org/omg/CORBA/ORB.java Thu Jul 08 11:28:01 2010 -0700 @@ -589,7 +589,7 @@ this.getClass().getMethod("create_operation_list", argc); // OK, the method exists, so invoke it and be happy. - Object[] argx = { oper }; + java.lang.Object[] argx = { oper }; return (org.omg.CORBA.NVList)meth.invoke(this, argx); } catch( java.lang.reflect.InvocationTargetException exs ) {
--- a/corba/src/share/classes/sun/corba/Bridge.java Wed Jul 07 14:20:22 2010 +0400 +++ b/corba/src/share/classes/sun/corba/Bridge.java Thu Jul 08 11:28:01 2010 -0700 @@ -187,7 +187,7 @@ try { // Invoke the ObjectInputStream.latestUserDefinedLoader method return (ClassLoader)latestUserDefinedLoaderMethod.invoke(null, - NO_ARGS); + (Object[])NO_ARGS); } catch (InvocationTargetException ite) { Error err = new Error( "sun.corba.Bridge.latestUserDefinedLoader: " + ite ) ;
--- a/hotspot/.hgtags Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/.hgtags Thu Jul 08 11:28:01 2010 -0700 @@ -100,3 +100,6 @@ 91d861ba858daca645993a1ab6ba2fa06a8f4a5b jdk7-b95 573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 jdk7-b96 573e8ea5fd68e8e51eb6308d283ac3b3889d15e0 hs19-b02 +5f42499e57adc16380780f40541e1a66cd601891 jdk7-b97 +8a045b3f5c13eaad92ff4baf15ca671845fcad1a jdk7-b98 +6a236384a379642b5a2398e2819db9ab4e711e9b jdk7-b99
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,8 +42,6 @@ private static CIntegerField instructionsOffsetField; private static CIntegerField frameCompleteOffsetField; private static CIntegerField dataOffsetField; - private static CIntegerField oopsOffsetField; - private static CIntegerField oopsLengthField; private static CIntegerField frameSizeField; private static AddressField oopMapsField; @@ -72,8 +70,6 @@ frameCompleteOffsetField = type.getCIntegerField("_frame_complete_offset"); instructionsOffsetField = type.getCIntegerField("_instructions_offset"); dataOffsetField = type.getCIntegerField("_data_offset"); - oopsOffsetField = type.getCIntegerField("_oops_offset"); - oopsLengthField = type.getCIntegerField("_oops_length"); frameSizeField = type.getCIntegerField("_frame_size"); oopMapsField = type.getAddressField("_oop_maps"); @@ -131,19 +127,10 @@ return headerBegin().addOffsetTo(sizeField.getValue(addr)); } - public Address oopsBegin() { - return headerBegin().addOffsetTo(oopsOffsetField.getValue(addr)); - } - - public Address oopsEnd() { - return oopsBegin().addOffsetTo(getOopsLength()); - } - // Offsets public int getRelocationOffset() { return (int) headerSizeField.getValue(addr); } public int getInstructionsOffset() { return (int) instructionsOffsetField.getValue(addr); } public int getDataOffset() { return (int) dataOffsetField.getValue(addr); } - public int getOopsOffset() { return (int) oopsOffsetField.getValue(addr); } // Sizes public int getSize() { return (int) sizeField.getValue(addr); } @@ -157,19 +144,9 @@ // FIXME: add relocationContains public boolean instructionsContains(Address addr) { return instructionsBegin().lessThanOrEqual(addr) && instructionsEnd().greaterThan(addr); } public boolean dataContains(Address addr) { return dataBegin().lessThanOrEqual(addr) && dataEnd().greaterThan(addr); } - public boolean oopsContains(Address addr) { return oopsBegin().lessThanOrEqual(addr) && oopsEnd().greaterThan(addr); } public boolean contains(Address addr) { return instructionsContains(addr); } public boolean isFrameCompleteAt(Address a) { return instructionsContains(a) && a.minus(instructionsBegin()) >= frameCompleteOffsetField.getValue(addr); } - /** Support for oops in scopes and relocs. Note: index 0 is reserved for null. */ - public OopHandle getOopAt(int index) { - if (index == 0) return null; - if (Assert.ASSERTS_ENABLED) { - Assert.that(index > 0 && index <= getOopsLength(), "must be a valid non-zero index"); - } - return oopsBegin().getOopHandleAt((index - 1) * VM.getVM().getOopSize()); - } - // Reclamation support (really only used by the nmethods, but in order to get asserts to work // in the CodeCache they are defined virtual here) public boolean isZombie() { return false; } @@ -223,18 +200,8 @@ } protected void printComponentsOn(PrintStream tty) { - // FIXME: add relocation information tty.println(" instructions: [" + instructionsBegin() + ", " + instructionsEnd() + "), " + " data: [" + dataBegin() + ", " + dataEnd() + "), " + - " oops: [" + oopsBegin() + ", " + oopsEnd() + "), " + " frame size: " + getFrameSize()); } - - //-------------------------------------------------------------------------------- - // Internals only below this point - // - - private int getOopsLength() { - return (int) oopsLengthField.getValue(addr); - } }
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -49,6 +49,7 @@ private static CIntegerField deoptOffsetField; private static CIntegerField origPCOffsetField; private static CIntegerField stubOffsetField; + private static CIntegerField oopsOffsetField; private static CIntegerField scopesDataOffsetField; private static CIntegerField scopesPCsOffsetField; private static CIntegerField dependenciesOffsetField; @@ -98,6 +99,7 @@ deoptOffsetField = type.getCIntegerField("_deoptimize_offset"); origPCOffsetField = type.getCIntegerField("_orig_pc_offset"); stubOffsetField = type.getCIntegerField("_stub_offset"); + oopsOffsetField = type.getCIntegerField("_oops_offset"); scopesDataOffsetField = type.getCIntegerField("_scopes_data_offset"); scopesPCsOffsetField = type.getCIntegerField("_scopes_pcs_offset"); dependenciesOffsetField = type.getCIntegerField("_dependencies_offset"); @@ -141,7 +143,9 @@ public Address exceptionBegin() { return headerBegin().addOffsetTo(getExceptionOffset()); } public Address deoptBegin() { return headerBegin().addOffsetTo(getDeoptOffset()); } public Address stubBegin() { return headerBegin().addOffsetTo(getStubOffset()); } - public Address stubEnd() { return headerBegin().addOffsetTo(getScopesDataOffset()); } + public Address stubEnd() { return headerBegin().addOffsetTo(getOopsOffset()); } + public Address oopsBegin() { return headerBegin().addOffsetTo(getOopsOffset()); } + public Address oopsEnd() { return headerBegin().addOffsetTo(getScopesDataOffset()); } public Address scopesDataBegin() { return headerBegin().addOffsetTo(getScopesDataOffset()); } public Address scopesDataEnd() { return headerBegin().addOffsetTo(getScopesPCsOffset()); } public Address scopesPCsBegin() { return headerBegin().addOffsetTo(getScopesPCsOffset()); } @@ -156,6 +160,7 @@ public int constantsSize() { return (int) constantsEnd() .minus(constantsBegin()); } public int codeSize() { return (int) codeEnd() .minus(codeBegin()); } public int stubSize() { return (int) stubEnd() .minus(stubBegin()); } + public int oopsSize() { return (int) oopsEnd() .minus(oopsBegin()); } public int scopesDataSize() { return (int) scopesDataEnd() .minus(scopesDataBegin()); } public int scopesPCsSize() { return (int) scopesPCsEnd() .minus(scopesPCsBegin()); } public int dependenciesSize() { return (int) dependenciesEnd().minus(dependenciesBegin()); } @@ -178,6 +183,7 @@ public boolean constantsContains (Address addr) { return constantsBegin() .lessThanOrEqual(addr) && constantsEnd() .greaterThan(addr); } public boolean codeContains (Address addr) { return codeBegin() .lessThanOrEqual(addr) && codeEnd() .greaterThan(addr); } public boolean stubContains (Address addr) { return stubBegin() .lessThanOrEqual(addr) && stubEnd() .greaterThan(addr); } + public boolean oopsContains (Address addr) { return oopsBegin() .lessThanOrEqual(addr) && oopsEnd() .greaterThan(addr); } public boolean scopesDataContains (Address addr) { return scopesDataBegin() .lessThanOrEqual(addr) && scopesDataEnd() .greaterThan(addr); } public boolean scopesPCsContains (Address addr) { return scopesPCsBegin() .lessThanOrEqual(addr) && scopesPCsEnd() .greaterThan(addr); } public boolean handlerTableContains(Address addr) { return handlerTableBegin().lessThanOrEqual(addr) && handlerTableEnd().greaterThan(addr); } @@ -187,6 +193,15 @@ public Address getEntryPoint() { return entryPointField.getValue(addr); } public Address getVerifiedEntryPoint() { return verifiedEntryPointField.getValue(addr); } + /** Support for oops in scopes and relocs. Note: index 0 is reserved for null. */ + public OopHandle getOopAt(int index) { + if (index == 0) return null; + if (Assert.ASSERTS_ENABLED) { + Assert.that(index > 0 && index <= oopsSize(), "must be a valid non-zero index"); + } + return oopsBegin().getOopHandleAt((index - 1) * VM.getVM().getOopSize()); + } + // FIXME: add interpreter_entry_point() // FIXME: add lazy_interpreter_entry_point() for C2 @@ -338,6 +353,14 @@ printOn(System.out); } + protected void printComponentsOn(PrintStream tty) { + // FIXME: add relocation information + tty.println(" instructions: [" + instructionsBegin() + ", " + instructionsEnd() + "), " + + " data: [" + dataBegin() + ", " + dataEnd() + "), " + + " oops: [" + oopsBegin() + ", " + oopsEnd() + "), " + + " frame size: " + getFrameSize()); + } + public String toString() { Method method = getMethod(); return "NMethod for " + @@ -367,6 +390,7 @@ private int getExceptionOffset() { return (int) exceptionOffsetField .getValue(addr); } private int getDeoptOffset() { return (int) deoptOffsetField .getValue(addr); } private int getStubOffset() { return (int) stubOffsetField .getValue(addr); } + private int getOopsOffset() { return (int) oopsOffsetField .getValue(addr); } private int getScopesDataOffset() { return (int) scopesDataOffsetField .getValue(addr); } private int getScopesPCsOffset() { return (int) scopesPCsOffsetField .getValue(addr); } private int getDependenciesOffset() { return (int) dependenciesOffsetField.getValue(addr); }
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java Thu Jul 08 11:28:01 2010 -0700 @@ -73,18 +73,11 @@ public CompactibleFreeListSpace(Address addr) { super(addr); - if ( VM.getVM().isLP64() ) { - heapWordSize = 8; - IndexSetStart = 1; - IndexSetStride = 1; - } - else { - heapWordSize = 4; - IndexSetStart = 2; - IndexSetStride = 2; - } - - IndexSetSize = 257; + VM vm = VM.getVM(); + heapWordSize = vm.getHeapWordSize(); + IndexSetStart = vm.getMinObjAlignmentInBytes() / heapWordSize; + IndexSetStride = IndexSetStart; + IndexSetSize = 257; } // Accessing block offset table
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java Thu Jul 08 11:28:01 2010 -0700 @@ -128,7 +128,7 @@ // Align the object size. public static long alignObjectSize(long size) { - return VM.getVM().alignUp(size, VM.getVM().getMinObjAlignment()); + return VM.getVM().alignUp(size, VM.getVM().getMinObjAlignmentInBytes()); } // All vm's align longs, so pad out certain offsets.
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Thu Jul 08 11:28:01 2010 -0700 @@ -93,6 +93,7 @@ /** alignment constants */ private boolean isLP64; private int bytesPerLong; + private int objectAlignmentInBytes; private int minObjAlignmentInBytes; private int logMinObjAlignmentInBytes; private int heapWordSize; @@ -313,9 +314,6 @@ isLP64 = debugger.getMachineDescription().isLP64(); } bytesPerLong = db.lookupIntConstant("BytesPerLong").intValue(); - minObjAlignmentInBytes = db.lookupIntConstant("MinObjAlignmentInBytes").intValue(); - // minObjAlignment = db.lookupIntConstant("MinObjAlignment").intValue(); - logMinObjAlignmentInBytes = db.lookupIntConstant("LogMinObjAlignmentInBytes").intValue(); heapWordSize = db.lookupIntConstant("HeapWordSize").intValue(); oopSize = db.lookupIntConstant("oopSize").intValue(); @@ -323,6 +321,15 @@ uintxType = db.lookupType("uintx"); boolType = (CIntegerType) db.lookupType("bool"); + minObjAlignmentInBytes = getObjectAlignmentInBytes(); + if (minObjAlignmentInBytes == 8) { + logMinObjAlignmentInBytes = 3; + } else if (minObjAlignmentInBytes == 16) { + logMinObjAlignmentInBytes = 4; + } else { + throw new RuntimeException("Object alignment " + minObjAlignmentInBytes + " not yet supported"); + } + if (isCompressedOopsEnabled()) { // Size info for oops within java objects is fixed heapOopSize = (int)getIntSize(); @@ -492,10 +499,6 @@ } /** Get minimum object alignment in bytes. */ - public int getMinObjAlignment() { - return minObjAlignmentInBytes; - } - public int getMinObjAlignmentInBytes() { return minObjAlignmentInBytes; } @@ -754,6 +757,14 @@ return compressedOopsEnabled.booleanValue(); } + public int getObjectAlignmentInBytes() { + if (objectAlignmentInBytes == 0) { + Flag flag = getCommandLineFlag("ObjectAlignmentInBytes"); + objectAlignmentInBytes = (flag == null) ? 8 : (int)flag.getIntx(); + } + return objectAlignmentInBytes; + } + // returns null, if not available. public Flag[] getCommandLineFlags() { if (commandLineFlags == null) {
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -98,7 +98,12 @@ } loc.inBlobInstructions = loc.blob.instructionsContains(a); loc.inBlobData = loc.blob.dataContains(a); - loc.inBlobOops = loc.blob.oopsContains(a); + + if (loc.blob.isNMethod()) { + NMethod nm = (NMethod) loc.blob; + loc.inBlobOops = nm.oopsContains(a); + } + loc.inBlobUnknownLocation = (!(loc.inBlobInstructions || loc.inBlobData || loc.inBlobOops));
--- a/hotspot/make/hotspot_version Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/make/hotspot_version Thu Jul 08 11:28:01 2010 -0700 @@ -35,7 +35,7 @@ HS_MAJOR_VER=19 HS_MINOR_VER=0 -HS_BUILD_NUMBER=02 +HS_BUILD_NUMBER=03 JDK_MAJOR_VER=1 JDK_MINOR_VER=7
--- a/hotspot/make/solaris/makefiles/defs.make Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/make/solaris/makefiles/defs.make Thu Jul 08 11:28:01 2010 -0700 @@ -80,12 +80,10 @@ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so - ifeq ($(ARCH),sparc) - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so - endif + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so endif EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
--- a/hotspot/make/windows/makefiles/defs.make Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/make/windows/makefiles/defs.make Thu Jul 08 11:28:01 2010 -0700 @@ -32,6 +32,17 @@ PATH_SEP = ; # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name +ifeq ($(ARCH_DATA_MODEL),32) + ARCH_DATA_MODEL=32 + PLATFORM=windows-i586 + VM_PLATFORM=windows_i486 + HS_ARCH=x86 + MAKE_ARGS += ARCH=x86 + MAKE_ARGS += BUILDARCH=i486 + MAKE_ARGS += Platform_arch=x86 + MAKE_ARGS += Platform_arch_model=x86_32 +endif + ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),) ARCH_DATA_MODEL=32 PLATFORM=windows-i586 @@ -43,43 +54,57 @@ MAKE_ARGS += Platform_arch_model=x86_32 endif -ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),) - ARCH_DATA_MODEL=64 - PLATFORM=windows-ia64 - VM_PLATFORM=windows_ia64 - HS_ARCH=ia64 - MAKE_ARGS += LP64=1 - MAKE_ARGS += ARCH=ia64 - MAKE_ARGS += BUILDARCH=ia64 - MAKE_ARGS += Platform_arch=ia64 - MAKE_ARGS += Platform_arch_model=ia64 -endif +ifneq ($(ARCH_DATA_MODEL),32) + ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),) + ARCH_DATA_MODEL=64 + PLATFORM=windows-ia64 + VM_PLATFORM=windows_ia64 + HS_ARCH=ia64 + MAKE_ARGS += LP64=1 + MAKE_ARGS += ARCH=ia64 + MAKE_ARGS += BUILDARCH=ia64 + MAKE_ARGS += Platform_arch=ia64 + MAKE_ARGS += Platform_arch_model=ia64 + endif # http://support.microsoft.com/kb/888731 : this can be either # AMD64 for AMD, or EM64T for Intel chips. -ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) - ARCH_DATA_MODEL=64 - PLATFORM=windows-amd64 - VM_PLATFORM=windows_amd64 - HS_ARCH=x86 - MAKE_ARGS += LP64=1 - MAKE_ARGS += ARCH=x86 - MAKE_ARGS += BUILDARCH=amd64 - MAKE_ARGS += Platform_arch=x86 - MAKE_ARGS += Platform_arch_model=x86_64 -endif + ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) + ARCH_DATA_MODEL=64 + PLATFORM=windows-amd64 + VM_PLATFORM=windows_amd64 + HS_ARCH=x86 + MAKE_ARGS += LP64=1 + MAKE_ARGS += ARCH=x86 + MAKE_ARGS += BUILDARCH=amd64 + MAKE_ARGS += Platform_arch=x86 + MAKE_ARGS += Platform_arch_model=x86_64 + endif + +ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),) + ARCH_DATA_MODEL=64 + PLATFORM=windows-amd64 + VM_PLATFORM=windows_amd64 + HS_ARCH=x86 + MAKE_ARGS += LP64=1 + MAKE_ARGS += ARCH=x86 + MAKE_ARGS += BUILDARCH=amd64 + MAKE_ARGS += Platform_arch=x86 + MAKE_ARGS += Platform_arch_model=x86_64 + endif # NB later OS versions than 2003 may report "Intel64" -ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),) - ARCH_DATA_MODEL=64 - PLATFORM=windows-amd64 - VM_PLATFORM=windows_amd64 - HS_ARCH=x86 - MAKE_ARGS += LP64=1 - MAKE_ARGS += ARCH=x86 - MAKE_ARGS += BUILDARCH=amd64 - MAKE_ARGS += Platform_arch=x86 - MAKE_ARGS += Platform_arch_model=x86_64 + ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),) + ARCH_DATA_MODEL=64 + PLATFORM=windows-amd64 + VM_PLATFORM=windows_amd64 + HS_ARCH=x86 + MAKE_ARGS += LP64=1 + MAKE_ARGS += ARCH=x86 + MAKE_ARGS += BUILDARCH=amd64 + MAKE_ARGS += Platform_arch=x86 + MAKE_ARGS += Platform_arch_model=x86_64 + endif endif JDK_INCLUDE_SUBDIR=win32
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -87,6 +87,7 @@ // JSR 292 fixed register usages: REGISTER_DECLARATION(Register, G5_method_type , G5); REGISTER_DECLARATION(Register, G3_method_handle , G3); +REGISTER_DECLARATION(Register, L7_mh_SP_save , L7); // The compiler requires that G5_megamorphic_method is G5_inline_cache_klass, // because a single patchable "set" instruction (NativeMovConstReg,
--- a/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -181,8 +181,8 @@ } -void FrameMap::init () { - if (_init_done) return; +void FrameMap::initialize() { + assert(!_init_done, "once"); int i=0; // Register usage: @@ -345,6 +345,13 @@ } +// JSR 292 +LIR_Opr FrameMap::method_handle_invoke_SP_save_opr() { + assert(L7 == L7_mh_SP_save, "must be same register"); + return L7_opr; +} + + bool FrameMap::validate_frame() { int max_offset = in_bytes(framesize_in_bytes()); int java_index = 0;
--- a/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -143,6 +143,3 @@ static bool is_caller_save_register (LIR_Opr reg); static bool is_caller_save_register (Register r); - - // JSR 292 - static LIR_Opr& method_handle_invoke_SP_save_opr() { return L7_opr; }
--- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -736,7 +736,8 @@ void LIR_Assembler::call(LIR_OpJavaCall* op, relocInfo::relocType rtype) { __ call(op->addr(), rtype); - // the peephole pass fills the delay slot + // The peephole pass fills the delay slot, add_call_info is done in + // LIR_Assembler::emit_delay. } @@ -745,7 +746,8 @@ __ set_oop((jobject)Universe::non_oop_word(), G5_inline_cache_reg); __ relocate(rspec); __ call(op->addr(), relocInfo::none); - // the peephole pass fills the delay slot + // The peephole pass fills the delay slot, add_call_info is done in + // LIR_Assembler::emit_delay. } @@ -766,16 +768,6 @@ } -void LIR_Assembler::preserve_SP(LIR_OpJavaCall* op) { - Unimplemented(); -} - - -void LIR_Assembler::restore_SP(LIR_OpJavaCall* op) { - Unimplemented(); -} - - // load with 32-bit displacement int LIR_Assembler::load(Register s, int disp, Register d, BasicType ld_type, CodeEmitInfo *info) { int load_offset = code_offset(); @@ -2934,7 +2926,7 @@ // we may also be emitting the call info for the instruction // which we are the delay slot of. - CodeEmitInfo * call_info = op->call_info(); + CodeEmitInfo* call_info = op->call_info(); if (call_info) { add_call_info(code_offset(), call_info); } @@ -3159,6 +3151,7 @@ tty->print_cr("delayed"); inst->at(i - 1)->print(); inst->at(i)->print(); + tty->cr(); } #endif continue; @@ -3174,8 +3167,8 @@ case lir_static_call: case lir_virtual_call: case lir_icvirtual_call: - case lir_optvirtual_call: { - LIR_Op* delay_op = NULL; + case lir_optvirtual_call: + case lir_dynamic_call: { LIR_Op* prev = inst->at(i - 1); if (LIRFillDelaySlots && prev && prev->code() == lir_move && prev->info() == NULL && (op->code() != lir_virtual_call || @@ -3192,15 +3185,14 @@ tty->print_cr("delayed"); inst->at(i - 1)->print(); inst->at(i)->print(); + tty->cr(); } #endif continue; } - if (!delay_op) { - delay_op = new LIR_OpDelay(new LIR_Op0(lir_nop), op->as_OpJavaCall()->info()); - inst->insert_before(i + 1, delay_op); - } + LIR_Op* delay_op = new LIR_OpDelay(new LIR_Op0(lir_nop), op->as_OpJavaCall()->info()); + inst->insert_before(i + 1, delay_op); break; } }
--- a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -221,7 +221,7 @@ if (needs_card_mark) { LIR_Opr ptr = new_pointer_register(); __ add(base_opr, LIR_OprFact::intptrConst(offset), ptr); - return new LIR_Address(ptr, 0, type); + return new LIR_Address(ptr, type); } else { return new LIR_Address(base_opr, offset, type); } @@ -231,7 +231,7 @@ void LIRGenerator::increment_counter(address counter, int step) { LIR_Opr pointer = new_pointer_register(); __ move(LIR_OprFact::intptrConst(counter), pointer); - LIR_Address* addr = new LIR_Address(pointer, 0, T_INT); + LIR_Address* addr = new LIR_Address(pointer, T_INT); increment_counter(addr, step); } @@ -1159,7 +1159,7 @@ if (type == T_ARRAY || type == T_OBJECT) { LIR_Opr tmp = new_pointer_register(); __ add(base_op, index_op, tmp); - addr = new LIR_Address(tmp, 0, type); + addr = new LIR_Address(tmp, type); } else { addr = new LIR_Address(base_op, index_op, type); }
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -679,8 +679,15 @@ __ call_VM_leaf(L7_thread_cache, CAST_FROM_FN_PTR(address, SharedRuntime::exception_handler_for_return_address), G2_thread, Oissuing_pc->after_save()); __ verify_not_null_oop(Oexception->after_save()); - __ jmp(O0, 0); - __ delayed()->restore(); + + // Restore SP from L7 if the exception PC is a MethodHandle call site. + __ mov(O0, G5); // Save the target address. + __ lduw(Address(G2_thread, JavaThread::is_method_handle_return_offset()), L0); + __ tst(L0); // Condition codes are preserved over the restore. + __ restore(); + + __ jmp(G5, 0); + __ delayed()->movcc(Assembler::notZero, false, Assembler::icc, L7_mh_SP_save, SP); // Restore SP if required. } break;
--- a/hotspot/src/cpu/sparc/vm/copy_sparc.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/copy_sparc.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -154,7 +154,7 @@ } static void pd_fill_to_aligned_words(HeapWord* tohw, size_t count, juint value) { - assert(MinObjAlignmentInBytes == BytesPerLong, "need alternate implementation"); + assert(MinObjAlignmentInBytes >= BytesPerLong, "need alternate implementation"); julong* to = (julong*)tohw; julong v = ((julong)value << 32) | value; @@ -162,7 +162,7 @@ // and be equal to 0 on 64-bit platform. size_t odd = count % (BytesPerLong / HeapWordSize) ; - size_t aligned_count = align_object_size(count - odd) / HeapWordsPerLong; + size_t aligned_count = align_object_offset(count - odd) / HeapWordsPerLong; julong* end = ((julong*)tohw) + aligned_count - 1; while (to <= end) { DEBUG_ONLY(count -= BytesPerLong / HeapWordSize ;)
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -336,9 +336,11 @@ #endif // ASSERT } -frame::frame(intptr_t* sp, intptr_t* younger_sp, bool younger_frame_adjusted_stack) { - _sp = sp; - _younger_sp = younger_sp; +frame::frame(intptr_t* sp, intptr_t* younger_sp, bool younger_frame_is_interpreted) : + _sp(sp), + _younger_sp(younger_sp), + _deopt_state(unknown), + _sp_adjustment_by_callee(0) { if (younger_sp == NULL) { // make a deficient frame which doesn't know where its PC is _pc = NULL; @@ -352,20 +354,32 @@ // wrong. (the _last_native_pc will have the right value) // So do not put add any asserts on the _pc here. } - if (younger_frame_adjusted_stack) { - // compute adjustment to this frame's SP made by its interpreted callee - _sp_adjustment_by_callee = (intptr_t*)((intptr_t)younger_sp[I5_savedSP->sp_offset_in_saved_window()] + - STACK_BIAS) - sp; - } else { - _sp_adjustment_by_callee = 0; + + if (_pc != NULL) + _cb = CodeCache::find_blob(_pc); + + // Check for MethodHandle call sites. + if (_cb != NULL) { + nmethod* nm = _cb->as_nmethod_or_null(); + if (nm != NULL) { + if (nm->is_deopt_mh_entry(_pc) || nm->is_method_handle_return(_pc)) { + _sp_adjustment_by_callee = (intptr_t*) ((intptr_t) sp[L7_mh_SP_save->sp_offset_in_saved_window()] + STACK_BIAS) - sp; + // The SP is already adjusted by this MH call site, don't + // overwrite this value with the wrong interpreter value. + younger_frame_is_interpreted = false; + } + } } - _deopt_state = unknown; + if (younger_frame_is_interpreted) { + // compute adjustment to this frame's SP made by its interpreted callee + _sp_adjustment_by_callee = (intptr_t*) ((intptr_t) younger_sp[I5_savedSP->sp_offset_in_saved_window()] + STACK_BIAS) - sp; + } - // It is important that frame be fully construct when we do this lookup - // as get_original_pc() needs correct value for unextended_sp() + // It is important that the frame is fully constructed when we do + // this lookup as get_deopt_original_pc() needs a correct value for + // unextended_sp() which uses _sp_adjustment_by_callee. if (_pc != NULL) { - _cb = CodeCache::find_blob(_pc); address original_pc = nmethod::get_deopt_original_pc(this); if (original_pc != NULL) { _pc = original_pc; @@ -462,9 +476,8 @@ if (is_entry_frame()) return sender_for_entry_frame(map); - intptr_t* younger_sp = sp(); - intptr_t* sp = sender_sp(); - bool adjusted_stack = false; + intptr_t* younger_sp = sp(); + intptr_t* sp = sender_sp(); // Note: The version of this operation on any platform with callee-save // registers must update the register map (if not null). @@ -483,8 +496,8 @@ // interpreted but its pc is in the code cache (for c1 -> osr_frame_return_id stub), so it must be // explicitly recognized. - adjusted_stack = is_interpreted_frame(); - if (adjusted_stack) { + bool frame_is_interpreted = is_interpreted_frame(); + if (frame_is_interpreted) { map->make_integer_regs_unsaved(); map->shift_window(sp, younger_sp); } else if (_cb != NULL) { @@ -503,7 +516,7 @@ } } } - return frame(sp, younger_sp, adjusted_stack); + return frame(sp, younger_sp, frame_is_interpreted); }
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -720,25 +720,30 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register cache, Register tmp, - int bcp_offset, bool giant_index) { + int bcp_offset, size_t index_size) { assert(bcp_offset > 0, "bcp is still pointing to start of bytecode"); - if (!giant_index) { + if (index_size == sizeof(u2)) { get_2_byte_integer_at_bcp(bcp_offset, cache, tmp, Unsigned); - } else { + } else if (index_size == sizeof(u4)) { assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic"); get_4_byte_integer_at_bcp(bcp_offset, cache, tmp); assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line"); xor3(tmp, -1, tmp); // convert to plain index + } else if (index_size == sizeof(u1)) { + assert(EnableMethodHandles, "tiny index used only for EnableMethodHandles"); + ldub(Lbcp, bcp_offset, tmp); + } else { + ShouldNotReachHere(); } } void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Register tmp, - int bcp_offset, bool giant_index) { + int bcp_offset, size_t index_size) { assert(bcp_offset > 0, "bcp is still pointing to start of bytecode"); assert_different_registers(cache, tmp); assert_not_delayed(); - get_cache_index_at_bcp(cache, tmp, bcp_offset, giant_index); + get_cache_index_at_bcp(cache, tmp, bcp_offset, index_size); // convert from field index to ConstantPoolCacheEntry index and from // word index to byte offset sll(tmp, exact_log2(in_words(ConstantPoolCacheEntry::size()) * BytesPerWord), tmp); @@ -747,12 +752,15 @@ void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache, Register tmp, - int bcp_offset, bool giant_index) { + int bcp_offset, size_t index_size) { assert(bcp_offset > 0, "bcp is still pointing to start of bytecode"); assert_different_registers(cache, tmp); assert_not_delayed(); - assert(!giant_index,"NYI"); - get_2_byte_integer_at_bcp(bcp_offset, cache, tmp, Unsigned); + if (index_size == sizeof(u2)) { + get_2_byte_integer_at_bcp(bcp_offset, cache, tmp, Unsigned); + } else { + ShouldNotReachHere(); // other sizes not supported here + } // convert from field index to ConstantPoolCacheEntry index // and from word index to byte offset sll(tmp, exact_log2(in_words(ConstantPoolCacheEntry::size()) * BytesPerWord), tmp);
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -182,9 +182,9 @@ Register Rdst, setCCOrNot should_set_CC = dont_set_CC ); - void get_cache_and_index_at_bcp(Register cache, Register tmp, int bcp_offset, bool giant_index = false); - void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, bool giant_index = false); - void get_cache_index_at_bcp(Register cache, Register tmp, int bcp_offset, bool giant_index = false); + void get_cache_and_index_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2)); + void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2)); + void get_cache_index_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2)); // common code
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -375,10 +375,10 @@ Register O0_scratch = O0_argslot; int stackElementSize = Interpreter::stackElementSize; - // Make space on the stack for the arguments. - __ sub(SP, 4*stackElementSize, SP); - __ sub(Gargs, 3*stackElementSize, Gargs); - //__ sub(Lesp, 3*stackElementSize, Lesp); + // Make space on the stack for the arguments and set Gargs + // correctly. + __ sub(SP, 4*stackElementSize, SP); // Keep stack aligned. + __ add(SP, (frame::varargs_offset)*wordSize - 1*Interpreter::stackElementSize + STACK_BIAS + BytesPerWord, Gargs); // void raiseException(int code, Object actual, Object required) __ st( O1_scratch, Address(Gargs, 2*stackElementSize)); // code
--- a/hotspot/src/cpu/sparc/vm/nativeInst_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/nativeInst_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -321,7 +321,8 @@ set_long_at(add_offset, set_data32_simm13( long_at(add_offset), x)); // also store the value into an oop_Relocation cell, if any - CodeBlob* nm = CodeCache::find_blob(instruction_address()); + CodeBlob* cb = CodeCache::find_blob(instruction_address()); + nmethod* nm = cb ? cb->as_nmethod_or_null() : NULL; if (nm != NULL) { RelocIterator iter(nm, instruction_address(), next_instruction_address()); oop* oop_addr = NULL; @@ -430,7 +431,8 @@ set_long_at(add_offset, set_data32_simm13(long_at(add_offset), x)); // also store the value into an oop_Relocation cell, if any - CodeBlob* nm = CodeCache::find_blob(instruction_address()); + CodeBlob* cb = CodeCache::find_blob(instruction_address()); + nmethod* nm = cb ? cb->as_nmethod_or_null() : NULL; if (nm != NULL) { RelocIterator iter(nm, instruction_address(), next_instruction_address()); oop* oop_addr = NULL;
--- a/hotspot/src/cpu/sparc/vm/register_definitions_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/register_definitions_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -142,9 +142,12 @@ REGISTER_DEFINITION(Register, G3_scratch); REGISTER_DEFINITION(Register, G4_scratch); REGISTER_DEFINITION(Register, Gtemp); +REGISTER_DEFINITION(Register, Lentry_args); + +// JSR 292 REGISTER_DEFINITION(Register, G5_method_type); REGISTER_DEFINITION(Register, G3_method_handle); -REGISTER_DEFINITION(Register, Lentry_args); +REGISTER_DEFINITION(Register, L7_mh_SP_save); #ifdef CC_INTERP REGISTER_DEFINITION(Register, Lstate);
--- a/hotspot/src/cpu/sparc/vm/runtime_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/runtime_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -116,6 +116,11 @@ __ mov(O0, G3_scratch); // Move handler address to temp __ restore(); + // Restore SP from L7 if the exception PC is a MethodHandle call site. + __ lduw(Address(G2_thread, JavaThread::is_method_handle_return_offset()), O7); + __ tst(O7); + __ movcc(Assembler::notZero, false, Assembler::icc, L7_mh_SP_save, SP); + // G3_scratch contains handler address // Since this may be the deopt blob we must set O7 to look like we returned // from the original pc that threw the exception
--- a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -908,26 +908,13 @@ // O0-O5 - Outgoing args in compiled layout // O6 - Adjusted or restored SP // O7 - Valid return address - // L0-L7, I0-I7 - Caller's temps (no frame pushed yet) + // L0-L7, I0-I7 - Caller's temps (no frame pushed yet) // F0-F7 - more outgoing args // Gargs is the incoming argument base, and also an outgoing argument. __ sub(Gargs, BytesPerWord, Gargs); -#ifdef ASSERT - { - // on entry OsavedSP and SP should be equal - Label ok; - __ cmp(O5_savedSP, SP); - __ br(Assembler::equal, false, Assembler::pt, ok); - __ delayed()->nop(); - __ stop("I5_savedSP not set"); - __ should_not_reach_here(); - __ bind(ok); - } -#endif - // ON ENTRY TO THE CODE WE ARE MAKING, WE HAVE AN INTERPRETED FRAME // WITH O7 HOLDING A VALID RETURN PC //
--- a/hotspot/src/cpu/sparc/vm/sparc.ad Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/sparc.ad Thu Jul 08 11:28:01 2010 -0700 @@ -534,7 +534,10 @@ // The "return address" is the address of the call instruction, plus 8. int MachCallStaticJavaNode::ret_addr_offset() { - return NativeCall::instruction_size; // call; delay slot + int offset = NativeCall::instruction_size; // call; delay slot + if (_method_handle_invoke) + offset += 4; // restore SP + return offset; } int MachCallDynamicJavaNode::ret_addr_offset() { @@ -818,6 +821,10 @@ !(n->ideal_Opcode()==Op_ConvI2D && ld_op==Op_LoadF) && !(n->ideal_Opcode()==Op_PrefetchRead && ld_op==Op_LoadI) && !(n->ideal_Opcode()==Op_PrefetchWrite && ld_op==Op_LoadI) && + !(n->ideal_Opcode()==Op_Load2I && ld_op==Op_LoadD) && + !(n->ideal_Opcode()==Op_Load4C && ld_op==Op_LoadD) && + !(n->ideal_Opcode()==Op_Load4S && ld_op==Op_LoadD) && + !(n->ideal_Opcode()==Op_Load8B && ld_op==Op_LoadD) && !(n->rule() == loadUB_rule)) { verify_oops_warning(n, n->ideal_Opcode(), ld_op); } @@ -829,6 +836,9 @@ !(n->ideal_Opcode()==Op_StoreI && st_op==Op_StoreF) && !(n->ideal_Opcode()==Op_StoreF && st_op==Op_StoreI) && !(n->ideal_Opcode()==Op_StoreL && st_op==Op_StoreI) && + !(n->ideal_Opcode()==Op_Store2I && st_op==Op_StoreD) && + !(n->ideal_Opcode()==Op_Store4C && st_op==Op_StoreD) && + !(n->ideal_Opcode()==Op_Store8B && st_op==Op_StoreD) && !(n->ideal_Opcode()==Op_StoreD && st_op==Op_StoreI && n->rule() == storeD0_rule)) { verify_oops_warning(n, n->ideal_Opcode(), st_op); } @@ -1750,6 +1760,12 @@ // registers? True for Intel but false for most RISCs const bool Matcher::clone_shift_expressions = false; +bool Matcher::narrow_oop_use_complex_address() { + NOT_LP64(ShouldNotCallThis()); + assert(UseCompressedOops, "only for compressed oops code"); + return false; +} + // Is it better to copy float constants, or load them directly from memory? // Intel can load a float constant from a direct address, requiring no // extra registers. Most RISCs will have to materialize an address into a @@ -1858,7 +1874,7 @@ } const RegMask Matcher::method_handle_invoke_SP_save_mask() { - return RegMask(); + return L7_REGP_mask; } %} @@ -2441,6 +2457,16 @@ /*preserve_g2=*/true, /*force far call*/true); %} + enc_class preserve_SP %{ + MacroAssembler _masm(&cbuf); + __ mov(SP, L7_mh_SP_save); + %} + + enc_class restore_SP %{ + MacroAssembler _masm(&cbuf); + __ mov(L7_mh_SP_save, SP); + %} + enc_class Java_Static_Call (method meth) %{ // JAVA STATIC CALL // CALL to fixup routine. Fixup routine uses ScopeDesc info to determine // who we intended to call. @@ -9213,6 +9239,7 @@ // Call Java Static Instruction instruct CallStaticJavaDirect( method meth ) %{ match(CallStaticJava); + predicate(! ((CallStaticJavaNode*)n)->is_method_handle_invoke()); effect(USE meth); size(8); @@ -9223,6 +9250,20 @@ ins_pipe(simple_call); %} +// Call Java Static Instruction (method handle version) +instruct CallStaticJavaHandle(method meth, l7RegP l7_mh_SP_save) %{ + match(CallStaticJava); + predicate(((CallStaticJavaNode*)n)->is_method_handle_invoke()); + effect(USE meth, KILL l7_mh_SP_save); + + size(8); + ins_cost(CALL_COST); + format %{ "CALL,static/MethodHandle" %} + ins_encode(preserve_SP, Java_Static_Call(meth), restore_SP, call_epilog); + ins_pc_relative(1); + ins_pipe(simple_call); +%} + // Call Java Dynamic Instruction instruct CallDynamicJavaDirect( method meth ) %{ match(CallDynamicJava);
--- a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -2911,16 +2911,6 @@ // arraycopy stubs used by compilers generate_arraycopy_stubs(); - // generic method handle stubs - if (EnableMethodHandles && SystemDictionary::MethodHandle_klass() != NULL) { - for (MethodHandles::EntryKind ek = MethodHandles::_EK_FIRST; - ek < MethodHandles::_EK_LIMIT; - ek = MethodHandles::EntryKind(1 + (int)ek)) { - StubCodeMark mark(this, "MethodHandle", MethodHandles::entry_name(ek)); - MethodHandles::generate_method_handle_stub(_masm, ek); - } - } - // Don't initialize the platform math functions since sparc // doesn't have intrinsics for these operations. }
--- a/hotspot/src/cpu/sparc/vm/stubRoutines_sparc.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/stubRoutines_sparc.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -43,7 +43,7 @@ // MethodHandles adapters enum method_handles_platform_dependent_constants { - method_handles_adapters_code_size = 5000 + method_handles_adapters_code_size = 6000 }; class Sparc {
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -204,7 +204,7 @@ // out of the main line of code... if (EnableInvokeDynamic) { __ bind(L_giant_index); - __ get_cache_and_index_at_bcp(cache, G1_scratch, 1, true); + __ get_cache_and_index_at_bcp(cache, G1_scratch, 1, sizeof(u4)); __ ba(false, L_got_cache); __ delayed()->nop(); }
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1949,23 +1949,30 @@ } // ---------------------------------------------------------------------------- -void TemplateTable::resolve_cache_and_index(int byte_no, Register Rcache, Register index) { - assert(byte_no == 1 || byte_no == 2, "byte_no out of range"); - bool is_invokedynamic = (bytecode() == Bytecodes::_invokedynamic); - +void TemplateTable::resolve_cache_and_index(int byte_no, + Register result, + Register Rcache, + Register index, + size_t index_size) { // Depends on cpCacheOop layout! - const int shift_count = (1 + byte_no)*BitsPerByte; Label resolved; - __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic); - if (is_invokedynamic) { - // We are resolved if the f1 field contains a non-null CallSite object. + __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size); + if (byte_no == f1_oop) { + // We are resolved if the f1 field contains a non-null object (CallSite, etc.) + // This kind of CP cache entry does not need to match the flags byte, because + // there is a 1-1 relation between bytecode type and CP entry type. + assert_different_registers(result, Rcache); __ ld_ptr(Rcache, constantPoolCacheOopDesc::base_offset() + - ConstantPoolCacheEntry::f1_offset(), Lbyte_code); - __ tst(Lbyte_code); + ConstantPoolCacheEntry::f1_offset(), result); + __ tst(result); __ br(Assembler::notEqual, false, Assembler::pt, resolved); __ delayed()->set((int)bytecode(), O1); } else { + assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range"); + assert(result == noreg, ""); //else change code for setting result + const int shift_count = (1 + byte_no)*BitsPerByte; + __ ld_ptr(Rcache, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset(), Lbyte_code); @@ -1992,7 +1999,10 @@ // first time invocation - must resolve first __ call_VM(noreg, entry, O1); // Update registers with resolved info - __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic); + __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size); + if (result != noreg) + __ ld_ptr(Rcache, constantPoolCacheOopDesc::base_offset() + + ConstantPoolCacheEntry::f1_offset(), result); __ bind(resolved); } @@ -2001,7 +2011,8 @@ Register Ritable_index, Register Rflags, bool is_invokevirtual, - bool is_invokevfinal) { + bool is_invokevfinal, + bool is_invokedynamic) { // Uses both G3_scratch and G4_scratch Register Rcache = G3_scratch; Register Rscratch = G4_scratch; @@ -2025,11 +2036,15 @@ if (is_invokevfinal) { __ get_cache_and_index_at_bcp(Rcache, Rscratch, 1); + __ ld_ptr(Rcache, method_offset, Rmethod); + } else if (byte_no == f1_oop) { + // Resolved f1_oop goes directly into 'method' register. + resolve_cache_and_index(byte_no, Rmethod, Rcache, Rscratch, sizeof(u4)); } else { - resolve_cache_and_index(byte_no, Rcache, Rscratch); + resolve_cache_and_index(byte_no, noreg, Rcache, Rscratch, sizeof(u2)); + __ ld_ptr(Rcache, method_offset, Rmethod); } - __ ld_ptr(Rcache, method_offset, Rmethod); if (Ritable_index != noreg) { __ ld_ptr(Rcache, index_offset, Ritable_index); } @@ -2110,7 +2125,7 @@ Register Rflags = G1_scratch; ByteSize cp_base_offset = constantPoolCacheOopDesc::base_offset(); - resolve_cache_and_index(byte_no, Rcache, index); + resolve_cache_and_index(byte_no, noreg, Rcache, index, sizeof(u2)); jvmti_post_field_access(Rcache, index, is_static, false); load_field_cp_cache_entry(Rclass, Rcache, index, Roffset, Rflags, is_static); @@ -2475,7 +2490,7 @@ Register Rflags = G1_scratch; ByteSize cp_base_offset = constantPoolCacheOopDesc::base_offset(); - resolve_cache_and_index(byte_no, Rcache, index); + resolve_cache_and_index(byte_no, noreg, Rcache, index, sizeof(u2)); jvmti_post_field_mod(Rcache, index, is_static); load_field_cp_cache_entry(Rclass, Rcache, index, Roffset, Rflags, is_static); @@ -2816,6 +2831,7 @@ void TemplateTable::invokevirtual(int byte_no) { transition(vtos, vtos); + assert(byte_no == f2_byte, "use this argument"); Register Rscratch = G3_scratch; Register Rtemp = G4_scratch; @@ -2823,7 +2839,7 @@ Register Rrecv = G5_method; Label notFinal; - load_invoke_cp_cache_entry(byte_no, G5_method, noreg, Rret, true); + load_invoke_cp_cache_entry(byte_no, G5_method, noreg, Rret, true, false, false); __ mov(SP, O5_savedSP); // record SP that we wanted the callee to restore // Check for vfinal @@ -2864,9 +2880,10 @@ void TemplateTable::fast_invokevfinal(int byte_no) { transition(vtos, vtos); + assert(byte_no == f2_byte, "use this argument"); load_invoke_cp_cache_entry(byte_no, G5_method, noreg, Lscratch, true, - /*is_invokevfinal*/true); + /*is_invokevfinal*/true, false); __ mov(SP, O5_savedSP); // record SP that we wanted the callee to restore invokevfinal_helper(G3_scratch, Lscratch); } @@ -2901,12 +2918,13 @@ void TemplateTable::invokespecial(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); Register Rscratch = G3_scratch; Register Rtemp = G4_scratch; Register Rret = Lscratch; - load_invoke_cp_cache_entry(byte_no, G5_method, noreg, Rret, false); + load_invoke_cp_cache_entry(byte_no, G5_method, noreg, Rret, /*virtual*/ false, false, false); __ mov(SP, O5_savedSP); // record SP that we wanted the callee to restore __ verify_oop(G5_method); @@ -2934,12 +2952,13 @@ void TemplateTable::invokestatic(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); Register Rscratch = G3_scratch; Register Rtemp = G4_scratch; Register Rret = Lscratch; - load_invoke_cp_cache_entry(byte_no, G5_method, noreg, Rret, false); + load_invoke_cp_cache_entry(byte_no, G5_method, noreg, Rret, /*virtual*/ false, false, false); __ mov(SP, O5_savedSP); // record SP that we wanted the callee to restore __ verify_oop(G5_method); @@ -2992,6 +3011,7 @@ void TemplateTable::invokeinterface(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); Register Rscratch = G4_scratch; Register Rret = G3_scratch; @@ -3001,7 +3021,7 @@ Register Rflags = O1; assert_different_registers(Rscratch, G5_method); - load_invoke_cp_cache_entry(byte_no, Rinterface, Rindex, Rflags, false); + load_invoke_cp_cache_entry(byte_no, Rinterface, Rindex, Rflags, /*virtual*/ false, false, false); __ mov(SP, O5_savedSP); // record SP that we wanted the callee to restore // get receiver @@ -3118,6 +3138,7 @@ void TemplateTable::invokedynamic(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_oop, "use this argument"); if (!EnableInvokeDynamic) { // We should not encounter this bytecode if !EnableInvokeDynamic. @@ -3132,7 +3153,6 @@ // G5: CallSite object (f1) // XX: unused (f2) - // G3: receiver address // XX: flags (unused) Register G5_callsite = G5_method; @@ -3140,7 +3160,8 @@ Register Rtemp = G1_scratch; Register Rret = Lscratch; - load_invoke_cp_cache_entry(byte_no, G5_callsite, noreg, Rret, false); + load_invoke_cp_cache_entry(byte_no, G5_callsite, noreg, Rret, + /*virtual*/ false, /*vfinal*/ false, /*indy*/ true); __ mov(SP, O5_savedSP); // record SP that we wanted the callee to restore __ verify_oop(G5_callsite);
--- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -65,13 +65,6 @@ FLAG_SET_DEFAULT(UseInlineCaches, false); } #ifdef _LP64 - // Single issue niagara1 is slower for CompressedOops - // but niagaras after that it's fine. - if (!is_niagara1_plus()) { - if (FLAG_IS_DEFAULT(UseCompressedOops)) { - FLAG_SET_ERGO(bool, UseCompressedOops, false); - } - } // 32-bit oops don't make sense for the 64-bit VM on sparc // since the 32-bit VM has the same registers and smaller objects. Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -7643,6 +7643,9 @@ // Pass register number to verify_oop_subroutine char* b = new char[strlen(s) + 50]; sprintf(b, "verify_oop: %s: %s", reg->name(), s); +#ifdef _LP64 + push(rscratch1); // save r10, trashed by movptr() +#endif push(rax); // save rax, push(reg); // pass register argument ExternalAddress buffer((address) b); @@ -7653,6 +7656,7 @@ // call indirectly to solve generation ordering problem movptr(rax, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address())); call(rax); + // Caller pops the arguments (oop, message) and restores rax, r10 } @@ -7767,6 +7771,9 @@ char* b = new char[strlen(s) + 50]; sprintf(b, "verify_oop_addr: %s", s); +#ifdef _LP64 + push(rscratch1); // save r10, trashed by movptr() +#endif push(rax); // save rax, // addr may contain rsp so we will have to adjust it based on the push // we just did @@ -7789,7 +7796,7 @@ // call indirectly to solve generation ordering problem movptr(rax, ExternalAddress(StubRoutines::verify_oop_subroutine_entry_address())); call(rax); - // Caller pops the arguments and restores rax, from the stack + // Caller pops the arguments (addr, message) and restores rax, r10. } void MacroAssembler::verify_tlab() { @@ -8185,9 +8192,14 @@ assert (Universe::heap() != NULL, "java heap should be initialized"); movl(dst, Address(src, oopDesc::klass_offset_in_bytes())); if (Universe::narrow_oop_shift() != 0) { - assert(Address::times_8 == LogMinObjAlignmentInBytes && - Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong"); - movq(dst, Address(r12_heapbase, dst, Address::times_8, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes())); + assert(LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + if (LogMinObjAlignmentInBytes == Address::times_8) { + movq(dst, Address(r12_heapbase, dst, Address::times_8, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes())); + } else { + // OK to use shift since we don't need to preserve flags. + shlq(dst, LogMinObjAlignmentInBytes); + movq(dst, Address(r12_heapbase, dst, Address::times_1, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes())); + } } else { movq(dst, Address(dst, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes())); } @@ -8361,31 +8373,43 @@ } void MacroAssembler::decode_heap_oop_not_null(Register r) { + // Note: it will change flags assert (UseCompressedOops, "should only be used for compressed headers"); assert (Universe::heap() != NULL, "java heap should be initialized"); // Cannot assert, unverified entry point counts instructions (see .ad file) // vtableStubs also counts instructions in pd_code_size_limit. // Also do not verify_oop as this is called by verify_oop. if (Universe::narrow_oop_shift() != 0) { - assert (Address::times_8 == LogMinObjAlignmentInBytes && - Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong"); - // Don't use Shift since it modifies flags. - leaq(r, Address(r12_heapbase, r, Address::times_8, 0)); + assert(LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + shlq(r, LogMinObjAlignmentInBytes); + if (Universe::narrow_oop_base() != NULL) { + addq(r, r12_heapbase); + } } else { assert (Universe::narrow_oop_base() == NULL, "sanity"); } } void MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) { + // Note: it will change flags assert (UseCompressedOops, "should only be used for compressed headers"); assert (Universe::heap() != NULL, "java heap should be initialized"); // Cannot assert, unverified entry point counts instructions (see .ad file) // vtableStubs also counts instructions in pd_code_size_limit. // Also do not verify_oop as this is called by verify_oop. if (Universe::narrow_oop_shift() != 0) { - assert (Address::times_8 == LogMinObjAlignmentInBytes && - Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong"); - leaq(dst, Address(r12_heapbase, src, Address::times_8, 0)); + assert(LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong"); + if (LogMinObjAlignmentInBytes == Address::times_8) { + leaq(dst, Address(r12_heapbase, src, Address::times_8, 0)); + } else { + if (dst != src) { + movq(dst, src); + } + shlq(dst, LogMinObjAlignmentInBytes); + if (Universe::narrow_oop_base() != NULL) { + addq(dst, r12_heapbase); + } + } } else if (dst != src) { assert (Universe::narrow_oop_base() == NULL, "sanity"); movq(dst, src);
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -135,6 +135,9 @@ #endif // _LP64 +// JSR 292 fixed register usages: +REGISTER_DECLARATION(Register, rbp_mh_SP_save, rbp); + // Address is an abstraction used to represent a memory location // using any of the amd64 addressing modes with one object. //
--- a/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -136,8 +136,8 @@ // FrameMap //-------------------------------------------------------- -void FrameMap::init() { - if (_init_done) return; +void FrameMap::initialize() { + assert(!_init_done, "once"); assert(nof_cpu_regs == LP64_ONLY(16) NOT_LP64(8), "wrong number of CPU registers"); map_register(0, rsi); rsi_opr = LIR_OprFact::single_cpu(0); @@ -309,6 +309,13 @@ } +// JSR 292 +LIR_Opr FrameMap::method_handle_invoke_SP_save_opr() { + assert(rbp == rbp_mh_SP_save, "must be same register"); + return rbp_opr; +} + + bool FrameMap::validate_frame() { return true; }
--- a/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/c1_FrameMap_x86.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -126,6 +126,3 @@ assert(i >= 0 && i < nof_caller_save_xmm_regs, "out of bounds"); return _caller_save_xmm_regs[i]; } - - // JSR 292 - static LIR_Opr& method_handle_invoke_SP_save_opr() { return rbp_opr; }
--- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -2462,9 +2462,18 @@ } #endif // _LP64 } else { +#ifdef _LP64 + Register r_lo; + if (right->type() == T_OBJECT || right->type() == T_ARRAY) { + r_lo = right->as_register(); + } else { + r_lo = right->as_register_lo(); + } +#else Register r_lo = right->as_register_lo(); Register r_hi = right->as_register_hi(); assert(l_lo != r_hi, "overwriting registers"); +#endif switch (code) { case lir_logic_and: __ andptr(l_lo, r_lo); @@ -2784,7 +2793,7 @@ assert(!os::is_MP() || (__ offset() + NativeCall::displacement_offset) % BytesPerWord == 0, "must be aligned"); __ call(AddressLiteral(op->addr(), rtype)); - add_call_info(code_offset(), op->info(), op->is_method_handle_invoke()); + add_call_info(code_offset(), op->info()); } @@ -2795,7 +2804,7 @@ (__ offset() + NativeCall::displacement_offset) % BytesPerWord == 0, "must be aligned"); __ call(AddressLiteral(op->addr(), rh)); - add_call_info(code_offset(), op->info(), op->is_method_handle_invoke()); + add_call_info(code_offset(), op->info()); } @@ -2805,16 +2814,6 @@ } -void LIR_Assembler::preserve_SP(LIR_OpJavaCall* op) { - __ movptr(FrameMap::method_handle_invoke_SP_save_opr()->as_register(), rsp); -} - - -void LIR_Assembler::restore_SP(LIR_OpJavaCall* op) { - __ movptr(rsp, FrameMap::method_handle_invoke_SP_save_opr()->as_register()); -} - - void LIR_Assembler::emit_static_call_stub() { address call_pc = __ pc(); address stub = __ start_a_stub(call_stub_size);
--- a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -175,7 +175,7 @@ // store and again for the card mark. LIR_Opr tmp = new_pointer_register(); __ leal(LIR_OprFact::address(addr), tmp); - return new LIR_Address(tmp, 0, type); + return new LIR_Address(tmp, type); } else { return addr; } @@ -185,7 +185,7 @@ void LIRGenerator::increment_counter(address counter, int step) { LIR_Opr pointer = new_pointer_register(); __ move(LIR_OprFact::intptrConst(counter), pointer); - LIR_Address* addr = new LIR_Address(pointer, 0, T_INT); + LIR_Address* addr = new LIR_Address(pointer, T_INT); increment_counter(addr, step); }
--- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -782,7 +782,7 @@ // Restore SP from BP if the exception PC is a MethodHandle call site. NOT_LP64(__ get_thread(thread);) __ cmpl(Address(thread, JavaThread::is_method_handle_return_offset()), 0); - __ cmovptr(Assembler::notEqual, rsp, rbp); + __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save); // continue at exception handler (return address removed) // note: do *not* remove arguments when unwinding the @@ -1581,7 +1581,6 @@ __ should_not_reach_here(); break; } - __ push(rax); __ push(rdx); @@ -1605,8 +1604,8 @@ // Can we store original value in the thread's buffer? - LP64_ONLY(__ movslq(tmp, queue_index);) #ifdef _LP64 + __ movslq(tmp, queue_index); __ cmpq(tmp, 0); #else __ cmpl(queue_index, 0); @@ -1628,13 +1627,33 @@ __ jmp(done); __ bind(runtime); + __ push(rcx); +#ifdef _LP64 + __ push(r8); + __ push(r9); + __ push(r10); + __ push(r11); +# ifndef _WIN64 + __ push(rdi); + __ push(rsi); +# endif +#endif // load the pre-value - __ push(rcx); f.load_argument(0, rcx); __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_pre), rcx, thread); +#ifdef _LP64 +# ifndef _WIN64 + __ pop(rsi); + __ pop(rdi); +# endif + __ pop(r11); + __ pop(r10); + __ pop(r9); + __ pop(r8); +#endif __ pop(rcx); + __ bind(done); - __ bind(done); __ pop(rdx); __ pop(rax); } @@ -1664,13 +1683,13 @@ PtrQueue::byte_offset_of_buf())); __ push(rax); - __ push(rdx); + __ push(rcx); NOT_LP64(__ get_thread(thread);) ExternalAddress cardtable((address)ct->byte_map_base); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); - const Register card_addr = rdx; + const Register card_addr = rcx; #ifdef _LP64 const Register tmp = rscratch1; f.load_argument(0, card_addr); @@ -1679,7 +1698,7 @@ // get the address of the card __ addq(card_addr, tmp); #else - const Register card_index = rdx; + const Register card_index = rcx; f.load_argument(0, card_index); __ shrl(card_index, CardTableModRefBS::card_shift); @@ -1716,12 +1735,32 @@ __ jmp(done); __ bind(runtime); - NOT_LP64(__ push(rcx);) + __ push(rdx); +#ifdef _LP64 + __ push(r8); + __ push(r9); + __ push(r10); + __ push(r11); +# ifndef _WIN64 + __ push(rdi); + __ push(rsi); +# endif +#endif __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::g1_wb_post), card_addr, thread); - NOT_LP64(__ pop(rcx);) +#ifdef _LP64 +# ifndef _WIN64 + __ pop(rsi); + __ pop(rdi); +# endif + __ pop(r11); + __ pop(r10); + __ pop(r9); + __ pop(r8); +#endif + __ pop(rdx); + __ bind(done); - __ bind(done); - __ pop(rdx); + __ pop(rcx); __ pop(rax); }
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -189,11 +189,11 @@ } -void InterpreterMacroAssembler::get_cache_index_at_bcp(Register reg, int bcp_offset, bool giant_index) { +void InterpreterMacroAssembler::get_cache_index_at_bcp(Register reg, int bcp_offset, size_t index_size) { assert(bcp_offset > 0, "bcp is still pointing to start of bytecode"); - if (!giant_index) { + if (index_size == sizeof(u2)) { load_unsigned_short(reg, Address(rsi, bcp_offset)); - } else { + } else if (index_size == sizeof(u4)) { assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic"); movl(reg, Address(rsi, bcp_offset)); // Check if the secondary index definition is still ~x, otherwise @@ -201,14 +201,19 @@ // plain index. assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line"); notl(reg); // convert to plain index + } else if (index_size == sizeof(u1)) { + assert(EnableMethodHandles, "tiny index used only for EnableMethodHandles"); + load_unsigned_byte(reg, Address(rsi, bcp_offset)); + } else { + ShouldNotReachHere(); } } void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Register index, - int bcp_offset, bool giant_index) { + int bcp_offset, size_t index_size) { assert(cache != index, "must use different registers"); - get_cache_index_at_bcp(index, bcp_offset, giant_index); + get_cache_index_at_bcp(index, bcp_offset, index_size); movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize)); assert(sizeof(ConstantPoolCacheEntry) == 4*wordSize, "adjust code below"); shlptr(index, 2); // convert from field index to ConstantPoolCacheEntry index @@ -216,9 +221,9 @@ void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache, Register tmp, - int bcp_offset, bool giant_index) { + int bcp_offset, size_t index_size) { assert(cache != tmp, "must use different register"); - get_cache_index_at_bcp(tmp, bcp_offset, giant_index); + get_cache_index_at_bcp(tmp, bcp_offset, index_size); assert(sizeof(ConstantPoolCacheEntry) == 4*wordSize, "adjust code below"); // convert from field index to ConstantPoolCacheEntry index // and from word offset to byte offset
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -76,9 +76,9 @@ void get_cpool_and_tags(Register cpool, Register tags) { get_constant_pool(cpool); movptr(tags, Address(cpool, constantPoolOopDesc::tags_offset_in_bytes())); } void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset); - void get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, bool giant_index = false); - void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, bool giant_index = false); - void get_cache_index_at_bcp(Register index, int bcp_offset, bool giant_index = false); + void get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, size_t index_size = sizeof(u2)); + void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2)); + void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2)); // Expression stack void f2ieee(); // truncate ftos to 32bits
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -187,11 +187,11 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register index, int bcp_offset, - bool giant_index) { + size_t index_size) { assert(bcp_offset > 0, "bcp is still pointing to start of bytecode"); - if (!giant_index) { + if (index_size == sizeof(u2)) { load_unsigned_short(index, Address(r13, bcp_offset)); - } else { + } else if (index_size == sizeof(u4)) { assert(EnableInvokeDynamic, "giant index used only for EnableInvokeDynamic"); movl(index, Address(r13, bcp_offset)); // Check if the secondary index definition is still ~x, otherwise @@ -199,6 +199,11 @@ // plain index. assert(constantPoolCacheOopDesc::decode_secondary_index(~123) == 123, "else change next line"); notl(index); // convert to plain index + } else if (index_size == sizeof(u1)) { + assert(EnableMethodHandles, "tiny index used only for EnableMethodHandles"); + load_unsigned_byte(index, Address(r13, bcp_offset)); + } else { + ShouldNotReachHere(); } } @@ -206,9 +211,9 @@ void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, - bool giant_index) { + size_t index_size) { assert(cache != index, "must use different registers"); - get_cache_index_at_bcp(index, bcp_offset, giant_index); + get_cache_index_at_bcp(index, bcp_offset, index_size); movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize)); assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below"); // convert from field index to ConstantPoolCacheEntry index @@ -219,9 +224,9 @@ void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, - bool giant_index) { + size_t index_size) { assert(cache != tmp, "must use different register"); - get_cache_index_at_bcp(tmp, bcp_offset, giant_index); + get_cache_index_at_bcp(tmp, bcp_offset, index_size); assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below"); // convert from field index to ConstantPoolCacheEntry index // and from word offset to byte offset
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -95,10 +95,10 @@ void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset); void get_cache_and_index_at_bcp(Register cache, Register index, - int bcp_offset, bool giant_index = false); + int bcp_offset, size_t index_size = sizeof(u2)); void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, - int bcp_offset, bool giant_index = false); - void get_cache_index_at_bcp(Register index, int bcp_offset, bool giant_index = false); + int bcp_offset, size_t index_size = sizeof(u2)); + void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2)); void pop_ptr(Register r = rax);
--- a/hotspot/src/cpu/x86/vm/register_definitions_x86.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/register_definitions_x86.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -115,3 +115,6 @@ REGISTER_DEFINITION(MMXRegister, mmx5 ); REGISTER_DEFINITION(MMXRegister, mmx6 ); REGISTER_DEFINITION(MMXRegister, mmx7 ); + +// JSR 292 +REGISTER_DEFINITION(Register, rbp_mh_SP_save);
--- a/hotspot/src/cpu/x86/vm/runtime_x86_32.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/runtime_x86_32.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -117,7 +117,7 @@ // Restore SP from BP if the exception PC is a MethodHandle call site. __ cmpl(Address(rcx, JavaThread::is_method_handle_return_offset()), 0); - __ cmovptr(Assembler::notEqual, rsp, rbp); + __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save); // We have a handler in rax, (could be deopt blob) // rdx - throwing pc, deopt blob will need it.
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -3305,7 +3305,7 @@ // Restore SP from BP if the exception PC is a MethodHandle call site. __ cmpl(Address(r15_thread, JavaThread::is_method_handle_return_offset()), 0); - __ cmovptr(Assembler::notEqual, rsp, rbp); + __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save); // We have a handler in rax (could be deopt blob). __ mov(r8, rax);
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -914,6 +914,7 @@ // * [tos + 5]: error message (char*) // * [tos + 6]: object to verify (oop) // * [tos + 7]: saved rax - saved by caller and bashed + // * [tos + 8]: saved r10 (rscratch1) - saved by caller // * = popped on exit address generate_verify_oop() { StubCodeMark mark(this, "StubRoutines", "verify_oop"); @@ -934,6 +935,7 @@ // After previous pushes. oop_to_verify = 6 * wordSize, saved_rax = 7 * wordSize, + saved_r10 = 8 * wordSize, // Before the call to MacroAssembler::debug(), see below. return_addr = 16 * wordSize, @@ -983,15 +985,17 @@ // return if everything seems ok __ bind(exit); __ movptr(rax, Address(rsp, saved_rax)); // get saved rax back + __ movptr(rscratch1, Address(rsp, saved_r10)); // get saved r10 back __ pop(c_rarg3); // restore c_rarg3 __ pop(c_rarg2); // restore c_rarg2 __ pop(r12); // restore r12 __ popf(); // restore flags - __ ret(3 * wordSize); // pop caller saved stuff + __ ret(4 * wordSize); // pop caller saved stuff // handle errors __ bind(error); __ movptr(rax, Address(rsp, saved_rax)); // get saved rax back + __ movptr(rscratch1, Address(rsp, saved_r10)); // get saved r10 back __ pop(c_rarg3); // get saved c_rarg3 back __ pop(c_rarg2); // get saved c_rarg2 back __ pop(r12); // get saved r12 back @@ -1009,6 +1013,7 @@ // * [tos + 17] error message (char*) // * [tos + 18] object to verify (oop) // * [tos + 19] saved rax - saved by caller and bashed + // * [tos + 20] saved r10 (rscratch1) - saved by caller // * = popped on exit __ movptr(c_rarg0, Address(rsp, error_msg)); // pass address of error message @@ -1021,7 +1026,7 @@ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug64))); __ mov(rsp, r12); // restore rsp __ popa(); // pop registers (includes r12) - __ ret(3 * wordSize); // pop caller saved stuff + __ ret(4 * wordSize); // pop caller saved stuff return start; }
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -214,7 +214,7 @@ __ cmpb(Address(rsi, 0), Bytecodes::_invokedynamic); __ jcc(Assembler::equal, L_giant_index); } - __ get_cache_and_index_at_bcp(rbx, rcx, 1, false); + __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u2)); __ bind(L_got_cache); __ movl(rbx, Address(rbx, rcx, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + @@ -226,7 +226,7 @@ // out of the main line of code... if (EnableInvokeDynamic) { __ bind(L_giant_index); - __ get_cache_and_index_at_bcp(rbx, rcx, 1, true); + __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u4)); __ jmp(L_got_cache); }
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -192,7 +192,7 @@ __ cmpb(Address(r13, 0), Bytecodes::_invokedynamic); __ jcc(Assembler::equal, L_giant_index); } - __ get_cache_and_index_at_bcp(rbx, rcx, 1, false); + __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u2)); __ bind(L_got_cache); __ movl(rbx, Address(rbx, rcx, Address::times_ptr, @@ -205,7 +205,7 @@ // out of the main line of code... if (EnableInvokeDynamic) { __ bind(L_giant_index); - __ get_cache_and_index_at_bcp(rbx, rcx, 1, true); + __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u4)); __ jmp(L_got_cache); }
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -2012,22 +2012,29 @@ __ membar(order_constraint); } -void TemplateTable::resolve_cache_and_index(int byte_no, Register Rcache, Register index) { - assert(byte_no == 1 || byte_no == 2, "byte_no out of range"); - bool is_invokedynamic = (bytecode() == Bytecodes::_invokedynamic); - +void TemplateTable::resolve_cache_and_index(int byte_no, + Register result, + Register Rcache, + Register index, + size_t index_size) { Register temp = rbx; - assert_different_registers(Rcache, index, temp); - - const int shift_count = (1 + byte_no)*BitsPerByte; + assert_different_registers(result, Rcache, index, temp); + Label resolved; - __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic); - if (is_invokedynamic) { - // we are resolved if the f1 field contains a non-null CallSite object - __ cmpptr(Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset()), (int32_t) NULL_WORD); + __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size); + if (byte_no == f1_oop) { + // We are resolved if the f1 field contains a non-null object (CallSite, etc.) + // This kind of CP cache entry does not need to match the flags byte, because + // there is a 1-1 relation between bytecode type and CP entry type. + assert(result != noreg, ""); //else do cmpptr(Address(...), (int32_t) NULL_WORD) + __ movptr(result, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset())); + __ testptr(result, result); __ jcc(Assembler::notEqual, resolved); } else { + assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range"); + assert(result == noreg, ""); //else change code for setting result + const int shift_count = (1 + byte_no)*BitsPerByte; __ movl(temp, Address(Rcache, index, Address::times_4, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset())); __ shrl(temp, shift_count); // have we resolved this bytecode? @@ -2053,7 +2060,9 @@ __ movl(temp, (int)bytecode()); __ call_VM(noreg, entry, temp); // Update registers with resolved info - __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic); + __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size); + if (result != noreg) + __ movptr(result, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset())); __ bind(resolved); } @@ -2087,7 +2096,8 @@ Register itable_index, Register flags, bool is_invokevirtual, - bool is_invokevfinal /*unused*/) { + bool is_invokevfinal /*unused*/, + bool is_invokedynamic) { // setup registers const Register cache = rcx; const Register index = rdx; @@ -2109,13 +2119,18 @@ const int index_offset = in_bytes(constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f2_offset()); - resolve_cache_and_index(byte_no, cache, index); - - __ movptr(method, Address(cache, index, Address::times_ptr, method_offset)); + if (byte_no == f1_oop) { + // Resolved f1_oop goes directly into 'method' register. + assert(is_invokedynamic, ""); + resolve_cache_and_index(byte_no, method, cache, index, sizeof(u4)); + } else { + resolve_cache_and_index(byte_no, noreg, cache, index, sizeof(u2)); + __ movptr(method, Address(cache, index, Address::times_ptr, method_offset)); + } if (itable_index != noreg) { __ movptr(itable_index, Address(cache, index, Address::times_ptr, index_offset)); } - __ movl(flags , Address(cache, index, Address::times_ptr, flags_offset )); + __ movl(flags, Address(cache, index, Address::times_ptr, flags_offset)); } @@ -2169,7 +2184,7 @@ const Register off = rbx; const Register flags = rax; - resolve_cache_and_index(byte_no, cache, index); + resolve_cache_and_index(byte_no, noreg, cache, index, sizeof(u2)); jvmti_post_field_access(cache, index, is_static, false); load_field_cp_cache_entry(obj, cache, index, off, flags, is_static); @@ -2378,7 +2393,7 @@ const Register off = rbx; const Register flags = rax; - resolve_cache_and_index(byte_no, cache, index); + resolve_cache_and_index(byte_no, noreg, cache, index, sizeof(u2)); jvmti_post_field_mod(cache, index, is_static); load_field_cp_cache_entry(obj, cache, index, off, flags, is_static); @@ -2815,10 +2830,11 @@ // save 'interpreter return address' __ save_bcp(); - load_invoke_cp_cache_entry(byte_no, method, index, flags, is_invokevirtual); + load_invoke_cp_cache_entry(byte_no, method, index, flags, is_invokevirtual, false, is_invokedynamic); // load receiver if needed (note: no return address pushed yet) if (load_receiver) { + assert(!is_invokedynamic, ""); __ movl(recv, flags); __ andl(recv, 0xFF); // recv count is 0 based? @@ -2910,6 +2926,7 @@ void TemplateTable::invokevirtual(int byte_no) { transition(vtos, vtos); + assert(byte_no == f2_byte, "use this argument"); prepare_invoke(rbx, noreg, byte_no); // rbx,: index @@ -2922,6 +2939,7 @@ void TemplateTable::invokespecial(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); prepare_invoke(rbx, noreg, byte_no); // do the call __ verify_oop(rbx); @@ -2932,6 +2950,7 @@ void TemplateTable::invokestatic(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); prepare_invoke(rbx, noreg, byte_no); // do the call __ verify_oop(rbx); @@ -2942,12 +2961,14 @@ void TemplateTable::fast_invokevfinal(int byte_no) { transition(vtos, vtos); + assert(byte_no == f2_byte, "use this argument"); __ stop("fast_invokevfinal not used on x86"); } void TemplateTable::invokeinterface(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); prepare_invoke(rax, rbx, byte_no); // rax,: Interface @@ -3036,11 +3057,11 @@ return; } + assert(byte_no == f1_oop, "use this argument"); prepare_invoke(rax, rbx, byte_no); // rax: CallSite object (f1) // rbx: unused (f2) - // rcx: receiver address // rdx: flags (unused) if (ProfileInterpreter) {
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -2015,21 +2015,28 @@ } } -void TemplateTable::resolve_cache_and_index(int byte_no, Register Rcache, Register index) { - assert(byte_no == 1 || byte_no == 2, "byte_no out of range"); - bool is_invokedynamic = (bytecode() == Bytecodes::_invokedynamic); - +void TemplateTable::resolve_cache_and_index(int byte_no, + Register result, + Register Rcache, + Register index, + size_t index_size) { const Register temp = rbx; - assert_different_registers(Rcache, index, temp); - - const int shift_count = (1 + byte_no) * BitsPerByte; + assert_different_registers(result, Rcache, index, temp); + Label resolved; - __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic); - if (is_invokedynamic) { - // we are resolved if the f1 field contains a non-null CallSite object - __ cmpptr(Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset()), (int32_t) NULL_WORD); + __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size); + if (byte_no == f1_oop) { + // We are resolved if the f1 field contains a non-null object (CallSite, etc.) + // This kind of CP cache entry does not need to match the flags byte, because + // there is a 1-1 relation between bytecode type and CP entry type. + assert(result != noreg, ""); //else do cmpptr(Address(...), (int32_t) NULL_WORD) + __ movptr(result, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset())); + __ testptr(result, result); __ jcc(Assembler::notEqual, resolved); } else { + assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range"); + assert(result == noreg, ""); //else change code for setting result + const int shift_count = (1 + byte_no) * BitsPerByte; __ movl(temp, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset())); __ shrl(temp, shift_count); // have we resolved this bytecode? @@ -2064,7 +2071,9 @@ __ call_VM(noreg, entry, temp); // Update registers with resolved info - __ get_cache_and_index_at_bcp(Rcache, index, 1, is_invokedynamic); + __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size); + if (result != noreg) + __ movptr(result, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset())); __ bind(resolved); } @@ -2100,7 +2109,8 @@ Register itable_index, Register flags, bool is_invokevirtual, - bool is_invokevfinal /*unused*/) { + bool is_invokevfinal, /*unused*/ + bool is_invokedynamic) { // setup registers const Register cache = rcx; const Register index = rdx; @@ -2120,15 +2130,18 @@ const int index_offset = in_bytes(constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f2_offset()); - resolve_cache_and_index(byte_no, cache, index); - - assert(wordSize == 8, "adjust code below"); - __ movptr(method, Address(cache, index, Address::times_8, method_offset)); + if (byte_no == f1_oop) { + // Resolved f1_oop goes directly into 'method' register. + assert(is_invokedynamic, ""); + resolve_cache_and_index(byte_no, method, cache, index, sizeof(u4)); + } else { + resolve_cache_and_index(byte_no, noreg, cache, index, sizeof(u2)); + __ movptr(method, Address(cache, index, Address::times_ptr, method_offset)); + } if (itable_index != noreg) { - __ movptr(itable_index, - Address(cache, index, Address::times_8, index_offset)); + __ movptr(itable_index, Address(cache, index, Address::times_ptr, index_offset)); } - __ movl(flags , Address(cache, index, Address::times_8, flags_offset)); + __ movl(flags, Address(cache, index, Address::times_ptr, flags_offset)); } @@ -2187,7 +2200,7 @@ const Register flags = rax; const Register bc = c_rarg3; // uses same reg as obj, so don't mix them - resolve_cache_and_index(byte_no, cache, index); + resolve_cache_and_index(byte_no, noreg, cache, index, sizeof(u2)); jvmti_post_field_access(cache, index, is_static, false); load_field_cp_cache_entry(obj, cache, index, off, flags, is_static); @@ -2390,7 +2403,7 @@ const Register flags = rax; const Register bc = c_rarg3; - resolve_cache_and_index(byte_no, cache, index); + resolve_cache_and_index(byte_no, noreg, cache, index, sizeof(u2)); jvmti_post_field_mod(cache, index, is_static); load_field_cp_cache_entry(obj, cache, index, off, flags, is_static); @@ -2815,10 +2828,11 @@ // save 'interpreter return address' __ save_bcp(); - load_invoke_cp_cache_entry(byte_no, method, index, flags, is_invokevirtual); + load_invoke_cp_cache_entry(byte_no, method, index, flags, is_invokevirtual, false, is_invokedynamic); // load receiver if needed (note: no return address pushed yet) if (load_receiver) { + assert(!is_invokedynamic, ""); __ movl(recv, flags); __ andl(recv, 0xFF); Address recv_addr(rsp, recv, Address::times_8, -Interpreter::expr_offset_in_bytes(1)); @@ -2914,6 +2928,7 @@ void TemplateTable::invokevirtual(int byte_no) { transition(vtos, vtos); + assert(byte_no == f2_byte, "use this argument"); prepare_invoke(rbx, noreg, byte_no); // rbx: index @@ -2926,6 +2941,7 @@ void TemplateTable::invokespecial(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); prepare_invoke(rbx, noreg, byte_no); // do the call __ verify_oop(rbx); @@ -2936,6 +2952,7 @@ void TemplateTable::invokestatic(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); prepare_invoke(rbx, noreg, byte_no); // do the call __ verify_oop(rbx); @@ -2945,11 +2962,13 @@ void TemplateTable::fast_invokevfinal(int byte_no) { transition(vtos, vtos); + assert(byte_no == f2_byte, "use this argument"); __ stop("fast_invokevfinal not used on amd64"); } void TemplateTable::invokeinterface(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_byte, "use this argument"); prepare_invoke(rax, rbx, byte_no); // rax: Interface @@ -3027,6 +3046,7 @@ void TemplateTable::invokedynamic(int byte_no) { transition(vtos, vtos); + assert(byte_no == f1_oop, "use this argument"); if (!EnableInvokeDynamic) { // We should not encounter this bytecode if !EnableInvokeDynamic. @@ -3039,6 +3059,7 @@ return; } + assert(byte_no == f1_oop, "use this argument"); prepare_invoke(rax, rbx, byte_no); // rax: CallSite object (f1)
--- a/hotspot/src/cpu/x86/vm/x86_32.ad Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/x86_32.ad Thu Jul 08 11:28:01 2010 -0700 @@ -1377,6 +1377,12 @@ // registers? True for Intel but false for most RISCs const bool Matcher::clone_shift_expressions = true; +bool Matcher::narrow_oop_use_complex_address() { + ShouldNotCallThis(); + return true; +} + + // Is it better to copy float constants, or load them directly from memory? // Intel can load a float constant from a direct address, requiring no // extra registers. Most RISCs will have to materialize an address into a @@ -1841,14 +1847,14 @@ MacroAssembler _masm(&cbuf); // RBP is preserved across all calls, even compiled calls. // Use it to preserve RSP in places where the callee might change the SP. - __ movptr(rbp, rsp); + __ movptr(rbp_mh_SP_save, rsp); debug_only(int off1 = cbuf.code_size()); assert(off1 - off0 == preserve_SP_size(), "correct size prediction"); %} enc_class restore_SP %{ MacroAssembler _masm(&cbuf); - __ movptr(rsp, rbp); + __ movptr(rsp, rbp_mh_SP_save); %} enc_class Java_Static_Call (method meth) %{ // JAVA STATIC CALL @@ -13570,7 +13576,7 @@ // Call Java Static Instruction (method handle version) // Note: If this code changes, the corresponding ret_addr_offset() and // compute_padding() functions will have to be adjusted. -instruct CallStaticJavaHandle(method meth, eBPRegP ebp) %{ +instruct CallStaticJavaHandle(method meth, eBPRegP ebp_mh_SP_save) %{ match(CallStaticJava); predicate(((CallStaticJavaNode*)n)->is_method_handle_invoke()); effect(USE meth);
--- a/hotspot/src/cpu/x86/vm/x86_64.ad Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/cpu/x86/vm/x86_64.ad Thu Jul 08 11:28:01 2010 -0700 @@ -1851,29 +1851,24 @@ void MachUEPNode::format(PhaseRegAlloc* ra_, outputStream* st) const { if (UseCompressedOops) { - st->print_cr("movl rscratch1, [j_rarg0 + oopDesc::klass_offset_in_bytes() #%d]\t", oopDesc::klass_offset_in_bytes()); + st->print_cr("movl rscratch1, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t# compressed klass"); if (Universe::narrow_oop_shift() != 0) { - st->print_cr("leaq rscratch1, [r12_heapbase, r, Address::times_8, 0]"); - } - st->print_cr("cmpq rax, rscratch1\t # Inline cache check"); + st->print_cr("\tdecode_heap_oop_not_null rscratch1, rscratch1"); + } + st->print_cr("\tcmpq rax, rscratch1\t # Inline cache check"); } else { - st->print_cr("cmpq rax, [j_rarg0 + oopDesc::klass_offset_in_bytes() #%d]\t" - "# Inline cache check", oopDesc::klass_offset_in_bytes()); + st->print_cr("\tcmpq rax, [j_rarg0 + oopDesc::klass_offset_in_bytes()]\t" + "# Inline cache check"); } st->print_cr("\tjne SharedRuntime::_ic_miss_stub"); - st->print_cr("\tnop"); - if (!OptoBreakpoint) { - st->print_cr("\tnop"); - } + st->print_cr("\tnop\t# nops to align entry point"); } #endif void MachUEPNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const { MacroAssembler masm(&cbuf); -#ifdef ASSERT uint code_size = cbuf.code_size(); -#endif if (UseCompressedOops) { masm.load_klass(rscratch1, j_rarg0); masm.cmpptr(rax, rscratch1); @@ -1884,33 +1879,21 @@ masm.jump_cc(Assembler::notEqual, RuntimeAddress(SharedRuntime::get_ic_miss_stub())); /* WARNING these NOPs are critical so that verified entry point is properly - aligned for patching by NativeJump::patch_verified_entry() */ - int nops_cnt = 1; - if (!OptoBreakpoint) { + 4 bytes aligned for patching by NativeJump::patch_verified_entry() */ + int nops_cnt = 4 - ((cbuf.code_size() - code_size) & 0x3); + if (OptoBreakpoint) { // Leave space for int3 - nops_cnt += 1; + nops_cnt -= 1; } - if (UseCompressedOops) { - // ??? divisible by 4 is aligned? - nops_cnt += 1; - } - masm.nop(nops_cnt); - - assert(cbuf.code_size() - code_size == size(ra_), - "checking code size of inline cache node"); + nops_cnt &= 0x3; // Do not add nops if code is aligned. + if (nops_cnt > 0) + masm.nop(nops_cnt); } uint MachUEPNode::size(PhaseRegAlloc* ra_) const { - if (UseCompressedOops) { - if (Universe::narrow_oop_shift() == 0) { - return OptoBreakpoint ? 15 : 16; - } else { - return OptoBreakpoint ? 19 : 20; - } - } else { - return OptoBreakpoint ? 11 : 12; - } + return MachNode::size(ra_); // too many variables; just compute it + // the hard way } @@ -2054,6 +2037,11 @@ // into registers? True for Intel but false for most RISCs const bool Matcher::clone_shift_expressions = true; +bool Matcher::narrow_oop_use_complex_address() { + assert(UseCompressedOops, "only for compressed oops code"); + return (LogMinObjAlignmentInBytes <= 3); +} + // Is it better to copy float constants, or load them directly from // memory? Intel can load a float constant from a direct address, // requiring no extra registers. Most RISCs will have to materialize @@ -2635,14 +2623,14 @@ MacroAssembler _masm(&cbuf); // RBP is preserved across all calls, even compiled calls. // Use it to preserve RSP in places where the callee might change the SP. - __ movptr(rbp, rsp); + __ movptr(rbp_mh_SP_save, rsp); debug_only(int off1 = cbuf.code_size()); assert(off1 - off0 == preserve_SP_size(), "correct size prediction"); %} enc_class restore_SP %{ MacroAssembler _masm(&cbuf); - __ movptr(rsp, rbp); + __ movptr(rsp, rbp_mh_SP_save); %} enc_class Java_Static_Call(method meth) @@ -5127,7 +5115,7 @@ // Note: x86 architecture doesn't support "scale * index + offset" without a base // we can't free r12 even with Universe::narrow_oop_base() == NULL. operand indCompressedOopOffset(rRegN reg, immL32 off) %{ - predicate(UseCompressedOops && (Universe::narrow_oop_shift() != 0)); + predicate(UseCompressedOops && (Universe::narrow_oop_shift() == Address::times_8)); constraint(ALLOC_IN_RC(ptr_reg)); match(AddP (DecodeN reg) off); @@ -7742,10 +7730,11 @@ ins_pipe(ialu_reg_long); %} -instruct decodeHeapOop_not_null(rRegP dst, rRegN src) %{ +instruct decodeHeapOop_not_null(rRegP dst, rRegN src, rFlagsReg cr) %{ predicate(n->bottom_type()->is_oopptr()->ptr() == TypePtr::NotNull || n->bottom_type()->is_oopptr()->ptr() == TypePtr::Constant); match(Set dst (DecodeN src)); + effect(KILL cr); format %{ "decode_heap_oop_not_null $dst,$src" %} ins_encode %{ Register s = $src$$Register; @@ -12604,7 +12593,7 @@ // Call Java Static Instruction (method handle version) // Note: If this code changes, the corresponding ret_addr_offset() and // compute_padding() functions will have to be adjusted. -instruct CallStaticJavaHandle(method meth, rbp_RegP rbp) %{ +instruct CallStaticJavaHandle(method meth, rbp_RegP rbp_mh_SP_save) %{ match(CallStaticJava); predicate(((CallStaticJavaNode*) n)->is_method_handle_invoke()); effect(USE meth);
--- a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -232,12 +232,11 @@ GEN_OFFS(CodeBlob, _header_size); GEN_OFFS(CodeBlob, _instructions_offset); GEN_OFFS(CodeBlob, _data_offset); - GEN_OFFS(CodeBlob, _oops_offset); - GEN_OFFS(CodeBlob, _oops_length); GEN_OFFS(CodeBlob, _frame_size); printf("\n"); GEN_OFFS(nmethod, _method); + GEN_OFFS(nmethod, _oops_offset); GEN_OFFS(nmethod, _scopes_data_offset); GEN_OFFS(nmethod, _scopes_pcs_offset); GEN_OFFS(nmethod, _handler_table_offset);
--- a/hotspot/src/os/solaris/dtrace/libjvm_db.c Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/os/solaris/dtrace/libjvm_db.c Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -130,7 +130,7 @@ int32_t scopes_data_beg; /* _scopes_data_offset */ int32_t scopes_data_end; int32_t oops_beg; /* _oops_offset */ - int32_t oops_len; /* _oops_length */ + int32_t oops_end; int32_t scopes_pcs_beg; /* _scopes_pcs_offset */ int32_t scopes_pcs_end; @@ -597,9 +597,9 @@ CHECK_FAIL(err); /* Oops */ - err = ps_pread(J->P, nm + OFFSET_CodeBlob_oops_offset, &N->oops_beg, SZ32); + err = ps_pread(J->P, nm + OFFSET_nmethod_oops_offset, &N->oops_beg, SZ32); CHECK_FAIL(err); - err = ps_pread(J->P, nm + OFFSET_CodeBlob_oops_length, &N->oops_len, SZ32); + err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_data_offset, &N->oops_end, SZ32); CHECK_FAIL(err); /* scopes_pcs */ @@ -624,8 +624,8 @@ fprintf(stderr, "\t nmethod_info: orig_pc_offset: %#x \n", N->orig_pc_offset); - fprintf(stderr, "\t nmethod_info: oops_beg: %#x, oops_len: %#x\n", - N->oops_beg, N->oops_len); + fprintf(stderr, "\t nmethod_info: oops_beg: %#x, oops_end: %#x\n", + N->oops_beg, N->oops_end); fprintf(stderr, "\t nmethod_info: scopes_data_beg: %#x, scopes_data_end: %#x\n", N->scopes_data_beg, N->scopes_data_end); @@ -959,8 +959,8 @@ err = scope_desc_at(N, decode_offset, vf); CHECK_FAIL(err); - if (vf->methodIdx > N->oops_len) { - fprintf(stderr, "\t scopeDesc_chain: (methodIdx > oops_len) !\n"); + if (vf->methodIdx > ((N->oops_end - N->oops_beg) / POINTER_SIZE)) { + fprintf(stderr, "\t scopeDesc_chain: (methodIdx > oops length) !\n"); return -1; } err = read_pointer(N->J, N->nm + N->oops_beg + (vf->methodIdx-1)*POINTER_SIZE,
--- a/hotspot/src/share/vm/asm/codeBuffer.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/asm/codeBuffer.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -510,9 +510,9 @@ copy_relocations_to(blob); copy_code_to(blob); } - void copy_oops_to(CodeBlob* blob) { + void copy_oops_to(nmethod* nm) { if (!oop_recorder()->is_unused()) { - oop_recorder()->copy_to(blob); + oop_recorder()->copy_to(nm); } }
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -26,9 +26,11 @@ #include "incls/_c1_Canonicalizer.cpp.incl" -static void do_print_value(Value* vp) { - (*vp)->print_line(); -} +class PrintValueVisitor: public ValueVisitor { + void visit(Value* vp) { + (*vp)->print_line(); + } +}; void Canonicalizer::set_canonical(Value x) { assert(x != NULL, "value must exist"); @@ -37,10 +39,11 @@ // in the instructions). if (canonical() != x) { if (PrintCanonicalization) { - canonical()->input_values_do(do_print_value); + PrintValueVisitor do_print_value; + canonical()->input_values_do(&do_print_value); canonical()->print_line(); tty->print_cr("canonicalized to:"); - x->input_values_do(do_print_value); + x->input_values_do(&do_print_value); x->print_line(); tty->cr(); } @@ -202,7 +205,7 @@ // limit this optimization to current block if (value != NULL && in_current_block(conv)) { set_canonical(new StoreField(x->obj(), x->offset(), x->field(), value, x->is_static(), - x->lock_stack(), x->state_before(), x->is_loaded(), x->is_initialized())); + x->lock_stack(), x->state_before(), x->is_loaded(), x->is_initialized())); return; } }
--- a/hotspot/src/share/vm/c1/c1_Compilation.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Compilation.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -66,9 +66,6 @@ } }; -Arena* Compilation::_arena = NULL; -Compilation* Compilation::_compilation = NULL; - // Implementation of Compilation @@ -238,9 +235,23 @@ } +void Compilation::setup_code_buffer(CodeBuffer* code, int call_stub_estimate) { + // Preinitialize the consts section to some large size: + int locs_buffer_size = 20 * (relocInfo::length_limit + sizeof(relocInfo)); + char* locs_buffer = NEW_RESOURCE_ARRAY(char, locs_buffer_size); + code->insts()->initialize_shared_locs((relocInfo*)locs_buffer, + locs_buffer_size / sizeof(relocInfo)); + code->initialize_consts_size(Compilation::desired_max_constant_size()); + // Call stubs + deopt/exception handler + code->initialize_stubs_size((call_stub_estimate * LIR_Assembler::call_stub_size) + + LIR_Assembler::exception_handler_size + + LIR_Assembler::deopt_handler_size); +} + + int Compilation::emit_code_body() { // emit code - Runtime1::setup_code_buffer(code(), allocator()->num_calls()); + setup_code_buffer(code(), allocator()->num_calls()); code()->initialize_oop_recorder(env()->oop_recorder()); _masm = new C1_MacroAssembler(code()); @@ -422,7 +433,8 @@ } -Compilation::Compilation(AbstractCompiler* compiler, ciEnv* env, ciMethod* method, int osr_bci) +Compilation::Compilation(AbstractCompiler* compiler, ciEnv* env, ciMethod* method, + int osr_bci, BufferBlob* buffer_blob) : _compiler(compiler) , _env(env) , _method(method) @@ -437,8 +449,10 @@ , _bailout_msg(NULL) , _exception_info_list(NULL) , _allocator(NULL) -, _code(Runtime1::get_buffer_blob()->instructions_begin(), - Runtime1::get_buffer_blob()->instructions_size()) +, _next_id(0) +, _next_block_id(0) +, _code(buffer_blob->instructions_begin(), + buffer_blob->instructions_size()) , _current_instruction(NULL) #ifndef PRODUCT , _last_instruction_printed(NULL) @@ -446,17 +460,15 @@ { PhaseTraceTime timeit(_t_compile); - assert(_arena == NULL, "shouldn't only one instance of Compilation in existence at a time"); _arena = Thread::current()->resource_area(); - _compilation = this; + _env->set_compiler_data(this); _exception_info_list = new ExceptionInfoList(); _implicit_exception_table.set_size(0); compile_method(); } Compilation::~Compilation() { - _arena = NULL; - _compilation = NULL; + _env->set_compiler_data(NULL); }
--- a/hotspot/src/share/vm/c1/c1_Compilation.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Compilation.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -54,14 +54,10 @@ class Compilation: public StackObj { friend class CompilationResourceObj; private: - - static Arena* _arena; - static Arena* arena() { return _arena; } - - static Compilation* _compilation; - - private: // compilation specifics + Arena* _arena; + int _next_id; + int _next_block_id; AbstractCompiler* _compiler; ciEnv* _env; ciMethod* _method; @@ -108,10 +104,14 @@ public: // creation - Compilation(AbstractCompiler* compiler, ciEnv* env, ciMethod* method, int osr_bci); + Compilation(AbstractCompiler* compiler, ciEnv* env, ciMethod* method, + int osr_bci, BufferBlob* buffer_blob); ~Compilation(); - static Compilation* current_compilation() { return _compilation; } + + static Compilation* current() { + return (Compilation*) ciEnv::current()->compiler_data(); + } // accessors ciEnv* env() const { return _env; } @@ -128,6 +128,15 @@ CodeBuffer* code() { return &_code; } C1_MacroAssembler* masm() const { return _masm; } CodeOffsets* offsets() { return &_offsets; } + Arena* arena() { return _arena; } + + // Instruction ids + int get_next_id() { return _next_id++; } + int number_of_instructions() const { return _next_id; } + + // BlockBegin ids + int get_next_block_id() { return _next_block_id++; } + int number_of_blocks() const { return _next_block_id; } // setters void set_has_exception_handlers(bool f) { _has_exception_handlers = f; } @@ -158,6 +167,15 @@ bool bailed_out() const { return _bailout_msg != NULL; } const char* bailout_msg() const { return _bailout_msg; } + static int desired_max_code_buffer_size() { + return (int) NMethodSizeLimit; // default 256K or 512K + } + static int desired_max_constant_size() { + return (int) NMethodSizeLimit / 10; // about 25K + } + + static void setup_code_buffer(CodeBuffer* cb, int call_stub_estimate); + // timers static void print_timers(); @@ -203,7 +221,10 @@ // Base class for objects allocated by the compiler in the compilation arena class CompilationResourceObj ALLOCATION_SUPER_CLASS_SPEC { public: - void* operator new(size_t size) { return Compilation::arena()->Amalloc(size); } + void* operator new(size_t size) { return Compilation::current()->arena()->Amalloc(size); } + void* operator new(size_t size, Arena* arena) { + return arena->Amalloc(size); + } void operator delete(void* p) {} // nothing to do };
--- a/hotspot/src/share/vm/c1/c1_Compiler.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Compiler.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -27,9 +27,6 @@ volatile int Compiler::_runtimes = uninitialized; -volatile bool Compiler::_compiling = false; - - Compiler::Compiler() { } @@ -39,47 +36,62 @@ } +void Compiler::initialize_all() { + BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob(); + Arena* arena = new Arena(); + Runtime1::initialize(buffer_blob); + FrameMap::initialize(); + // initialize data structures + ValueType::initialize(arena); + // Instruction::initialize(); + // BlockBegin::initialize(); + GraphBuilder::initialize(); + // note: to use more than one instance of LinearScan at a time this function call has to + // be moved somewhere outside of this constructor: + Interval::initialize(arena); +} + + void Compiler::initialize() { if (_runtimes != initialized) { - initialize_runtimes( Runtime1::initialize, &_runtimes); + initialize_runtimes( initialize_all, &_runtimes); } mark_initialized(); } +BufferBlob* Compiler::build_buffer_blob() { + // setup CodeBuffer. Preallocate a BufferBlob of size + // NMethodSizeLimit plus some extra space for constants. + int code_buffer_size = Compilation::desired_max_code_buffer_size() + + Compilation::desired_max_constant_size(); + BufferBlob* blob = BufferBlob::create("Compiler1 temporary CodeBuffer", + code_buffer_size); + guarantee(blob != NULL, "must create initial code buffer"); + return blob; +} + + void Compiler::compile_method(ciEnv* env, ciMethod* method, int entry_bci) { + // Allocate buffer blob once at startup since allocation for each + // compilation seems to be too expensive (at least on Intel win32). + BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob(); + if (buffer_blob == NULL) { + buffer_blob = build_buffer_blob(); + CompilerThread::current()->set_buffer_blob(buffer_blob); + } if (!is_initialized()) { initialize(); } // invoke compilation -#ifdef TIERED - // We are thread in native here... - CompilerThread* thread = CompilerThread::current(); - { - ThreadInVMfromNative tv(thread); - MutexLocker only_one (C1_lock, thread); - while ( _compiling) { - C1_lock->wait(); - } - _compiling = true; - } -#endif // TIERED { // We are nested here because we need for the destructor // of Compilation to occur before we release the any // competing compiler thread ResourceMark rm; - Compilation c(this, env, method, entry_bci); + Compilation c(this, env, method, entry_bci, buffer_blob); } -#ifdef TIERED - { - ThreadInVMfromNative tv(thread); - MutexLocker only_one (C1_lock, thread); - _compiling = false; - C1_lock->notify(); - } -#endif // TIERED }
--- a/hotspot/src/share/vm/c1/c1_Compiler.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Compiler.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -31,10 +31,6 @@ // Tracks whether runtime has been initialized static volatile int _runtimes; - // In tiered it is possible for multiple threads to want to do compilation - // only one can enter c1 at a time - static volatile bool _compiling; - public: // Creation Compiler(); @@ -47,6 +43,7 @@ virtual bool is_c1() { return true; }; #endif // TIERED + BufferBlob* build_buffer_blob(); // Missing feature tests virtual bool supports_native() { return true; } @@ -58,6 +55,7 @@ // Initialization virtual void initialize(); + static void initialize_all(); // Compilation entry point for methods virtual void compile_method(ciEnv* env, ciMethod* target, int entry_bci);
--- a/hotspot/src/share/vm/c1/c1_FrameMap.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_FrameMap.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -153,7 +153,7 @@ FrameMap::FrameMap(ciMethod* method, int monitors, int reserved_argument_area_size) { - if (!_init_done) init(); + assert(_init_done, "should already be completed"); _framesize = -1; _num_spills = -1;
--- a/hotspot/src/share/vm/c1/c1_FrameMap.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_FrameMap.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -150,6 +150,9 @@ // Opr representing the stack_pointer on this platform static LIR_Opr stack_pointer(); + // JSR 292 + static LIR_Opr method_handle_invoke_SP_save_opr(); + static BasicTypeArray* signature_type_array_for(const ciMethod* method); static BasicTypeArray* signature_type_array_for(const char * signature); @@ -232,7 +235,7 @@ return _caller_save_fpu_regs[i]; } - static void init(); + static void initialize(); }; // CallingConvention
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -2438,13 +2438,13 @@ case Bytecodes::_invokestatic : // fall through case Bytecodes::_invokedynamic : // fall through case Bytecodes::_invokeinterface: invoke(code); break; - case Bytecodes::_new : new_instance(s.get_index_big()); break; + case Bytecodes::_new : new_instance(s.get_index_u2()); break; case Bytecodes::_newarray : new_type_array(); break; case Bytecodes::_anewarray : new_object_array(); break; case Bytecodes::_arraylength : ipush(append(new ArrayLength(apop(), lock_stack()))); break; case Bytecodes::_athrow : throw_op(s.cur_bci()); break; - case Bytecodes::_checkcast : check_cast(s.get_index_big()); break; - case Bytecodes::_instanceof : instance_of(s.get_index_big()); break; + case Bytecodes::_checkcast : check_cast(s.get_index_u2()); break; + case Bytecodes::_instanceof : instance_of(s.get_index_u2()); break; // Note: we do not have special handling for the monitorenter bytecode if DeoptC1 && DeoptOnAsyncException case Bytecodes::_monitorenter : monitorenter(apop(), s.cur_bci()); break; case Bytecodes::_monitorexit : monitorexit (apop(), s.cur_bci()); break; @@ -2530,16 +2530,10 @@ } -bool GraphBuilder::_is_initialized = false; bool GraphBuilder::_can_trap [Bytecodes::number_of_java_codes]; bool GraphBuilder::_is_async[Bytecodes::number_of_java_codes]; void GraphBuilder::initialize() { - // make sure initialization happens only once (need a - // lock here, if we allow the compiler to be re-entrant) - if (is_initialized()) return; - _is_initialized = true; - // the following bytecodes are assumed to potentially // throw exceptions in compiled code - note that e.g. // monitorexit & the return bytecodes do not throw @@ -2855,7 +2849,6 @@ BlockList* bci2block = blm.bci2block(); BlockBegin* start_block = bci2block->at(0); - assert(is_initialized(), "GraphBuilder must have been initialized"); push_root_scope(scope, bci2block, start_block); // setup state for std entry
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -162,7 +162,6 @@ }; // for all GraphBuilders - static bool _is_initialized; // true if trap tables were initialized, false otherwise static bool _can_trap[Bytecodes::number_of_java_codes]; static bool _is_async[Bytecodes::number_of_java_codes]; @@ -268,7 +267,6 @@ Instruction* append_split(StateSplit* instr); // other helpers - static bool is_initialized() { return _is_initialized; } static bool is_async(Bytecodes::Code code) { assert(0 <= code && code < Bytecodes::number_of_java_codes, "illegal bytecode"); return _is_async[code];
--- a/hotspot/src/share/vm/c1/c1_IR.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_IR.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -230,7 +230,8 @@ , _stack(stack) , _exception_handlers(exception_handlers) , _next(NULL) - , _id(-1) { + , _id(-1) + , _is_method_handle_invoke(false) { assert(_stack != NULL, "must be non null"); assert(_bci == SynchronizationEntryBCI || Bytecodes::is_defined(scope()->method()->java_code_at_bci(_bci)), "make sure bci points at a real bytecode"); } @@ -241,7 +242,8 @@ , _exception_handlers(NULL) , _bci(info->_bci) , _scope_debug_info(NULL) - , _oop_map(NULL) { + , _oop_map(NULL) + , _is_method_handle_invoke(info->_is_method_handle_invoke) { if (lock_stack_only) { if (info->_stack != NULL) { _stack = info->_stack->copy_locks(); @@ -259,10 +261,10 @@ } -void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset, bool is_method_handle_invoke) { +void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset) { // record the safepoint before recording the debug info for enclosing scopes recorder->add_safepoint(pc_offset, _oop_map->deep_copy()); - _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/, is_method_handle_invoke); + _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/, _is_method_handle_invoke); recorder->end_safepoint(pc_offset); } @@ -285,11 +287,6 @@ IR::IR(Compilation* compilation, ciMethod* method, int osr_bci) : _locals_size(in_WordSize(-1)) , _num_loops(0) { - // initialize data structures - ValueType::initialize(); - Instruction::initialize(); - BlockBegin::initialize(); - GraphBuilder::initialize(); // setup IR fields _compilation = compilation; _top_scope = new IRScope(compilation, NULL, -1, method, osr_bci, true); @@ -379,15 +376,15 @@ } -class UseCountComputer: public AllStatic { +class UseCountComputer: public ValueVisitor, BlockClosure { private: - static void update_use_count(Value* n) { + void visit(Value* n) { // Local instructions and Phis for expression stack values at the // start of basic blocks are not added to the instruction list if ((*n)->bci() == -99 && (*n)->as_Local() == NULL && (*n)->as_Phi() == NULL) { assert(false, "a node was not appended to the graph"); - Compilation::current_compilation()->bailout("a node was not appended to the graph"); + Compilation::current()->bailout("a node was not appended to the graph"); } // use n's input if not visited before if (!(*n)->is_pinned() && !(*n)->has_uses()) { @@ -400,31 +397,31 @@ (*n)->_use_count++; } - static Values* worklist; - static int depth; + Values* worklist; + int depth; enum { max_recurse_depth = 20 }; - static void uses_do(Value* n) { + void uses_do(Value* n) { depth++; if (depth > max_recurse_depth) { // don't allow the traversal to recurse too deeply worklist->push(*n); } else { - (*n)->input_values_do(update_use_count); + (*n)->input_values_do(this); // special handling for some instructions if ((*n)->as_BlockEnd() != NULL) { // note on BlockEnd: // must 'use' the stack only if the method doesn't // terminate, however, in those cases stack is empty - (*n)->state_values_do(update_use_count); + (*n)->state_values_do(this); } } depth--; } - static void basic_compute_use_count(BlockBegin* b) { + void block_do(BlockBegin* b) { depth = 0; // process all pinned nodes as the roots of expression trees for (Instruction* n = b; n != NULL; n = n->next()) { @@ -447,18 +444,19 @@ assert(depth == 0, "should have counted back down"); } + UseCountComputer() { + worklist = new Values(); + depth = 0; + } + public: static void compute(BlockList* blocks) { - worklist = new Values(); - blocks->blocks_do(basic_compute_use_count); - worklist = NULL; + UseCountComputer ucc; + blocks->iterate_backward(&ucc); } }; -Values* UseCountComputer::worklist = NULL; -int UseCountComputer::depth = 0; - // helper macro for short definition of trace-output inside code #ifndef PRODUCT #define TRACE_LINEAR_SCAN(level, code) \ @@ -1300,7 +1298,7 @@ #endif // PRODUCT -void SubstitutionResolver::substitute(Value* v) { +void SubstitutionResolver::visit(Value* v) { Value v0 = *v; if (v0) { Value vs = v0->subst(); @@ -1311,20 +1309,22 @@ } #ifdef ASSERT -void check_substitute(Value* v) { - Value v0 = *v; - if (v0) { - Value vs = v0->subst(); - assert(vs == v0, "missed substitution"); +class SubstitutionChecker: public ValueVisitor { + void visit(Value* v) { + Value v0 = *v; + if (v0) { + Value vs = v0->subst(); + assert(vs == v0, "missed substitution"); + } } -} +}; #endif void SubstitutionResolver::block_do(BlockBegin* block) { Instruction* last = NULL; for (Instruction* n = block; n != NULL;) { - n->values_do(substitute); + n->values_do(this); // need to remove this instruction from the instruction stream if (n->subst() != n) { assert(last != NULL, "must have last"); @@ -1336,8 +1336,9 @@ } #ifdef ASSERT - if (block->state()) block->state()->values_do(check_substitute); - block->block_values_do(check_substitute); - if (block->end() && block->end()->state()) block->end()->state()->values_do(check_substitute); + SubstitutionChecker check_substitute; + if (block->state()) block->state()->values_do(&check_substitute); + block->block_values_do(&check_substitute); + if (block->end() && block->end()->state()) block->end()->state()->values_do(&check_substitute); #endif }
--- a/hotspot/src/share/vm/c1/c1_IR.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_IR.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -269,6 +269,7 @@ int _bci; CodeEmitInfo* _next; int _id; + bool _is_method_handle_invoke; // true if the associated call site is a MethodHandle call site. FrameMap* frame_map() const { return scope()->compilation()->frame_map(); } Compilation* compilation() const { return scope()->compilation(); } @@ -287,7 +288,8 @@ , _stack(NULL) , _exception_handlers(NULL) , _next(NULL) - , _id(-1) { + , _id(-1) + , _is_method_handle_invoke(false) { } // make a copy @@ -302,13 +304,16 @@ int bci() const { return _bci; } void add_register_oop(LIR_Opr opr); - void record_debug_info(DebugInformationRecorder* recorder, int pc_offset, bool is_method_handle_invoke = false); + void record_debug_info(DebugInformationRecorder* recorder, int pc_offset); CodeEmitInfo* next() const { return _next; } void set_next(CodeEmitInfo* next) { _next = next; } int id() const { return _id; } void set_id(int id) { _id = id; } + + bool is_method_handle_invoke() const { return _is_method_handle_invoke; } + void set_is_method_handle_invoke(bool x) { _is_method_handle_invoke = x; } }; @@ -366,8 +371,8 @@ // instructions from the instruction list. // -class SubstitutionResolver: public BlockClosure { - static void substitute(Value* v); +class SubstitutionResolver: public BlockClosure, ValueVisitor { + virtual void visit(Value* v); public: SubstitutionResolver(IR* hir) {
--- a/hotspot/src/share/vm/c1/c1_Instruction.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Instruction.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,6 @@ // Implementation of Instruction -int Instruction::_next_id = 0; - #ifdef ASSERT void Instruction::create_hi_word() { assert(type()->is_double_word() && _hi_word == NULL, "only double word has high word"); @@ -193,22 +191,22 @@ } -void ArithmeticOp::other_values_do(void f(Value*)) { +void ArithmeticOp::other_values_do(ValueVisitor* f) { if (lock_stack() != NULL) lock_stack()->values_do(f); } -void NullCheck::other_values_do(void f(Value*)) { +void NullCheck::other_values_do(ValueVisitor* f) { lock_stack()->values_do(f); } -void AccessArray::other_values_do(void f(Value*)) { +void AccessArray::other_values_do(ValueVisitor* f) { if (lock_stack() != NULL) lock_stack()->values_do(f); } // Implementation of AccessField -void AccessField::other_values_do(void f(Value*)) { +void AccessField::other_values_do(ValueVisitor* f) { if (state_before() != NULL) state_before()->values_do(f); if (lock_stack() != NULL) lock_stack()->values_do(f); } @@ -270,7 +268,7 @@ // Implementation of CompareOp -void CompareOp::other_values_do(void f(Value*)) { +void CompareOp::other_values_do(ValueVisitor* f) { if (state_before() != NULL) state_before()->values_do(f); } @@ -302,12 +300,12 @@ } -void StateSplit::state_values_do(void f(Value*)) { +void StateSplit::state_values_do(ValueVisitor* f) { if (state() != NULL) state()->values_do(f); } -void BlockBegin::state_values_do(void f(Value*)) { +void BlockBegin::state_values_do(ValueVisitor* f) { StateSplit::state_values_do(f); if (is_set(BlockBegin::exception_entry_flag)) { @@ -318,13 +316,13 @@ } -void MonitorEnter::state_values_do(void f(Value*)) { +void MonitorEnter::state_values_do(ValueVisitor* f) { StateSplit::state_values_do(f); _lock_stack_before->values_do(f); } -void Intrinsic::state_values_do(void f(Value*)) { +void Intrinsic::state_values_do(ValueVisitor* f) { StateSplit::state_values_do(f); if (lock_stack() != NULL) lock_stack()->values_do(f); } @@ -349,8 +347,9 @@ assert(args != NULL, "args must exist"); #ifdef ASSERT - values_do(assert_value); -#endif // ASSERT + AssertValues assert_value; + values_do(&assert_value); +#endif // provide an initial guess of signature size. _signature = new BasicTypeList(number_of_arguments() + (has_receiver() ? 1 : 0)); @@ -368,7 +367,7 @@ } -void Invoke::state_values_do(void f(Value*)) { +void Invoke::state_values_do(ValueVisitor* f) { StateSplit::state_values_do(f); if (state_before() != NULL) state_before()->values_do(f); if (state() != NULL) state()->values_do(f); @@ -500,30 +499,27 @@ } -void Constant::other_values_do(void f(Value*)) { +void Constant::other_values_do(ValueVisitor* f) { if (state() != NULL) state()->values_do(f); } // Implementation of NewArray -void NewArray::other_values_do(void f(Value*)) { +void NewArray::other_values_do(ValueVisitor* f) { if (state_before() != NULL) state_before()->values_do(f); } // Implementation of TypeCheck -void TypeCheck::other_values_do(void f(Value*)) { +void TypeCheck::other_values_do(ValueVisitor* f) { if (state_before() != NULL) state_before()->values_do(f); } // Implementation of BlockBegin -int BlockBegin::_next_block_id = 0; - - void BlockBegin::set_end(BlockEnd* end) { assert(end != NULL, "should not reset block end to NULL"); BlockEnd* old_end = _end; @@ -738,7 +734,7 @@ } -void BlockBegin::block_values_do(void f(Value*)) { +void BlockBegin::block_values_do(ValueVisitor* f) { for (Instruction* n = this; n != NULL; n = n->next()) n->values_do(f); } @@ -930,7 +926,7 @@ } -void BlockList::values_do(void f(Value*)) { +void BlockList::values_do(ValueVisitor* f) { for (int i = length() - 1; i >= 0; i--) at(i)->block_values_do(f); } @@ -973,7 +969,7 @@ } -void BlockEnd::other_values_do(void f(Value*)) { +void BlockEnd::other_values_do(ValueVisitor* f) { if (state_before() != NULL) state_before()->values_do(f); } @@ -1012,6 +1008,6 @@ // Implementation of Throw -void Throw::state_values_do(void f(Value*)) { +void Throw::state_values_do(ValueVisitor* f) { BlockEnd::state_values_do(f); }
--- a/hotspot/src/share/vm/c1/c1_Instruction.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Instruction.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -116,6 +116,13 @@ }; +// A simple closure class for visiting the values of an Instruction +class ValueVisitor: public StackObj { + public: + virtual void visit(Value* v) = 0; +}; + + // Some array and list classes define_array(BlockBeginArray, BlockBegin*) define_stack(_BlockList, BlockBeginArray) @@ -129,7 +136,7 @@ void iterate_forward(BlockClosure* closure); void iterate_backward(BlockClosure* closure); void blocks_do(void f(BlockBegin*)); - void values_do(void f(Value*)); + void values_do(ValueVisitor* f); void print(bool cfg_only = false, bool live_only = false) PRODUCT_RETURN; }; @@ -264,8 +271,6 @@ class Instruction: public CompilationResourceObj { private: - static int _next_id; // the node counter - int _id; // the unique instruction id int _bci; // the instruction bci int _use_count; // the number of instructions refering to this value (w/o prev/next); only roots can have use count = 0 or > 1 @@ -283,6 +288,7 @@ #endif friend class UseCountComputer; + friend class BlockBegin; protected: void set_bci(int bci) { assert(bci == SynchronizationEntryBCI || bci >= 0, "illegal bci"); _bci = bci; } @@ -292,6 +298,13 @@ } public: + void* operator new(size_t size) { + Compilation* c = Compilation::current(); + void* res = c->arena()->Amalloc(size); + ((Instruction*)res)->_id = c->get_next_id(); + return res; + } + enum InstructionFlag { NeedsNullCheckFlag = 0, CanTrapFlag, @@ -338,13 +351,13 @@ static Condition negate(Condition cond); // initialization - static void initialize() { _next_id = 0; } - static int number_of_instructions() { return _next_id; } + static int number_of_instructions() { + return Compilation::current()->number_of_instructions(); + } // creation Instruction(ValueType* type, bool type_is_constant = false, bool create_hi = true) - : _id(_next_id++) - , _bci(-99) + : _bci(-99) , _use_count(0) , _pin_state(0) , _type(type) @@ -479,10 +492,10 @@ virtual bool can_trap() const { return false; } - virtual void input_values_do(void f(Value*)) = 0; - virtual void state_values_do(void f(Value*)) { /* usually no state - override on demand */ } - virtual void other_values_do(void f(Value*)) { /* usually no other - override on demand */ } - void values_do(void f(Value*)) { input_values_do(f); state_values_do(f); other_values_do(f); } + virtual void input_values_do(ValueVisitor* f) = 0; + virtual void state_values_do(ValueVisitor* f) { /* usually no state - override on demand */ } + virtual void other_values_do(ValueVisitor* f) { /* usually no other - override on demand */ } + void values_do(ValueVisitor* f) { input_values_do(f); state_values_do(f); other_values_do(f); } virtual ciType* exact_type() const { return NULL; } virtual ciType* declared_type() const { return NULL; } @@ -517,9 +530,12 @@ // Debugging support + #ifdef ASSERT - static void assert_value(Value* x) { assert((*x) != NULL, "value must exist"); } - #define ASSERT_VALUES values_do(assert_value); +class AssertValues: public ValueVisitor { + void visit(Value* x) { assert((*x) != NULL, "value must exist"); } +}; + #define ASSERT_VALUES { AssertValues assert_value; values_do(&assert_value); } #else #define ASSERT_VALUES #endif // ASSERT @@ -555,7 +571,7 @@ void make_illegal() { set_type(illegalType); } // generic - virtual void input_values_do(void f(Value*)) { ShouldNotReachHere(); } + virtual void input_values_do(ValueVisitor* f) { ShouldNotReachHere(); } }; @@ -615,7 +631,7 @@ } // generic - virtual void input_values_do(void f(Value*)) { + virtual void input_values_do(ValueVisitor* f) { } }; @@ -635,7 +651,7 @@ int java_index() const { return _java_index; } // generic - virtual void input_values_do(void f(Value*)) { /* no values */ } + virtual void input_values_do(ValueVisitor* f) { /* no values */ } }; @@ -663,8 +679,8 @@ // generic virtual bool can_trap() const { return state() != NULL; } - virtual void input_values_do(void f(Value*)) { /* no values */ } - virtual void other_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { /* no values */ } + virtual void other_values_do(ValueVisitor* f); virtual intx hash() const; virtual bool is_equal(Value v) const; @@ -734,8 +750,8 @@ // generic virtual bool can_trap() const { return needs_null_check() || needs_patching(); } - virtual void input_values_do(void f(Value*)) { f(&_obj); } - virtual void other_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { f->visit(&_obj); } + virtual void other_values_do(ValueVisitor* f); }; @@ -776,7 +792,7 @@ bool needs_write_barrier() const { return check_flag(NeedsWriteBarrierFlag); } // generic - virtual void input_values_do(void f(Value*)) { AccessField::input_values_do(f); f(&_value); } + virtual void input_values_do(ValueVisitor* f) { AccessField::input_values_do(f); f->visit(&_value); } }; @@ -804,8 +820,8 @@ // generic virtual bool can_trap() const { return needs_null_check(); } - virtual void input_values_do(void f(Value*)) { f(&_array); } - virtual void other_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { f->visit(&_array); } + virtual void other_values_do(ValueVisitor* f); }; @@ -857,7 +873,7 @@ bool compute_needs_range_check(); // generic - virtual void input_values_do(void f(Value*)) { AccessArray::input_values_do(f); f(&_index); if (_length != NULL) f(&_length); } + virtual void input_values_do(ValueVisitor* f) { AccessArray::input_values_do(f); f->visit(&_index); if (_length != NULL) f->visit(&_length); } }; @@ -909,7 +925,7 @@ bool needs_store_check() const { return check_flag(NeedsStoreCheckFlag); } // generic - virtual void input_values_do(void f(Value*)) { AccessIndexed::input_values_do(f); f(&_value); } + virtual void input_values_do(ValueVisitor* f) { AccessIndexed::input_values_do(f); f->visit(&_value); } }; @@ -927,7 +943,7 @@ Value x() const { return _x; } // generic - virtual void input_values_do(void f(Value*)) { f(&_x); } + virtual void input_values_do(ValueVisitor* f) { f->visit(&_x); } }; @@ -956,7 +972,7 @@ // generic virtual bool is_commutative() const { return false; } - virtual void input_values_do(void f(Value*)) { f(&_x); f(&_y); } + virtual void input_values_do(ValueVisitor* f) { f->visit(&_x); f->visit(&_y); } }; @@ -982,7 +998,7 @@ // generic virtual bool is_commutative() const; virtual bool can_trap() const; - virtual void other_values_do(void f(Value*)); + virtual void other_values_do(ValueVisitor* f); HASHING3(Op2, true, op(), x()->subst(), y()->subst()) }; @@ -1023,7 +1039,7 @@ // generic HASHING3(Op2, true, op(), x()->subst(), y()->subst()) - virtual void other_values_do(void f(Value*)); + virtual void other_values_do(ValueVisitor* f); }; @@ -1051,7 +1067,7 @@ Value fval() const { return _fval; } // generic - virtual void input_values_do(void f(Value*)) { Op2::input_values_do(f); f(&_tval); f(&_fval); } + virtual void input_values_do(ValueVisitor* f) { Op2::input_values_do(f); f->visit(&_tval); f->visit(&_fval); } }; @@ -1071,7 +1087,7 @@ Value value() const { return _value; } // generic - virtual void input_values_do(void f(Value*)) { f(&_value); } + virtual void input_values_do(ValueVisitor* f) { f->visit(&_value); } HASHING2(Convert, true, op(), value()->subst()) }; @@ -1100,8 +1116,8 @@ // generic virtual bool can_trap() const { return check_flag(CanTrapFlag); /* null-check elimination sets to false */ } - virtual void input_values_do(void f(Value*)) { f(&_obj); } - virtual void other_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { f->visit(&_obj); } + virtual void other_values_do(ValueVisitor* f); HASHING1(NullCheck, true, obj()->subst()) }; @@ -1127,8 +1143,8 @@ void set_state(ValueStack* state) { _state = state; } // generic - virtual void input_values_do(void f(Value*)) { /* no values */ } - virtual void state_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { /* no values */ } + virtual void state_values_do(ValueVisitor* f); }; @@ -1169,12 +1185,12 @@ // generic virtual bool can_trap() const { return true; } - virtual void input_values_do(void f(Value*)) { + virtual void input_values_do(ValueVisitor* f) { StateSplit::input_values_do(f); - if (has_receiver()) f(&_recv); - for (int i = 0; i < _args->length(); i++) f(_args->adr_at(i)); + if (has_receiver()) f->visit(&_recv); + for (int i = 0; i < _args->length(); i++) f->visit(_args->adr_at(i)); } - virtual void state_values_do(void f(Value*)); + virtual void state_values_do(ValueVisitor *f); }; @@ -1212,8 +1228,8 @@ // generic virtual bool can_trap() const { return true; } - virtual void input_values_do(void f(Value*)) { StateSplit::input_values_do(f); f(&_length); } - virtual void other_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { StateSplit::input_values_do(f); f->visit(&_length); } + virtual void other_values_do(ValueVisitor* f); }; @@ -1262,7 +1278,7 @@ int rank() const { return dims()->length(); } // generic - virtual void input_values_do(void f(Value*)) { + virtual void input_values_do(ValueVisitor* f) { // NOTE: we do not call NewArray::input_values_do since "length" // is meaningless for a multi-dimensional array; passing the // zeroth element down to NewArray as its length is a bad idea @@ -1270,7 +1286,7 @@ // get updated, and the value must not be traversed twice. Was bug // - kbr 4/10/2001 StateSplit::input_values_do(f); - for (int i = 0; i < _dims->length(); i++) f(_dims->adr_at(i)); + for (int i = 0; i < _dims->length(); i++) f->visit(_dims->adr_at(i)); } }; @@ -1300,8 +1316,8 @@ // generic virtual bool can_trap() const { return true; } - virtual void input_values_do(void f(Value*)) { StateSplit::input_values_do(f); f(&_obj); } - virtual void other_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { StateSplit::input_values_do(f); f->visit(&_obj); } + virtual void other_values_do(ValueVisitor* f); }; @@ -1366,7 +1382,7 @@ int monitor_no() const { return _monitor_no; } // generic - virtual void input_values_do(void f(Value*)) { StateSplit::input_values_do(f); f(&_obj); } + virtual void input_values_do(ValueVisitor* f) { StateSplit::input_values_do(f); f->visit(&_obj); } }; @@ -1385,7 +1401,7 @@ // accessors ValueStack* lock_stack_before() const { return _lock_stack_before; } - virtual void state_values_do(void f(Value*)); + virtual void state_values_do(ValueVisitor* f); // generic virtual bool can_trap() const { return true; } @@ -1454,11 +1470,11 @@ // generic virtual bool can_trap() const { return check_flag(CanTrapFlag); } - virtual void input_values_do(void f(Value*)) { + virtual void input_values_do(ValueVisitor* f) { StateSplit::input_values_do(f); - for (int i = 0; i < _args->length(); i++) f(_args->adr_at(i)); + for (int i = 0; i < _args->length(); i++) f->visit(_args->adr_at(i)); } - virtual void state_values_do(void f(Value*)); + virtual void state_values_do(ValueVisitor* f); }; @@ -1467,8 +1483,6 @@ LEAF(BlockBegin, StateSplit) private: - static int _next_block_id; // the block counter - int _block_id; // the unique block id int _depth_first_number; // number of this block in a depth-first ordering int _linear_scan_number; // number of this block in linear-scan ordering @@ -1510,14 +1524,22 @@ friend class SuxAndWeightAdjuster; public: + void* operator new(size_t size) { + Compilation* c = Compilation::current(); + void* res = c->arena()->Amalloc(size); + ((BlockBegin*)res)->_id = c->get_next_id(); + ((BlockBegin*)res)->_block_id = c->get_next_block_id(); + return res; + } + // initialization/counting - static void initialize() { _next_block_id = 0; } - static int number_of_blocks() { return _next_block_id; } + static int number_of_blocks() { + return Compilation::current()->number_of_blocks(); + } // creation BlockBegin(int bci) : StateSplit(illegalType) - , _block_id(_next_block_id++) , _depth_first_number(-1) , _linear_scan_number(-1) , _loop_depth(0) @@ -1592,7 +1614,7 @@ void init_stores_to_locals(int locals_count) { _stores_to_locals = BitMap(locals_count); _stores_to_locals.clear(); } // generic - virtual void state_values_do(void f(Value*)); + virtual void state_values_do(ValueVisitor* f); // successors and predecessors int number_of_sux() const; @@ -1646,7 +1668,7 @@ void iterate_preorder (BlockClosure* closure); void iterate_postorder (BlockClosure* closure); - void block_values_do(void f(Value*)); + void block_values_do(ValueVisitor* f); // loops void set_loop_index(int ix) { _loop_index = ix; } @@ -1698,7 +1720,7 @@ void set_begin(BlockBegin* begin); // generic - virtual void other_values_do(void f(Value*)); + virtual void other_values_do(ValueVisitor* f); // successors int number_of_sux() const { return _sux != NULL ? _sux->length() : 0; } @@ -1787,7 +1809,7 @@ void set_profiled_bci(int bci) { _profiled_bci = bci; } // generic - virtual void input_values_do(void f(Value*)) { BlockEnd::input_values_do(f); f(&_x); f(&_y); } + virtual void input_values_do(ValueVisitor* f) { BlockEnd::input_values_do(f); f->visit(&_x); f->visit(&_y); } }; @@ -1841,7 +1863,7 @@ } // generic - virtual void input_values_do(void f(Value*)) { BlockEnd::input_values_do(f); f(&_obj); } + virtual void input_values_do(ValueVisitor* f) { BlockEnd::input_values_do(f); f->visit(&_obj); } }; @@ -1863,7 +1885,7 @@ int length() const { return number_of_sux() - 1; } // generic - virtual void input_values_do(void f(Value*)) { BlockEnd::input_values_do(f); f(&_tag); } + virtual void input_values_do(ValueVisitor* f) { BlockEnd::input_values_do(f); f->visit(&_tag); } }; @@ -1916,9 +1938,9 @@ bool has_result() const { return result() != NULL; } // generic - virtual void input_values_do(void f(Value*)) { + virtual void input_values_do(ValueVisitor* f) { BlockEnd::input_values_do(f); - if (has_result()) f(&_result); + if (has_result()) f->visit(&_result); } }; @@ -1938,8 +1960,8 @@ // generic virtual bool can_trap() const { return true; } - virtual void input_values_do(void f(Value*)) { BlockEnd::input_values_do(f); f(&_exception); } - virtual void state_values_do(void f(Value*)); + virtual void input_values_do(ValueVisitor* f) { BlockEnd::input_values_do(f); f->visit(&_exception); } + virtual void state_values_do(ValueVisitor* f); }; @@ -1971,7 +1993,7 @@ #endif // generic - virtual void input_values_do(void f(Value*)) { } + virtual void input_values_do(ValueVisitor* f) { } }; @@ -1984,7 +2006,7 @@ } // generic - virtual void input_values_do(void f(Value*)) { } + virtual void input_values_do(ValueVisitor* f) { } }; @@ -2008,7 +2030,7 @@ Value input() const { return _input; } // generic - virtual void input_values_do(void f(Value*)) { f(&_input); } + virtual void input_values_do(ValueVisitor* f) { f->visit(&_input); } }; @@ -2033,8 +2055,8 @@ BasicType basic_type() { return _basic_type; } // generic - virtual void input_values_do(void f(Value*)) { } - virtual void other_values_do(void f(Value*)) { } + virtual void input_values_do(ValueVisitor* f) { } + virtual void other_values_do(ValueVisitor* f) { } }; @@ -2078,9 +2100,9 @@ void set_log2_scale(int log2_scale) { _log2_scale = log2_scale; } // generic - virtual void input_values_do(void f(Value*)) { UnsafeOp::input_values_do(f); - f(&_base); - if (has_index()) f(&_index); } + virtual void input_values_do(ValueVisitor* f) { UnsafeOp::input_values_do(f); + f->visit(&_base); + if (has_index()) f->visit(&_index); } }; @@ -2128,8 +2150,8 @@ Value value() { return _value; } // generic - virtual void input_values_do(void f(Value*)) { UnsafeRawOp::input_values_do(f); - f(&_value); } + virtual void input_values_do(ValueVisitor* f) { UnsafeRawOp::input_values_do(f); + f->visit(&_value); } }; @@ -2149,9 +2171,9 @@ Value offset() { return _offset; } bool is_volatile() { return _is_volatile; } // generic - virtual void input_values_do(void f(Value*)) { UnsafeOp::input_values_do(f); - f(&_object); - f(&_offset); } + virtual void input_values_do(ValueVisitor* f) { UnsafeOp::input_values_do(f); + f->visit(&_object); + f->visit(&_offset); } }; @@ -2180,8 +2202,8 @@ Value value() { return _value; } // generic - virtual void input_values_do(void f(Value*)) { UnsafeObjectOp::input_values_do(f); - f(&_value); } + virtual void input_values_do(ValueVisitor* f) { UnsafeObjectOp::input_values_do(f); + f->visit(&_value); } }; @@ -2238,7 +2260,7 @@ Value recv() { return _recv; } ciKlass* known_holder() { return _known_holder; } - virtual void input_values_do(void f(Value*)) { if (_recv != NULL) f(&_recv); } + virtual void input_values_do(ValueVisitor* f) { if (_recv != NULL) f->visit(&_recv); } }; @@ -2266,7 +2288,7 @@ int offset() { return _offset; } int increment() { return _increment; } - virtual void input_values_do(void f(Value*)) { f(&_mdo); } + virtual void input_values_do(ValueVisitor* f) { f->visit(&_mdo); } };
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_LIR.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -715,7 +715,10 @@ } if (opJavaCall->_info) do_info(opJavaCall->_info); - if (opJavaCall->is_method_handle_invoke()) do_temp(FrameMap::method_handle_invoke_SP_save_opr()); + if (opJavaCall->is_method_handle_invoke()) { + opJavaCall->_method_handle_invoke_SP_save_opr = FrameMap::method_handle_invoke_SP_save_opr(); + do_temp(opJavaCall->_method_handle_invoke_SP_save_opr); + } do_call(); if (opJavaCall->_result->is_valid()) do_output(opJavaCall->_result);
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_LIR.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -505,15 +505,22 @@ , _type(type) , _disp(0) { verify(); } - LIR_Address(LIR_Opr base, int disp, BasicType type): + LIR_Address(LIR_Opr base, intx disp, BasicType type): _base(base) , _index(LIR_OprDesc::illegalOpr()) , _scale(times_1) , _type(type) , _disp(disp) { verify(); } + LIR_Address(LIR_Opr base, BasicType type): + _base(base) + , _index(LIR_OprDesc::illegalOpr()) + , _scale(times_1) + , _type(type) + , _disp(0) { verify(); } + #ifdef X86 - LIR_Address(LIR_Opr base, LIR_Opr index, Scale scale, int disp, BasicType type): + LIR_Address(LIR_Opr base, LIR_Opr index, Scale scale, intx disp, BasicType type): _base(base) , _index(index) , _scale(scale) @@ -1033,8 +1040,9 @@ friend class LIR_OpVisitState; private: - ciMethod* _method; - LIR_Opr _receiver; + ciMethod* _method; + LIR_Opr _receiver; + LIR_Opr _method_handle_invoke_SP_save_opr; // Used in LIR_OpVisitState::visit to store the reference to FrameMap::method_handle_invoke_SP_save_opr. public: LIR_OpJavaCall(LIR_Code code, ciMethod* method, @@ -1043,14 +1051,18 @@ CodeEmitInfo* info) : LIR_OpCall(code, addr, result, arguments, info) , _receiver(receiver) - , _method(method) { assert(is_in_range(code, begin_opJavaCall, end_opJavaCall), "code check"); } + , _method(method) + , _method_handle_invoke_SP_save_opr(LIR_OprFact::illegalOpr) + { assert(is_in_range(code, begin_opJavaCall, end_opJavaCall), "code check"); } LIR_OpJavaCall(LIR_Code code, ciMethod* method, LIR_Opr receiver, LIR_Opr result, intptr_t vtable_offset, LIR_OprList* arguments, CodeEmitInfo* info) : LIR_OpCall(code, (address)vtable_offset, result, arguments, info) , _receiver(receiver) - , _method(method) { assert(is_in_range(code, begin_opJavaCall, end_opJavaCall), "code check"); } + , _method(method) + , _method_handle_invoke_SP_save_opr(LIR_OprFact::illegalOpr) + { assert(is_in_range(code, begin_opJavaCall, end_opJavaCall), "code check"); } LIR_Opr receiver() const { return _receiver; } ciMethod* method() const { return _method; }
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -301,9 +301,9 @@ } -void LIR_Assembler::add_call_info(int pc_offset, CodeEmitInfo* cinfo, bool is_method_handle_invoke) { +void LIR_Assembler::add_call_info(int pc_offset, CodeEmitInfo* cinfo) { flush_debug_info(pc_offset); - cinfo->record_debug_info(compilation()->debug_info_recorder(), pc_offset, is_method_handle_invoke); + cinfo->record_debug_info(compilation()->debug_info_recorder(), pc_offset); if (cinfo->exception_handlers() != NULL) { compilation()->add_exception_handlers_for_pco(pc_offset, cinfo->exception_handlers()); } @@ -413,12 +413,6 @@ void LIR_Assembler::emit_call(LIR_OpJavaCall* op) { verify_oop_map(op->info()); - // JSR 292 - // Preserve the SP over MethodHandle call sites. - if (op->is_method_handle_invoke()) { - preserve_SP(op); - } - if (os::is_MP()) { // must align calls sites, otherwise they can't be updated atomically on MP hardware align_call(op->code()); @@ -444,10 +438,6 @@ default: ShouldNotReachHere(); } - if (op->is_method_handle_invoke()) { - restore_SP(op); - } - #if defined(X86) && defined(TIERED) // C2 leave fpu stack dirty clean it if (UseSSE < 2) {
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -84,7 +84,7 @@ Address as_Address_hi(LIR_Address* addr); // debug information - void add_call_info(int pc_offset, CodeEmitInfo* cinfo, bool is_method_handle_invoke = false); + void add_call_info(int pc_offset, CodeEmitInfo* cinfo); void add_debug_info_for_branch(CodeEmitInfo* info); void add_debug_info_for_div0(int pc_offset, CodeEmitInfo* cinfo); void add_debug_info_for_div0_here(CodeEmitInfo* info); @@ -212,10 +212,6 @@ void ic_call( LIR_OpJavaCall* op); void vtable_call( LIR_OpJavaCall* op); - // JSR 292 - void preserve_SP(LIR_OpJavaCall* op); - void restore_SP( LIR_OpJavaCall* op); - void osr_entry(); void build_frame();
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -304,7 +304,7 @@ __ branch_destination(block->label()); if (LIRTraceExecution && - Compilation::current_compilation()->hir()->start()->block_id() != block->block_id() && + Compilation::current()->hir()->start()->block_id() != block->block_id() && !block->is_set(BlockBegin::exception_entry_flag)) { assert(block->lir()->instructions_list()->length() == 1, "should come right after br_dst"); trace_block_entry(block); @@ -1309,7 +1309,7 @@ __ cmp(lir_cond_notEqual, flag_val, LIR_OprFact::intConst(0)); if (!addr_opr->is_address()) { assert(addr_opr->is_register(), "must be"); - addr_opr = LIR_OprFact::address(new LIR_Address(addr_opr, 0, T_OBJECT)); + addr_opr = LIR_OprFact::address(new LIR_Address(addr_opr, T_OBJECT)); } CodeStub* slow = new G1PreBarrierStub(addr_opr, pre_val, pre_val_patch_code, info); @@ -1325,7 +1325,7 @@ new_val->as_constant_ptr()->as_jobject() == NULL) return; if (!new_val->is_register()) { - LIR_Opr new_val_reg = new_pointer_register(); + LIR_Opr new_val_reg = new_register(T_OBJECT); if (new_val->is_constant()) { __ move(new_val, new_val_reg); } else { @@ -1337,7 +1337,7 @@ if (addr->is_address()) { LIR_Address* address = addr->as_address_ptr(); - LIR_Opr ptr = new_pointer_register(); + LIR_Opr ptr = new_register(T_OBJECT); if (!address->index()->is_valid() && address->disp() == 0) { __ move(address->base(), ptr); } else { @@ -1350,7 +1350,6 @@ LIR_Opr xor_res = new_pointer_register(); LIR_Opr xor_shift_res = new_pointer_register(); - if (TwoOperandLIRForm ) { __ move(addr, xor_res); __ logical_xor(xor_res, new_val, xor_res); @@ -1368,7 +1367,7 @@ } if (!new_val->is_register()) { - LIR_Opr new_val_reg = new_pointer_register(); + LIR_Opr new_val_reg = new_register(T_OBJECT); __ leal(new_val, new_val_reg); new_val = new_val_reg; } @@ -1377,7 +1376,7 @@ __ cmp(lir_cond_notEqual, xor_shift_res, LIR_OprFact::intptrConst(NULL_WORD)); CodeStub* slow = new G1PostBarrierStub(addr, new_val); - __ branch(lir_cond_notEqual, T_INT, slow); + __ branch(lir_cond_notEqual, LP64_ONLY(T_LONG) NOT_LP64(T_INT), slow); __ branch_destination(slow->continuation()); } @@ -2371,9 +2370,17 @@ bool optimized = x->target_is_loaded() && x->target_is_final(); assert(receiver->is_illegal() || receiver->is_equal(LIR_Assembler::receiverOpr()), "must match"); + // JSR 292 + // Preserve the SP over MethodHandle call sites. + ciMethod* target = x->target(); + if (target->is_method_handle_invoke()) { + info->set_is_method_handle_invoke(true); + __ move(FrameMap::stack_pointer(), FrameMap::method_handle_invoke_SP_save_opr()); + } + switch (x->code()) { case Bytecodes::_invokestatic: - __ call_static(x->target(), result_register, + __ call_static(target, result_register, SharedRuntime::get_resolve_static_call_stub(), arg_list, info); break; @@ -2383,17 +2390,17 @@ // for final target we still produce an inline cache, in order // to be able to call mixed mode if (x->code() == Bytecodes::_invokespecial || optimized) { - __ call_opt_virtual(x->target(), receiver, result_register, + __ call_opt_virtual(target, receiver, result_register, SharedRuntime::get_resolve_opt_virtual_call_stub(), arg_list, info); } else if (x->vtable_index() < 0) { - __ call_icvirtual(x->target(), receiver, result_register, + __ call_icvirtual(target, receiver, result_register, SharedRuntime::get_resolve_virtual_call_stub(), arg_list, info); } else { int entry_offset = instanceKlass::vtable_start_offset() + x->vtable_index() * vtableEntry::size(); int vtable_offset = entry_offset * wordSize + vtableEntry::method_offset_in_bytes(); - __ call_virtual(x->target(), receiver, result_register, vtable_offset, arg_list, info); + __ call_virtual(target, receiver, result_register, vtable_offset, arg_list, info); } break; case Bytecodes::_invokedynamic: { @@ -2432,7 +2439,7 @@ // Load target MethodHandle from CallSite object. __ load(new LIR_Address(tmp, java_dyn_CallSite::target_offset_in_bytes(), T_OBJECT), receiver); - __ call_dynamic(x->target(), receiver, result_register, + __ call_dynamic(target, receiver, result_register, SharedRuntime::get_resolve_opt_virtual_call_stub(), arg_list, info); break; @@ -2442,6 +2449,12 @@ break; } + // JSR 292 + // Restore the SP after MethodHandle call sites. + if (target->is_method_handle_invoke()) { + __ move(FrameMap::method_handle_invoke_SP_save_opr(), FrameMap::stack_pointer()); + } + if (x->type()->is_float() || x->type()->is_double()) { // Force rounding of results from non-strictfp when in strictfp // scope (or when we don't know the strictness of the callee, to
--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -84,10 +84,6 @@ , _fpu_stack_allocator(NULL) #endif { - // note: to use more than on instance of LinearScan at a time this function call has to - // be moved somewhere outside of this constructor: - Interval::initialize(); - assert(this->ir() != NULL, "check if valid"); assert(this->compilation() != NULL, "check if valid"); assert(this->gen() != NULL, "check if valid"); @@ -3929,8 +3925,8 @@ // initialize sentinel Range* Range::_end = NULL; -void Range::initialize() { - _end = new Range(max_jint, max_jint, NULL); +void Range::initialize(Arena* arena) { + _end = new (arena) Range(max_jint, max_jint, NULL); } int Range::intersects_at(Range* r2) const { @@ -3976,9 +3972,9 @@ // initialize sentinel Interval* Interval::_end = NULL; -void Interval::initialize() { - Range::initialize(); - _end = new Interval(-1); +void Interval::initialize(Arena* arena) { + Range::initialize(arena); + _end = new (arena) Interval(-1); } Interval::Interval(int reg_num) :
--- a/hotspot/src/share/vm/c1/c1_LinearScan.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_LinearScan.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -462,7 +462,7 @@ public: Range(int from, int to, Range* next); - static void initialize(); + static void initialize(Arena* arena); static Range* end() { return _end; } int from() const { return _from; } @@ -529,7 +529,7 @@ public: Interval(int reg_num); - static void initialize(); + static void initialize(Arena* arena); static Interval* end() { return _end; } // accessors
--- a/hotspot/src/share/vm/c1/c1_Optimizer.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Optimizer.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -437,11 +437,8 @@ // Because of a static contained within (for the purpose of iteration // over instructions), it is only valid to have one of these active at // a time -class NullCheckEliminator { +class NullCheckEliminator: public ValueVisitor { private: - static NullCheckEliminator* _static_nce; - static void do_value(Value* vp); - Optimizer* _opt; ValueSet* _visitable_instructions; // Visit each instruction only once per basic block @@ -504,6 +501,8 @@ // Process a graph void iterate(BlockBegin* root); + void visit(Value* f); + // In some situations (like NullCheck(x); getfield(x)) the debug // information from the explicit NullCheck can be used to populate // the getfield, even if the two instructions are in different @@ -602,14 +601,11 @@ void NullCheckVisitor::do_ProfileCounter (ProfileCounter* x) {} -NullCheckEliminator* NullCheckEliminator::_static_nce = NULL; - - -void NullCheckEliminator::do_value(Value* p) { +void NullCheckEliminator::visit(Value* p) { assert(*p != NULL, "should not find NULL instructions"); - if (_static_nce->visitable(*p)) { - _static_nce->mark_visited(*p); - (*p)->visit(&_static_nce->_visitor); + if (visitable(*p)) { + mark_visited(*p); + (*p)->visit(&_visitor); } } @@ -637,7 +633,6 @@ void NullCheckEliminator::iterate_one(BlockBegin* block) { - _static_nce = this; clear_visitable_state(); // clear out an old explicit null checks set_last_explicit_null_check(NULL); @@ -712,7 +707,7 @@ mark_visitable(instr); if (instr->is_root() || instr->can_trap() || (instr->as_NullCheck() != NULL)) { mark_visited(instr); - instr->input_values_do(&NullCheckEliminator::do_value); + instr->input_values_do(this); instr->visit(&_visitor); } }
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -60,7 +60,6 @@ // Implementation of Runtime1 -bool Runtime1::_is_initialized = false; CodeBlob* Runtime1::_blobs[Runtime1::number_of_ids]; const char *Runtime1::_blob_names[] = { RUNTIME1_STUBS(STUB_NAME, LAST_STUB_NAME) @@ -89,8 +88,6 @@ int Runtime1::_throw_count = 0; #endif -BufferBlob* Runtime1::_buffer_blob = NULL; - // Simple helper to see if the caller of a runtime stub which // entered the VM has been deoptimized @@ -117,43 +114,14 @@ } -BufferBlob* Runtime1::get_buffer_blob() { - // Allocate code buffer space only once - BufferBlob* blob = _buffer_blob; - if (blob == NULL) { - // setup CodeBuffer. Preallocate a BufferBlob of size - // NMethodSizeLimit plus some extra space for constants. - int code_buffer_size = desired_max_code_buffer_size() + desired_max_constant_size(); - blob = BufferBlob::create("Compiler1 temporary CodeBuffer", - code_buffer_size); - guarantee(blob != NULL, "must create initial code buffer"); - _buffer_blob = blob; - } - return _buffer_blob; -} - -void Runtime1::setup_code_buffer(CodeBuffer* code, int call_stub_estimate) { - // Preinitialize the consts section to some large size: - int locs_buffer_size = 20 * (relocInfo::length_limit + sizeof(relocInfo)); - char* locs_buffer = NEW_RESOURCE_ARRAY(char, locs_buffer_size); - code->insts()->initialize_shared_locs((relocInfo*)locs_buffer, - locs_buffer_size / sizeof(relocInfo)); - code->initialize_consts_size(desired_max_constant_size()); - // Call stubs + deopt/exception handler - code->initialize_stubs_size((call_stub_estimate * LIR_Assembler::call_stub_size) + - LIR_Assembler::exception_handler_size + - LIR_Assembler::deopt_handler_size); -} - - -void Runtime1::generate_blob_for(StubID id) { +void Runtime1::generate_blob_for(BufferBlob* buffer_blob, StubID id) { assert(0 <= id && id < number_of_ids, "illegal stub id"); ResourceMark rm; // create code buffer for code storage - CodeBuffer code(get_buffer_blob()->instructions_begin(), - get_buffer_blob()->instructions_size()); + CodeBuffer code(buffer_blob->instructions_begin(), + buffer_blob->instructions_size()); - setup_code_buffer(&code, 0); + Compilation::setup_code_buffer(&code, 0); // create assembler for code generation StubAssembler* sasm = new StubAssembler(&code, name_for(id), id); @@ -204,35 +172,28 @@ } -void Runtime1::initialize() { - // Warning: If we have more than one compilation running in parallel, we - // need a lock here with the current setup (lazy initialization). - if (!is_initialized()) { - _is_initialized = true; - - // platform-dependent initialization - initialize_pd(); - // generate stubs - for (int id = 0; id < number_of_ids; id++) generate_blob_for((StubID)id); - // printing +void Runtime1::initialize(BufferBlob* blob) { + // platform-dependent initialization + initialize_pd(); + // generate stubs + for (int id = 0; id < number_of_ids; id++) generate_blob_for(blob, (StubID)id); + // printing #ifndef PRODUCT - if (PrintSimpleStubs) { - ResourceMark rm; - for (int id = 0; id < number_of_ids; id++) { - _blobs[id]->print(); - if (_blobs[id]->oop_maps() != NULL) { - _blobs[id]->oop_maps()->print(); - } + if (PrintSimpleStubs) { + ResourceMark rm; + for (int id = 0; id < number_of_ids; id++) { + _blobs[id]->print(); + if (_blobs[id]->oop_maps() != NULL) { + _blobs[id]->oop_maps()->print(); } } + } #endif - } } CodeBlob* Runtime1::blob_for(StubID id) { assert(0 <= id && id < number_of_ids, "illegal stub id"); - if (!is_initialized()) initialize(); return _blobs[id]; }
--- a/hotspot/src/share/vm/c1/c1_Runtime1.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_Runtime1.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -70,18 +70,6 @@ class Runtime1: public AllStatic { friend class VMStructs; friend class ArrayCopyStub; - private: - static int desired_max_code_buffer_size() { - return (int) NMethodSizeLimit; // default 256K or 512K - } - static int desired_max_constant_size() { - return (int) NMethodSizeLimit / 10; // about 25K - } - - // Note: This buffers is allocated once at startup since allocation - // for each compilation seems to be too expensive (at least on Intel - // win32). - static BufferBlob* _buffer_blob; public: enum StubID { @@ -115,12 +103,11 @@ #endif private: - static bool _is_initialized; static CodeBlob* _blobs[number_of_ids]; static const char* _blob_names[]; // stub generation - static void generate_blob_for(StubID id); + static void generate_blob_for(BufferBlob* blob, StubID id); static OopMapSet* generate_code_for(StubID id, StubAssembler* masm); static OopMapSet* generate_exception_throw(StubAssembler* sasm, address target, bool has_argument); static void generate_handle_exception(StubAssembler *sasm, OopMapSet* oop_maps, OopMap* oop_map, bool ignore_fpu_registers = false); @@ -162,12 +149,8 @@ static void patch_code(JavaThread* thread, StubID stub_id); public: - static BufferBlob* get_buffer_blob(); - static void setup_code_buffer(CodeBuffer* cb, int call_stub_estimate); - // initialization - static bool is_initialized() { return _is_initialized; } - static void initialize(); + static void initialize(BufferBlob* blob); static void initialize_pd(); // stubs
--- a/hotspot/src/share/vm/c1/c1_ValueStack.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_ValueStack.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -119,14 +119,14 @@ // apply function to all values of a list; factored out from values_do(f) -void ValueStack::apply(Values list, void f(Value*)) { +void ValueStack::apply(Values list, ValueVisitor* f) { for (int i = 0; i < list.length(); i++) { Value* va = list.adr_at(i); Value v0 = *va; if (v0 != NULL) { if (!v0->type()->is_illegal()) { assert(v0->as_HiWord() == NULL, "should never see HiWord during traversal"); - f(va); + f->visit(va); #ifdef ASSERT Value v1 = *va; if (v0 != v1) { @@ -143,7 +143,7 @@ } -void ValueStack::values_do(void f(Value*)) { +void ValueStack::values_do(ValueVisitor* f) { apply(_stack, f); apply(_locks, f);
--- a/hotspot/src/share/vm/c1/c1_ValueStack.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_ValueStack.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -41,7 +41,7 @@ } // helper routine - static void apply(Values list, void f(Value*)); + static void apply(Values list, ValueVisitor* f); public: // creation @@ -143,7 +143,7 @@ void pin_stack_for_linear_scan(); // iteration - void values_do(void f(Value*)); + void values_do(ValueVisitor* f); // untyped manipulation (for dup_x1, etc.) void clear_stack() { _stack.clear(); }
--- a/hotspot/src/share/vm/c1/c1_ValueType.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_ValueType.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -46,27 +46,26 @@ ObjectConstant* objectNull = NULL; -void ValueType::initialize() { +void ValueType::initialize(Arena* arena) { // Note: Must initialize all types for each compilation // as they are allocated within a ResourceMark! // types - voidType = new VoidType(); - intType = new IntType(); - longType = new LongType(); - floatType = new FloatType(); - doubleType = new DoubleType(); - objectType = new ObjectType(); - arrayType = new ArrayType(); - instanceType = new InstanceType(); - classType = new ClassType(); - addressType = new AddressType(); - illegalType = new IllegalType(); + voidType = new (arena) VoidType(); + intType = new (arena) IntType(); + longType = new (arena) LongType(); + floatType = new (arena) FloatType(); + doubleType = new (arena) DoubleType(); + objectType = new (arena) ObjectType(); + arrayType = new (arena) ArrayType(); + instanceType = new (arena) InstanceType(); + classType = new (arena) ClassType(); + addressType = new (arena) AddressType(); + illegalType = new (arena) IllegalType(); - // constants - intZero = new IntConstant(0); - intOne = new IntConstant(1); - objectNull = new ObjectConstant(ciNullObject::make()); + intZero = new (arena) IntConstant(0); + intOne = new (arena) IntConstant(1); + objectNull = new (arena) ObjectConstant(ciNullObject::make()); };
--- a/hotspot/src/share/vm/c1/c1_ValueType.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/c1/c1_ValueType.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -94,7 +94,7 @@ public: // initialization - static void initialize(); + static void initialize(Arena* arena); // accessors virtual ValueType* base() const = 0; // the 'canonical' type (e.g., intType for an IntConstant)
--- a/hotspot/src/share/vm/ci/ciMethod.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/ci/ciMethod.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -690,20 +690,32 @@ // ------------------------------------------------------------------ // invokedynamic support + +// ------------------------------------------------------------------ +// ciMethod::is_method_handle_invoke // +// Return true if the method is a MethodHandle target. bool ciMethod::is_method_handle_invoke() const { - check_is_loaded(); - bool flag = ((flags().as_int() & JVM_MH_INVOKE_BITS) == JVM_MH_INVOKE_BITS); + bool flag = (holder()->name() == ciSymbol::java_dyn_MethodHandle() && + methodOopDesc::is_method_handle_invoke_name(name()->sid())); #ifdef ASSERT - { - VM_ENTRY_MARK; - bool flag2 = get_methodOop()->is_method_handle_invoke(); - assert(flag == flag2, "consistent"); + if (is_loaded()) { + bool flag2 = ((flags().as_int() & JVM_MH_INVOKE_BITS) == JVM_MH_INVOKE_BITS); + { + VM_ENTRY_MARK; + bool flag3 = get_methodOop()->is_method_handle_invoke(); + assert(flag2 == flag3, "consistent"); + assert(flag == flag3, "consistent"); + } } #endif //ASSERT return flag; } +// ------------------------------------------------------------------ +// ciMethod::is_method_handle_adapter +// +// Return true if the method is a generated MethodHandle adapter. bool ciMethod::is_method_handle_adapter() const { check_is_loaded(); VM_ENTRY_MARK;
--- a/hotspot/src/share/vm/ci/ciStreams.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/ci/ciStreams.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -81,27 +81,21 @@ // providing accessors for constant pool items. // ------------------------------------------------------------------ -// ciBytecodeStream::wide -// -// Special handling for the wide bytcode -Bytecodes::Code ciBytecodeStream::wide() -{ - // Get following bytecode; do not return wide - Bytecodes::Code bc = (Bytecodes::Code)_pc[1]; - _pc += 2; // Skip both bytecodes - _pc += 2; // Skip index always - if( bc == Bytecodes::_iinc ) - _pc += 2; // Skip optional constant - _was_wide = _pc; // Flag last wide bytecode found - return bc; -} - -// ------------------------------------------------------------------ -// ciBytecodeStream::table +// ciBytecodeStream::next_wide_or_table // // Special handling for switch ops -Bytecodes::Code ciBytecodeStream::table( Bytecodes::Code bc ) { - switch( bc ) { // Check for special bytecode handling +Bytecodes::Code ciBytecodeStream::next_wide_or_table(Bytecodes::Code bc) { + switch (bc) { // Check for special bytecode handling + case Bytecodes::_wide: + // Special handling for the wide bytcode + // Get following bytecode; do not return wide + assert(Bytecodes::Code(_pc[0]) == Bytecodes::_wide, ""); + bc = Bytecodes::java_code(_raw_bc = (Bytecodes::Code)_pc[1]); + assert(Bytecodes::wide_length_for(bc) > 2, "must make progress"); + _pc += Bytecodes::wide_length_for(bc); + _was_wide = _pc; // Flag last wide bytecode found + assert(is_wide(), "accessor works right"); + break; case Bytecodes::_lookupswitch: _pc++; // Skip wide bytecode @@ -164,7 +158,7 @@ int ciBytecodeStream::get_klass_index() const { switch(cur_bc()) { case Bytecodes::_ldc: - return get_index(); + return get_index_u1(); case Bytecodes::_ldc_w: case Bytecodes::_ldc2_w: case Bytecodes::_checkcast: @@ -173,7 +167,7 @@ case Bytecodes::_multianewarray: case Bytecodes::_new: case Bytecodes::_newarray: - return get_index_big(); + return get_index_u2(); default: ShouldNotReachHere(); return 0; @@ -199,10 +193,10 @@ int ciBytecodeStream::get_constant_index() const { switch(cur_bc()) { case Bytecodes::_ldc: - return get_index(); + return get_index_u1(); case Bytecodes::_ldc_w: case Bytecodes::_ldc2_w: - return get_index_big(); + return get_index_u2(); default: ShouldNotReachHere(); return 0; @@ -239,7 +233,7 @@ cur_bc() == Bytecodes::_putfield || cur_bc() == Bytecodes::_getstatic || cur_bc() == Bytecodes::_putstatic, "wrong bc"); - return get_index_big(); + return get_index_u2_cpcache(); } @@ -319,7 +313,9 @@ ShouldNotReachHere(); } #endif - return get_index_int(); + if (has_index_u4()) + return get_index_u4(); // invokedynamic + return get_index_u2_cpcache(); } // ------------------------------------------------------------------
--- a/hotspot/src/share/vm/ci/ciStreams.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/ci/ciStreams.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -31,15 +31,19 @@ // their original form during iteration. class ciBytecodeStream : StackObj { private: - // Handling for the weird bytecodes - Bytecodes::Code wide(); // Handle wide bytecode - Bytecodes::Code table(Bytecodes::Code); // Handle complicated inline table + // Handling for the weird bytecodes + Bytecodes::Code next_wide_or_table(Bytecodes::Code); // Handle _wide & complicated inline table static Bytecodes::Code check_java(Bytecodes::Code c) { assert(Bytecodes::is_java_code(c), "should not return _fast bytecodes"); return c; } + static Bytecodes::Code check_defined(Bytecodes::Code c) { + assert(Bytecodes::is_defined(c), ""); + return c; + } + ciMethod* _method; // the method ciInstanceKlass* _holder; address _bc_start; // Start of current bytecode for table @@ -50,11 +54,21 @@ address _end; // Past end of bytecodes address _pc; // Current PC Bytecodes::Code _bc; // Current bytecode + Bytecodes::Code _raw_bc; // Current bytecode, raw form void reset( address base, unsigned int size ) { _bc_start =_was_wide = 0; _start = _pc = base; _end = base + size; } + void assert_wide(bool require_wide) const { + if (require_wide) + { assert(is_wide(), "must be a wide instruction"); } + else { assert(!is_wide(), "must not be a wide instruction"); } + } + + Bytecode* bytecode() const { return Bytecode_at(_bc_start); } + Bytecode* next_bytecode() const { return Bytecode_at(_pc); } + public: // End-Of-Bytecodes static Bytecodes::Code EOBC() { @@ -92,11 +106,12 @@ } address cur_bcp() const { return _bc_start; } // Returns bcp to current instruction - int next_bci() const { return _pc -_start; } + int next_bci() const { return _pc - _start; } int cur_bci() const { return _bc_start - _start; } int instruction_size() const { return _pc - _bc_start; } Bytecodes::Code cur_bc() const{ return check_java(_bc); } + Bytecodes::Code cur_bc_raw() const { return check_defined(_raw_bc); } Bytecodes::Code next_bc() { return Bytecodes::java_code((Bytecodes::Code)* _pc); } // Return current ByteCode and increment PC to next bytecode, skipping all @@ -109,85 +124,76 @@ // Fetch Java bytecode // All rewritten bytecodes maintain the size of original bytecode. - _bc = Bytecodes::java_code((Bytecodes::Code)*_pc); + _bc = Bytecodes::java_code(_raw_bc = (Bytecodes::Code)*_pc); int csize = Bytecodes::length_for(_bc); // Expected size - - if( _bc == Bytecodes::_wide ) { - _bc=wide(); // Handle wide bytecode - } else if( csize == 0 ) { - _bc=table(_bc); // Handle inline tables - } else { - _pc += csize; // Bump PC past bytecode + _pc += csize; // Bump PC past bytecode + if (csize == 0) { + _bc = next_wide_or_table(_bc); } return check_java(_bc); } bool is_wide() const { return ( _pc == _was_wide ); } + // Does this instruction contain an index which refes into the CP cache? + bool uses_cp_cache() const { return Bytecodes::uses_cp_cache(cur_bc_raw()); } + + int get_index_u1() const { + return bytecode()->get_index_u1(cur_bc_raw()); + } + // Get a byte index following this bytecode. // If prefixed with a wide bytecode, get a wide index. int get_index() const { - assert_index_size(is_wide() ? 2 : 1); return (_pc == _was_wide) // was widened? - ? Bytes::get_Java_u2(_bc_start+2) // yes, return wide index - : _bc_start[1]; // no, return narrow index + ? get_index_u2(true) // yes, return wide index + : get_index_u1(); // no, return narrow index } - // Get 2-byte index (getfield/putstatic/etc) - int get_index_big() const { - assert_index_size(2); - return Bytes::get_Java_u2(_bc_start+1); + // Get 2-byte index (byte swapping depending on which bytecode) + int get_index_u2(bool is_wide = false) const { + return bytecode()->get_index_u2(cur_bc_raw(), is_wide); } - // Get 2-byte index (or 4-byte, for invokedynamic) - int get_index_int() const { - return has_giant_index() ? get_index_giant() : get_index_big(); + // Get 2-byte index in native byte order. (Rewriter::rewrite makes these.) + int get_index_u2_cpcache() const { + return bytecode()->get_index_u2_cpcache(cur_bc_raw()); } // Get 4-byte index, for invokedynamic. - int get_index_giant() const { - assert_index_size(4); - return Bytes::get_native_u4(_bc_start+1); + int get_index_u4() const { + return bytecode()->get_index_u4(cur_bc_raw()); } - bool has_giant_index() const { return (cur_bc() == Bytecodes::_invokedynamic); } + bool has_index_u4() const { + return bytecode()->has_index_u4(cur_bc_raw()); + } // Get dimensions byte (multinewarray) int get_dimensions() const { return *(unsigned char*)(_pc-1); } // Sign-extended index byte/short, no widening - int get_byte() const { return (int8_t)(_pc[-1]); } - int get_short() const { return (int16_t)Bytes::get_Java_u2(_pc-2); } - int get_long() const { return (int32_t)Bytes::get_Java_u4(_pc-4); } + int get_constant_u1() const { return bytecode()->get_constant_u1(instruction_size()-1, cur_bc_raw()); } + int get_constant_u2(bool is_wide = false) const { return bytecode()->get_constant_u2(instruction_size()-2, cur_bc_raw(), is_wide); } // Get a byte signed constant for "iinc". Invalid for other bytecodes. // If prefixed with a wide bytecode, get a wide constant - int get_iinc_con() const {return (_pc==_was_wide) ? get_short() :get_byte();} + int get_iinc_con() const {return (_pc==_was_wide) ? (jshort) get_constant_u2(true) : (jbyte) get_constant_u1();} // 2-byte branch offset from current pc - int get_dest( ) const { - assert( Bytecodes::length_at(_bc_start) == sizeof(jshort)+1, "get_dest called with bad bytecode" ); - return _bc_start-_start + (short)Bytes::get_Java_u2(_pc-2); + int get_dest() const { + return cur_bci() + bytecode()->get_offset_s2(cur_bc_raw()); } // 2-byte branch offset from next pc - int next_get_dest( ) const { - address next_bc_start = _pc; - assert( _pc < _end, "" ); - Bytecodes::Code next_bc = (Bytecodes::Code)*_pc; - assert( next_bc != Bytecodes::_wide, ""); - int next_csize = Bytecodes::length_for(next_bc); - assert( next_csize != 0, "" ); - assert( next_bc <= Bytecodes::_jsr_w, ""); - address next_pc = _pc + next_csize; - assert( Bytecodes::length_at(next_bc_start) == sizeof(jshort)+1, "next_get_dest called with bad bytecode" ); - return next_bc_start-_start + (short)Bytes::get_Java_u2(next_pc-2); + int next_get_dest() const { + assert(_pc < _end, ""); + return next_bci() + next_bytecode()->get_offset_s2(Bytecodes::_ifeq); } // 4-byte branch offset from current pc - int get_far_dest( ) const { - assert( Bytecodes::length_at(_bc_start) == sizeof(jint)+1, "dest4 called with bad bytecode" ); - return _bc_start-_start + (int)Bytes::get_Java_u4(_pc-4); + int get_far_dest() const { + return cur_bci() + bytecode()->get_offset_s4(cur_bc_raw()); } // For a lookup or switch table, return target destination @@ -234,22 +240,6 @@ ciCPCache* get_cpcache(); ciCallSite* get_call_site(); - - private: - void assert_index_size(int required_size) const { -#ifdef ASSERT - int isize = instruction_size() - (is_wide() ? 1 : 0) - 1; - if (isize == 2 && cur_bc() == Bytecodes::_iinc) - isize = 1; - else if (isize <= 2) - ; // no change - else if (has_giant_index()) - isize = 4; - else - isize = 2; - assert(isize = required_size, "wrong index size"); -#endif - } };
--- a/hotspot/src/share/vm/ci/ciTypeFlow.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/ci/ciTypeFlow.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -2132,6 +2132,7 @@ if (!Bytecodes::can_trap(str.cur_bc())) return false; switch (str.cur_bc()) { + // %%% FIXME: ldc of Class can generate an exception case Bytecodes::_ldc: case Bytecodes::_ldc_w: case Bytecodes::_ldc2_w:
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -25,10 +25,10 @@ #include "incls/_precompiled.incl" #include "incls/_classFileParser.cpp.incl" -// We generally try to create the oops directly when parsing, rather than allocating -// temporary data structures and copying the bytes twice. A temporary area is only -// needed when parsing utf8 entries in the constant pool and when parsing line number -// tables. +// We generally try to create the oops directly when parsing, rather than +// allocating temporary data structures and copying the bytes twice. A +// temporary area is only needed when parsing utf8 entries in the constant +// pool and when parsing line number tables. // We add assert in debug mode when class format is not checked. @@ -47,6 +47,10 @@ // - also used as the max version when running in jdk6 #define JAVA_6_VERSION 50 +// Used for backward compatibility reasons: +// - to check NameAndType_info signatures more aggressively +#define JAVA_7_VERSION 51 + void ClassFileParser::parse_constant_pool_entries(constantPoolHandle cp, int length, TRAPS) { // Use a local copy of ClassFileStream. It helps the C++ compiler to optimize @@ -384,6 +388,20 @@ verify_legal_class_name(class_name, CHECK_(nullHandle)); break; } + case JVM_CONSTANT_NameAndType: { + if (_need_verify && _major_version >= JAVA_7_VERSION) { + int sig_index = cp->signature_ref_index_at(index); + int name_index = cp->name_ref_index_at(index); + symbolHandle name(THREAD, cp->symbol_at(name_index)); + symbolHandle sig(THREAD, cp->symbol_at(sig_index)); + if (sig->byte_at(0) == JVM_SIGNATURE_FUNC) { + verify_legal_method_signature(name, sig, CHECK_(nullHandle)); + } else { + verify_legal_field_signature(name, sig, CHECK_(nullHandle)); + } + } + break; + } case JVM_CONSTANT_Fieldref: case JVM_CONSTANT_Methodref: case JVM_CONSTANT_InterfaceMethodref: { @@ -396,10 +414,28 @@ symbolHandle signature(THREAD, cp->symbol_at(signature_ref_index)); if (tag == JVM_CONSTANT_Fieldref) { verify_legal_field_name(name, CHECK_(nullHandle)); - verify_legal_field_signature(name, signature, CHECK_(nullHandle)); + if (_need_verify && _major_version >= JAVA_7_VERSION) { + // Signature is verified above, when iterating NameAndType_info. + // Need only to be sure it's the right type. + if (signature->byte_at(0) == JVM_SIGNATURE_FUNC) { + throwIllegalSignature( + "Field", name, signature, CHECK_(nullHandle)); + } + } else { + verify_legal_field_signature(name, signature, CHECK_(nullHandle)); + } } else { verify_legal_method_name(name, CHECK_(nullHandle)); - verify_legal_method_signature(name, signature, CHECK_(nullHandle)); + if (_need_verify && _major_version >= JAVA_7_VERSION) { + // Signature is verified above, when iterating NameAndType_info. + // Need only to be sure it's the right type. + if (signature->byte_at(0) != JVM_SIGNATURE_FUNC) { + throwIllegalSignature( + "Method", name, signature, CHECK_(nullHandle)); + } + } else { + verify_legal_method_signature(name, signature, CHECK_(nullHandle)); + } if (tag == JVM_CONSTANT_Methodref) { // 4509014: If a class method name begins with '<', it must be "<init>". assert(!name.is_null(), "method name in constant pool is null"); @@ -1313,6 +1349,14 @@ return checked_exceptions_start; } +void ClassFileParser::throwIllegalSignature( + const char* type, symbolHandle name, symbolHandle sig, TRAPS) { + ResourceMark rm(THREAD); + Exceptions::fthrow(THREAD_AND_LOCATION, + vmSymbols::java_lang_ClassFormatError(), + "%s \"%s\" in class %s has illegal signature \"%s\"", type, + name->as_C_string(), _class_name->as_C_string(), sig->as_C_string()); +} #define MAX_ARGS_SIZE 255 #define MAX_CODE_SIZE 65535 @@ -4058,14 +4102,7 @@ char* p = skip_over_field_signature(bytes, false, length, CHECK); if (p == NULL || (p - bytes) != (int)length) { - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, - vmSymbolHandles::java_lang_ClassFormatError(), - "Field \"%s\" in class %s has illegal signature \"%s\"", - name->as_C_string(), _class_name->as_C_string(), bytes - ); - return; + throwIllegalSignature("Field", name, signature, CHECK); } } @@ -4116,13 +4153,7 @@ } } // Report error - ResourceMark rm(THREAD); - Exceptions::fthrow( - THREAD_AND_LOCATION, - vmSymbolHandles::java_lang_ClassFormatError(), - "Method \"%s\" in class %s has illegal signature \"%s\"", - name->as_C_string(), _class_name->as_C_string(), p - ); + throwIllegalSignature("Method", name, signature, CHECK_0); return 0; }
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/classfile/classFileParser.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -195,6 +195,9 @@ if (!b) { classfile_parse_error(msg, index, name, CHECK); } } + void throwIllegalSignature( + const char* type, symbolHandle name, symbolHandle sig, TRAPS); + bool is_supported_version(u2 major, u2 minor); bool has_illegal_visibility(jint flags);
--- a/hotspot/src/share/vm/classfile/verifier.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/classfile/verifier.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -25,6 +25,8 @@ # include "incls/_precompiled.incl" # include "incls/_verifier.cpp.incl" +#define NOFAILOVER_MAJOR_VERSION 51 + // Access to external entry for VerifyClassCodes - old byte code verifier extern "C" { @@ -91,7 +93,8 @@ klass, message_buffer, message_buffer_len, THREAD); split_verifier.verify_class(THREAD); exception_name = split_verifier.result(); - if (FailOverToOldVerifier && !HAS_PENDING_EXCEPTION && + if (klass->major_version() < NOFAILOVER_MAJOR_VERSION && + FailOverToOldVerifier && !HAS_PENDING_EXCEPTION && (exception_name == vmSymbols::java_lang_VerifyError() || exception_name == vmSymbols::java_lang_ClassFormatError())) { if (TraceClassInitialization) { @@ -254,6 +257,9 @@ int num_methods = methods->length(); for (int index = 0; index < num_methods; index++) { + // Check for recursive re-verification before each method. + if (was_recursively_verified()) return; + methodOop m = (methodOop)methods->obj_at(index); if (m->is_native() || m->is_abstract()) { // If m is native or abstract, skip it. It is checked in class file @@ -262,6 +268,12 @@ } verify_method(methodHandle(THREAD, m), CHECK_VERIFY(this)); } + + if (_verify_verbose || TraceClassInitialization) { + if (was_recursively_verified()) + tty->print_cr("Recursive verification detected for: %s", + _klass->external_name()); + } } void ClassVerifier::verify_method(methodHandle m, TRAPS) { @@ -326,6 +338,9 @@ // instruction in sequence Bytecodes::Code opcode; while (!bcs.is_last_bytecode()) { + // Check for recursive re-verification before each bytecode. + if (was_recursively_verified()) return; + opcode = bcs.raw_next(); u2 bci = bcs.bci(); @@ -410,13 +425,13 @@ no_control_flow = false; break; case Bytecodes::_ldc : verify_ldc( - opcode, bcs.get_index(), ¤t_frame, + opcode, bcs.get_index_u1(), ¤t_frame, cp, bci, CHECK_VERIFY(this)); no_control_flow = false; break; case Bytecodes::_ldc_w : case Bytecodes::_ldc2_w : verify_ldc( - opcode, bcs.get_index_big(), ¤t_frame, + opcode, bcs.get_index_u2(), ¤t_frame, cp, bci, CHECK_VERIFY(this)); no_control_flow = false; break; case Bytecodes::_iload : @@ -1182,7 +1197,7 @@ no_control_flow = false; break; case Bytecodes::_new : { - index = bcs.get_index_big(); + index = bcs.get_index_u2(); verify_cp_class_type(index, cp, CHECK_VERIFY(this)); VerificationType new_class_type = cp_index_to_type(index, cp, CHECK_VERIFY(this)); @@ -1202,7 +1217,7 @@ no_control_flow = false; break; case Bytecodes::_anewarray : verify_anewarray( - bcs.get_index_big(), cp, ¤t_frame, CHECK_VERIFY(this)); + bcs.get_index_u2(), cp, ¤t_frame, CHECK_VERIFY(this)); no_control_flow = false; break; case Bytecodes::_arraylength : type = current_frame.pop_stack( @@ -1215,7 +1230,7 @@ no_control_flow = false; break; case Bytecodes::_checkcast : { - index = bcs.get_index_big(); + index = bcs.get_index_u2(); verify_cp_class_type(index, cp, CHECK_VERIFY(this)); current_frame.pop_stack( VerificationType::reference_check(), CHECK_VERIFY(this)); @@ -1225,7 +1240,7 @@ no_control_flow = false; break; } case Bytecodes::_instanceof : { - index = bcs.get_index_big(); + index = bcs.get_index_u2(); verify_cp_class_type(index, cp, CHECK_VERIFY(this)); current_frame.pop_stack( VerificationType::reference_check(), CHECK_VERIFY(this)); @@ -1240,7 +1255,7 @@ no_control_flow = false; break; case Bytecodes::_multianewarray : { - index = bcs.get_index_big(); + index = bcs.get_index_u2(); u2 dim = *(bcs.bcp()+3); verify_cp_class_type(index, cp, CHECK_VERIFY(this)); VerificationType new_array_type = @@ -1299,7 +1314,7 @@ while (!bcs.is_last_bytecode()) { if (bcs.raw_next() != Bytecodes::_illegal) { int bci = bcs.bci(); - if (bcs.code() == Bytecodes::_new) { + if (bcs.raw_code() == Bytecodes::_new) { code_data[bci] = NEW_OFFSET; } else { code_data[bci] = BYTECODE_OFFSET; @@ -1470,20 +1485,9 @@ // In some situations, bytecode rewriting may occur while we're verifying. // In this case, a constant pool cache exists and some indices refer to that - // instead. Get the original index for the tag check - constantPoolCacheOop cache = cp->cache(); - if (cache != NULL && - ((types == (1 << JVM_CONSTANT_InterfaceMethodref)) || - (types == (1 << JVM_CONSTANT_Methodref)) || - (types == (1 << JVM_CONSTANT_Fieldref)))) { - int native_index = index; - if (Bytes::is_Java_byte_ordering_different()) { - native_index = Bytes::swap_u2(index); - } - assert((native_index >= 0) && (native_index < cache->length()), - "Must be a legal index into the cp cache"); - index = cache->entry_at(native_index)->constant_pool_index(); - } + // instead. Be sure we don't pick up such indices by accident. + // We must check was_recursively_verified() before we get here. + guarantee(cp->cache() == NULL, "not rewritten yet"); verify_cp_index(cp, index, CHECK_VERIFY(this)); unsigned int tag = cp->tag_at(index).value(); @@ -1654,7 +1658,7 @@ int keys, delta; current_frame->pop_stack( VerificationType::integer_type(), CHECK_VERIFY(this)); - if (bcs->code() == Bytecodes::_tableswitch) { + if (bcs->raw_code() == Bytecodes::_tableswitch) { jint low = (jint)Bytes::get_Java_u4(aligned_bcp + jintSize); jint high = (jint)Bytes::get_Java_u4(aligned_bcp + 2*jintSize); if (low > high) { @@ -1710,7 +1714,7 @@ StackMapFrame* current_frame, constantPoolHandle cp, TRAPS) { - u2 index = bcs->get_index_big(); + u2 index = bcs->get_index_u2(); verify_cp_type(index, cp, 1 << JVM_CONSTANT_Fieldref, CHECK_VERIFY(this)); // Get field name and signature @@ -1750,7 +1754,7 @@ &sig_stream, field_type, CHECK_VERIFY(this)); u2 bci = bcs->bci(); bool is_assignable; - switch (bcs->code()) { + switch (bcs->raw_code()) { case Bytecodes::_getstatic: { for (int i = 0; i < n; i++) { current_frame->push_stack(field_type[i], CHECK_VERIFY(this)); @@ -1870,7 +1874,7 @@ ref_class_type.name(), CHECK_VERIFY(this)); methodOop m = instanceKlass::cast(ref_klass)->uncached_lookup_method( vmSymbols::object_initializer_name(), - cp->signature_ref_at(bcs->get_index_big())); + cp->signature_ref_at(bcs->get_index_u2())); instanceKlassHandle mh(THREAD, m->method_holder()); if (m->is_protected() && !mh->is_same_class_package(_klass())) { bool assignable = current_type().is_assignable_from( @@ -1893,8 +1897,8 @@ bool *this_uninit, VerificationType return_type, constantPoolHandle cp, TRAPS) { // Make sure the constant pool item is the right type - u2 index = bcs->get_index_big(); - Bytecodes::Code opcode = bcs->code(); + u2 index = bcs->get_index_u2(); + Bytecodes::Code opcode = bcs->raw_code(); unsigned int types = (opcode == Bytecodes::_invokeinterface ? 1 << JVM_CONSTANT_InterfaceMethodref : opcode == Bytecodes::_invokedynamic
--- a/hotspot/src/share/vm/classfile/verifier.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/classfile/verifier.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -158,6 +158,16 @@ methodHandle _method; // current method being verified VerificationType _this_type; // the verification type of the current class + // Some recursive calls from the verifier to the name resolver + // can cause the current class to be re-verified and rewritten. + // If this happens, the original verification should not continue, + // because constant pool indexes will have changed. + // The rewriter is preceded by the verifier. If the verifier throws + // an error, rewriting is prevented. Also, rewriting always precedes + // bytecode execution or compilation. Thus, is_rewritten implies + // that a class has been verified and prepared for execution. + bool was_recursively_verified() { return _klass->is_rewritten(); } + public: enum { BYTECODE_OFFSET = 1,
--- a/hotspot/src/share/vm/code/codeBlob.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/codeBlob.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -66,8 +66,6 @@ _relocation_size = locs_size; _instructions_offset = align_code_offset(header_size + locs_size); _data_offset = size; - _oops_offset = size; - _oops_length = 0; _frame_size = 0; set_oop_maps(NULL); } @@ -94,9 +92,6 @@ _relocation_size = round_to(cb->total_relocation_size(), oopSize); _instructions_offset = align_code_offset(header_size + _relocation_size); _data_offset = _instructions_offset + round_to(cb->total_code_size(), oopSize); - _oops_offset = _size - round_to(cb->total_oop_size(), oopSize); - _oops_length = 0; // temporary, until the copy_oops handshake - assert(_oops_offset >= _data_offset, "codeBlob is too small"); assert(_data_offset <= size, "codeBlob is too small"); cb->copy_code_and_locs_to(this); @@ -131,99 +126,6 @@ } -// Promote one word from an assembly-time handle to a live embedded oop. -inline void CodeBlob::initialize_immediate_oop(oop* dest, jobject handle) { - if (handle == NULL || - // As a special case, IC oops are initialized to 1 or -1. - handle == (jobject) Universe::non_oop_word()) { - (*dest) = (oop)handle; - } else { - (*dest) = JNIHandles::resolve_non_null(handle); - } -} - - -void CodeBlob::copy_oops(GrowableArray<jobject>* array) { - assert(_oops_length == 0, "do this handshake just once, please"); - int length = array->length(); - assert((address)(oops_begin() + length) <= data_end(), "oops big enough"); - oop* dest = oops_begin(); - for (int index = 0 ; index < length; index++) { - initialize_immediate_oop(&dest[index], array->at(index)); - } - _oops_length = length; - - // Now we can fix up all the oops in the code. - // We need to do this in the code because - // the assembler uses jobjects as placeholders. - // The code and relocations have already been - // initialized by the CodeBlob constructor, - // so it is valid even at this early point to - // iterate over relocations and patch the code. - fix_oop_relocations(NULL, NULL, /*initialize_immediates=*/ true); -} - - -relocInfo::relocType CodeBlob::reloc_type_for_address(address pc) { - RelocIterator iter(this, pc, pc+1); - while (iter.next()) { - return (relocInfo::relocType) iter.type(); - } - // No relocation info found for pc - ShouldNotReachHere(); - return relocInfo::none; // dummy return value -} - - -bool CodeBlob::is_at_poll_return(address pc) { - RelocIterator iter(this, pc, pc+1); - while (iter.next()) { - if (iter.type() == relocInfo::poll_return_type) - return true; - } - return false; -} - - -bool CodeBlob::is_at_poll_or_poll_return(address pc) { - RelocIterator iter(this, pc, pc+1); - while (iter.next()) { - relocInfo::relocType t = iter.type(); - if (t == relocInfo::poll_return_type || t == relocInfo::poll_type) - return true; - } - return false; -} - - -void CodeBlob::fix_oop_relocations(address begin, address end, - bool initialize_immediates) { - // re-patch all oop-bearing instructions, just in case some oops moved - RelocIterator iter(this, begin, end); - while (iter.next()) { - if (iter.type() == relocInfo::oop_type) { - oop_Relocation* reloc = iter.oop_reloc(); - if (initialize_immediates && reloc->oop_is_immediate()) { - oop* dest = reloc->oop_addr(); - initialize_immediate_oop(dest, (jobject) *dest); - } - // Refresh the oop-related bits of this instruction. - reloc->fix_oop_relocation(); - } - - // There must not be any interfering patches or breakpoints. - assert(!(iter.type() == relocInfo::breakpoint_type - && iter.breakpoint_reloc()->active()), - "no active breakpoint"); - } -} - -void CodeBlob::do_unloading(BoolObjectClosure* is_alive, - OopClosure* keep_alive, - bool unloading_occurred) { - ShouldNotReachHere(); -} - OopMap* CodeBlob::oop_map_for_return_address(address return_address) { address pc = return_address ; assert (oop_maps() != NULL, "nope");
--- a/hotspot/src/share/vm/code/codeBlob.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/codeBlob.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -54,17 +54,12 @@ // that range. There is a similar range(s) on returns // which we don't detect. int _data_offset; // offset to where data region begins - int _oops_offset; // offset to where embedded oop table begins (inside data) - int _oops_length; // number of embedded oops int _frame_size; // size of stack frame OopMapSet* _oop_maps; // OopMap for this CodeBlob CodeComments _comments; friend class OopRecorder; - void fix_oop_relocations(address begin, address end, bool initialize_immediates); - inline void initialize_immediate_oop(oop* dest, jobject handle); - public: // Returns the space needed for CodeBlob static unsigned int allocation_size(CodeBuffer* cb, int header_size); @@ -115,14 +110,11 @@ address instructions_end() const { return (address) header_begin() + _data_offset; } address data_begin() const { return (address) header_begin() + _data_offset; } address data_end() const { return (address) header_begin() + _size; } - oop* oops_begin() const { return (oop*) (header_begin() + _oops_offset); } - oop* oops_end() const { return oops_begin() + _oops_length; } // Offsets int relocation_offset() const { return _header_size; } int instructions_offset() const { return _instructions_offset; } int data_offset() const { return _data_offset; } - int oops_offset() const { return _oops_offset; } // Sizes int size() const { return _size; } @@ -130,40 +122,16 @@ int relocation_size() const { return (address) relocation_end() - (address) relocation_begin(); } int instructions_size() const { return instructions_end() - instructions_begin(); } int data_size() const { return data_end() - data_begin(); } - int oops_size() const { return (address) oops_end() - (address) oops_begin(); } // Containment bool blob_contains(address addr) const { return header_begin() <= addr && addr < data_end(); } bool relocation_contains(relocInfo* addr) const{ return relocation_begin() <= addr && addr < relocation_end(); } bool instructions_contains(address addr) const { return instructions_begin() <= addr && addr < instructions_end(); } bool data_contains(address addr) const { return data_begin() <= addr && addr < data_end(); } - bool oops_contains(oop* addr) const { return oops_begin() <= addr && addr < oops_end(); } bool contains(address addr) const { return instructions_contains(addr); } bool is_frame_complete_at(address addr) const { return instructions_contains(addr) && addr >= instructions_begin() + _frame_complete_offset; } - // Relocation support - void fix_oop_relocations(address begin, address end) { - fix_oop_relocations(begin, end, false); - } - void fix_oop_relocations() { - fix_oop_relocations(NULL, NULL, false); - } - relocInfo::relocType reloc_type_for_address(address pc); - bool is_at_poll_return(address pc); - bool is_at_poll_or_poll_return(address pc); - - // Support for oops in scopes and relocs: - // Note: index 0 is reserved for null. - oop oop_at(int index) const { return index == 0? (oop)NULL: *oop_addr_at(index); } - oop* oop_addr_at(int index) const{ // for GC - // relocation indexes are biased by 1 (because 0 is reserved) - assert(index > 0 && index <= _oops_length, "must be a valid non-zero index"); - return &oops_begin()[index-1]; - } - - void copy_oops(GrowableArray<jobject>* oops); - // CodeCache support: really only used by the nmethods, but in order to get // asserts and certain bookkeeping to work in the CodeCache they are defined // virtual here. @@ -175,12 +143,6 @@ // GC support virtual bool is_alive() const = 0; - virtual void do_unloading(BoolObjectClosure* is_alive, - OopClosure* keep_alive, - bool unloading_occurred); - virtual void oops_do(OopClosure* f) = 0; - // (All CodeBlob subtypes other than NMethod currently have - // an empty oops_do() method. // OopMap for frame OopMapSet* oop_maps() const { return _oop_maps; } @@ -245,11 +207,6 @@ // GC/Verification support void preserve_callee_argument_oops(frame fr, const RegisterMap* reg_map, OopClosure* f) { /* nothing to do */ } bool is_alive() const { return true; } - void do_unloading(BoolObjectClosure* is_alive, - OopClosure* keep_alive, - bool unloading_occurred) { /* do nothing */ } - - void oops_do(OopClosure* f) { /* do nothing*/ } void verify(); void print() const PRODUCT_RETURN; @@ -334,10 +291,6 @@ // GC/Verification support void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) { /* nothing to do */ } bool is_alive() const { return true; } - void do_unloading(BoolObjectClosure* is_alive, - OopClosure* keep_alive, - bool unloading_occurred) { /* do nothing */ } - void oops_do(OopClosure* f) { /* do-nothing*/ } void verify(); void print() const PRODUCT_RETURN; @@ -363,9 +316,6 @@ {}; bool is_alive() const { return true; } - void do_unloading(BoolObjectClosure* is_alive, - OopClosure* keep_alive, - bool unloading_occurred) { /* do-nothing*/ } void verify(); // does nothing void print() const PRODUCT_RETURN; @@ -423,9 +373,6 @@ // GC for args void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f) { /* Nothing to do */ } - // Iteration - void oops_do(OopClosure* f) {} - // Printing void print_value_on(outputStream* st) const PRODUCT_RETURN; @@ -477,9 +424,6 @@ // Typing bool is_uncommon_trap_stub() const { return true; } - - // Iteration - void oops_do(OopClosure* f) {} }; @@ -512,9 +456,6 @@ // Typing bool is_exception_stub() const { return true; } - - // Iteration - void oops_do(OopClosure* f) {} }; #endif // COMPILER2 @@ -548,7 +489,4 @@ // Typing bool is_safepoint_stub() const { return true; } - - // Iteration - void oops_do(OopClosure* f) {} };
--- a/hotspot/src/share/vm/code/codeCache.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/codeCache.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -74,12 +74,12 @@ total_size += cb->size(); header_size += cb->header_size(); relocation_size += cb->relocation_size(); - scopes_oop_size += cb->oops_size(); if (cb->is_nmethod()) { - nmethod *nm = (nmethod*)cb; + nmethod* nm = cb->as_nmethod_or_null(); code_size += nm->code_size(); stub_size += nm->stub_size(); + scopes_oop_size += nm->oops_size(); scopes_data_size += nm->scopes_data_size(); scopes_pcs_size += nm->scopes_pcs_size(); } else { @@ -262,14 +262,14 @@ } -// Mark code blobs for unloading if they contain otherwise -// unreachable oops. +// Mark nmethods for unloading if they contain otherwise unreachable +// oops. void CodeCache::do_unloading(BoolObjectClosure* is_alive, OopClosure* keep_alive, bool unloading_occurred) { assert_locked_or_safepoint(CodeCache_lock); - FOR_ALL_ALIVE_BLOBS(cb) { - cb->do_unloading(is_alive, keep_alive, unloading_occurred); + FOR_ALL_ALIVE_NMETHODS(nm) { + nm->do_unloading(is_alive, keep_alive, unloading_occurred); } } @@ -509,9 +509,9 @@ if (needs_cache_clean()) { nm->cleanup_inline_caches(); } - debug_only(nm->verify();) + DEBUG_ONLY(nm->verify()); + nm->fix_oop_relocations(); } - cb->fix_oop_relocations(); } set_needs_cache_clean(false); prune_scavenge_root_nmethods();
--- a/hotspot/src/share/vm/code/compiledIC.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/compiledIC.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -441,11 +441,11 @@ } -inline static RelocIterator parse_ic(CodeBlob* code, address ic_call, oop* &_oop_addr, bool *is_optimized) { +inline static RelocIterator parse_ic(nmethod* nm, address ic_call, oop* &_oop_addr, bool *is_optimized) { address first_oop = NULL; // Mergers please note: Sun SC5.x CC insists on an lvalue for a reference parameter. - CodeBlob *code1 = code; - return virtual_call_Relocation::parse_ic(code1, ic_call, first_oop, _oop_addr, is_optimized); + nmethod* tmp_nm = nm; + return virtual_call_Relocation::parse_ic(tmp_nm, ic_call, first_oop, _oop_addr, is_optimized); } CompiledIC::CompiledIC(NativeCall* ic_call)
--- a/hotspot/src/share/vm/code/nmethod.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/nmethod.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -99,12 +99,12 @@ code_size += nm->code_size(); stub_size += nm->stub_size(); consts_size += nm->consts_size(); + oops_size += nm->oops_size(); scopes_data_size += nm->scopes_data_size(); scopes_pcs_size += nm->scopes_pcs_size(); dependencies_size += nm->dependencies_size(); handler_table_size += nm->handler_table_size(); nul_chk_table_size += nm->nul_chk_table_size(); - oops_size += nm->oops_size(); } void print_nmethod_stats() { if (nmethod_count == 0) return; @@ -114,12 +114,12 @@ if (code_size != 0) tty->print_cr(" main code = %d", code_size); if (stub_size != 0) tty->print_cr(" stub code = %d", stub_size); if (consts_size != 0) tty->print_cr(" constants = %d", consts_size); + if (oops_size != 0) tty->print_cr(" oops = %d", oops_size); if (scopes_data_size != 0) tty->print_cr(" scopes data = %d", scopes_data_size); if (scopes_pcs_size != 0) tty->print_cr(" scopes pcs = %d", scopes_pcs_size); if (dependencies_size != 0) tty->print_cr(" dependencies = %d", dependencies_size); if (handler_table_size != 0) tty->print_cr(" handler table = %d", handler_table_size); if (nul_chk_table_size != 0) tty->print_cr(" nul chk table = %d", nul_chk_table_size); - if (oops_size != 0) tty->print_cr(" oops = %d", oops_size); } int native_nmethod_count; @@ -600,7 +600,8 @@ #endif // def HAVE_DTRACE_H _stub_offset = data_offset(); _consts_offset = data_offset(); - _scopes_data_offset = data_offset(); + _oops_offset = data_offset(); + _scopes_data_offset = _oops_offset + round_to(code_buffer->total_oop_size(), oopSize); _scopes_pcs_offset = _scopes_data_offset; _dependencies_offset = _scopes_pcs_offset; _handler_table_offset = _dependencies_offset; @@ -690,7 +691,8 @@ _orig_pc_offset = 0; _stub_offset = data_offset(); _consts_offset = data_offset(); - _scopes_data_offset = data_offset(); + _oops_offset = data_offset(); + _scopes_data_offset = _oops_offset + round_to(code_buffer->total_oop_size(), oopSize); _scopes_pcs_offset = _scopes_data_offset; _dependencies_offset = _scopes_pcs_offset; _handler_table_offset = _dependencies_offset; @@ -805,8 +807,9 @@ _unwind_handler_offset = -1; } _consts_offset = instructions_offset() + code_buffer->total_offset_of(code_buffer->consts()->start()); - _scopes_data_offset = data_offset(); - _scopes_pcs_offset = _scopes_data_offset + round_to(debug_info->data_size (), oopSize); + _oops_offset = data_offset(); + _scopes_data_offset = _oops_offset + round_to(code_buffer->total_oop_size (), oopSize); + _scopes_pcs_offset = _scopes_data_offset + round_to(debug_info->data_size (), oopSize); _dependencies_offset = _scopes_pcs_offset + adjust_pcs_size(debug_info->pcs_size()); _handler_table_offset = _dependencies_offset + round_to(dependencies->size_in_bytes (), oopSize); _nul_chk_table_offset = _handler_table_offset + round_to(handler_table->size_in_bytes(), oopSize); @@ -990,6 +993,79 @@ } +// Promote one word from an assembly-time handle to a live embedded oop. +inline void nmethod::initialize_immediate_oop(oop* dest, jobject handle) { + if (handle == NULL || + // As a special case, IC oops are initialized to 1 or -1. + handle == (jobject) Universe::non_oop_word()) { + (*dest) = (oop) handle; + } else { + (*dest) = JNIHandles::resolve_non_null(handle); + } +} + + +void nmethod::copy_oops(GrowableArray<jobject>* array) { + //assert(oops_size() == 0, "do this handshake just once, please"); + int length = array->length(); + assert((address)(oops_begin() + length) <= data_end(), "oops big enough"); + oop* dest = oops_begin(); + for (int index = 0 ; index < length; index++) { + initialize_immediate_oop(&dest[index], array->at(index)); + } + + // Now we can fix up all the oops in the code. We need to do this + // in the code because the assembler uses jobjects as placeholders. + // The code and relocations have already been initialized by the + // CodeBlob constructor, so it is valid even at this early point to + // iterate over relocations and patch the code. + fix_oop_relocations(NULL, NULL, /*initialize_immediates=*/ true); +} + + +bool nmethod::is_at_poll_return(address pc) { + RelocIterator iter(this, pc, pc+1); + while (iter.next()) { + if (iter.type() == relocInfo::poll_return_type) + return true; + } + return false; +} + + +bool nmethod::is_at_poll_or_poll_return(address pc) { + RelocIterator iter(this, pc, pc+1); + while (iter.next()) { + relocInfo::relocType t = iter.type(); + if (t == relocInfo::poll_return_type || t == relocInfo::poll_type) + return true; + } + return false; +} + + +void nmethod::fix_oop_relocations(address begin, address end, bool initialize_immediates) { + // re-patch all oop-bearing instructions, just in case some oops moved + RelocIterator iter(this, begin, end); + while (iter.next()) { + if (iter.type() == relocInfo::oop_type) { + oop_Relocation* reloc = iter.oop_reloc(); + if (initialize_immediates && reloc->oop_is_immediate()) { + oop* dest = reloc->oop_addr(); + initialize_immediate_oop(dest, (jobject) *dest); + } + // Refresh the oop-related bits of this instruction. + reloc->fix_oop_relocation(); + } + + // There must not be any interfering patches or breakpoints. + assert(!(iter.type() == relocInfo::breakpoint_type + && iter.breakpoint_reloc()->active()), + "no active breakpoint"); + } +} + + ScopeDesc* nmethod::scope_desc_at(address pc) { PcDesc* pd = pc_desc_at(pc); guarantee(pd != NULL, "scope must be present"); @@ -1266,19 +1342,7 @@ // and it hasn't already been reported for this nmethod then report it now. // (the event may have been reported earilier if the GC marked it for unloading). if (state == zombie) { - - DTRACE_METHOD_UNLOAD_PROBE(method()); - - if (JvmtiExport::should_post_compiled_method_unload() && - !unload_reported()) { - assert(method() != NULL, "checking"); - { - HandleMark hm; - JvmtiExport::post_compiled_method_unload_at_safepoint( - method()->jmethod_id(), code_begin()); - } - set_unload_reported(); - } + post_compiled_method_unload(); } @@ -1430,6 +1494,12 @@ } void nmethod::post_compiled_method_unload() { + if (unload_reported()) { + // During unloading we transition to unloaded and then to zombie + // and the unloading is reported during the first transition. + return; + } + assert(_method != NULL && !is_unloaded(), "just checking"); DTRACE_METHOD_UNLOAD_PROBE(method()); @@ -1439,8 +1509,7 @@ if (JvmtiExport::should_post_compiled_method_unload()) { assert(!unload_reported(), "already unloaded"); HandleMark hm; - JvmtiExport::post_compiled_method_unload_at_safepoint( - method()->jmethod_id(), code_begin()); + JvmtiExport::post_compiled_method_unload(method()->jmethod_id(), code_begin()); } // The JVMTI CompiledMethodUnload event can be enabled or disabled at @@ -2282,6 +2351,10 @@ consts_begin(), consts_end(), consts_size()); + if (oops_size () > 0) tty->print_cr(" oops [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d", + oops_begin(), + oops_end(), + oops_size()); if (scopes_data_size () > 0) tty->print_cr(" scopes data [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d", scopes_data_begin(), scopes_data_end(),
--- a/hotspot/src/share/vm/code/nmethod.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/nmethod.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -105,6 +105,7 @@ // [Relocation] // - relocation information // - constant part (doubles, longs and floats used in nmethod) +// - oop table // [Code] // - code body // - exception handler @@ -161,6 +162,7 @@ #endif // def HAVE_DTRACE_H int _stub_offset; int _consts_offset; + int _oops_offset; // offset to where embedded oop table begins (inside data) int _scopes_data_offset; int _scopes_pcs_offset; int _dependencies_offset; @@ -347,7 +349,10 @@ address stub_begin () const { return header_begin() + _stub_offset ; } address stub_end () const { return header_begin() + _consts_offset ; } address consts_begin () const { return header_begin() + _consts_offset ; } - address consts_end () const { return header_begin() + _scopes_data_offset ; } + address consts_end () const { return header_begin() + _oops_offset ; } + oop* oops_begin () const { return (oop*) (header_begin() + _oops_offset) ; } + oop* oops_end () const { return (oop*) (header_begin() + _scopes_data_offset) ; } + address scopes_data_begin () const { return header_begin() + _scopes_data_offset ; } address scopes_data_end () const { return header_begin() + _scopes_pcs_offset ; } PcDesc* scopes_pcs_begin () const { return (PcDesc*)(header_begin() + _scopes_pcs_offset ); } @@ -359,20 +364,24 @@ address nul_chk_table_begin () const { return header_begin() + _nul_chk_table_offset ; } address nul_chk_table_end () const { return header_begin() + _nmethod_end_offset ; } - int code_size () const { return code_end () - code_begin (); } - int stub_size () const { return stub_end () - stub_begin (); } - int consts_size () const { return consts_end () - consts_begin (); } - int scopes_data_size () const { return scopes_data_end () - scopes_data_begin (); } - int scopes_pcs_size () const { return (intptr_t)scopes_pcs_end () - (intptr_t)scopes_pcs_begin (); } - int dependencies_size () const { return dependencies_end () - dependencies_begin (); } - int handler_table_size() const { return handler_table_end() - handler_table_begin(); } - int nul_chk_table_size() const { return nul_chk_table_end() - nul_chk_table_begin(); } + // Sizes + int code_size () const { return code_end () - code_begin (); } + int stub_size () const { return stub_end () - stub_begin (); } + int consts_size () const { return consts_end () - consts_begin (); } + int oops_size () const { return (address) oops_end () - (address) oops_begin (); } + int scopes_data_size () const { return scopes_data_end () - scopes_data_begin (); } + int scopes_pcs_size () const { return (intptr_t) scopes_pcs_end () - (intptr_t) scopes_pcs_begin (); } + int dependencies_size () const { return dependencies_end () - dependencies_begin (); } + int handler_table_size() const { return handler_table_end() - handler_table_begin(); } + int nul_chk_table_size() const { return nul_chk_table_end() - nul_chk_table_begin(); } int total_size () const; + // Containment bool code_contains (address addr) const { return code_begin () <= addr && addr < code_end (); } bool stub_contains (address addr) const { return stub_begin () <= addr && addr < stub_end (); } bool consts_contains (address addr) const { return consts_begin () <= addr && addr < consts_end (); } + bool oops_contains (oop* addr) const { return oops_begin () <= addr && addr < oops_end (); } bool scopes_data_contains (address addr) const { return scopes_data_begin () <= addr && addr < scopes_data_end (); } bool scopes_pcs_contains (PcDesc* addr) const { return scopes_pcs_begin () <= addr && addr < scopes_pcs_end (); } bool handler_table_contains(address addr) const { return handler_table_begin() <= addr && addr < handler_table_end(); } @@ -431,6 +440,29 @@ int version() const { return flags.version; } void set_version(int v); + // Support for oops in scopes and relocs: + // Note: index 0 is reserved for null. + oop oop_at(int index) const { return index == 0 ? (oop) NULL: *oop_addr_at(index); } + oop* oop_addr_at(int index) const { // for GC + // relocation indexes are biased by 1 (because 0 is reserved) + assert(index > 0 && index <= oops_size(), "must be a valid non-zero index"); + return &oops_begin()[index - 1]; + } + + void copy_oops(GrowableArray<jobject>* oops); + + // Relocation support +private: + void fix_oop_relocations(address begin, address end, bool initialize_immediates); + inline void initialize_immediate_oop(oop* dest, jobject handle); + +public: + void fix_oop_relocations(address begin, address end) { fix_oop_relocations(begin, end, false); } + void fix_oop_relocations() { fix_oop_relocations(NULL, NULL, false); } + + bool is_at_poll_return(address pc); + bool is_at_poll_or_poll_return(address pc); + // Non-perm oop support bool on_scavenge_root_list() const { return (_scavenge_root_state & 1) != 0; } protected: @@ -511,8 +543,8 @@ void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, OopClosure* f); - virtual void oops_do(OopClosure* f) { oops_do(f, false); } - void oops_do(OopClosure* f, bool do_strong_roots_only); + void oops_do(OopClosure* f) { oops_do(f, false); } + void oops_do(OopClosure* f, bool do_strong_roots_only); bool detect_scavenge_root_oops(); void verify_scavenge_root_oops() PRODUCT_RETURN;
--- a/hotspot/src/share/vm/code/oopRecorder.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/oopRecorder.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -50,10 +50,10 @@ return _handles->length() * sizeof(oop); } -void OopRecorder::copy_to(CodeBlob* code) { +void OopRecorder::copy_to(nmethod* nm) { assert(_complete, "must be frozen"); maybe_initialize(); // get non-null handles, even if we have no oops - code->copy_oops(_handles); + nm->copy_oops(_handles); } void OopRecorder::maybe_initialize() {
--- a/hotspot/src/share/vm/code/oopRecorder.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/oopRecorder.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -70,8 +70,8 @@ return _handles->length() + first_index; } - // copy the generated oop table to CodeBlob - void copy_to(CodeBlob* code); // => code->copy_oops(_handles) + // copy the generated oop table to nmethod + void copy_to(nmethod* nm); // => nm->copy_oops(_handles) bool is_unused() { return _handles == NULL && !_complete; } #ifdef ASSERT
--- a/hotspot/src/share/vm/code/relocInfo.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/relocInfo.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -115,24 +115,25 @@ // ---------------------------------------------------------------------------------------------------- // Implementation of RelocIterator -void RelocIterator::initialize(CodeBlob* cb, address begin, address limit) { +void RelocIterator::initialize(nmethod* nm, address begin, address limit) { initialize_misc(); - if (cb == NULL && begin != NULL) { - // allow CodeBlob to be deduced from beginning address - cb = CodeCache::find_blob(begin); + if (nm == NULL && begin != NULL) { + // allow nmethod to be deduced from beginning address + CodeBlob* cb = CodeCache::find_blob(begin); + nm = cb->as_nmethod_or_null(); } - assert(cb != NULL, "must be able to deduce nmethod from other arguments"); + assert(nm != NULL, "must be able to deduce nmethod from other arguments"); - _code = cb; - _current = cb->relocation_begin()-1; - _end = cb->relocation_end(); - _addr = (address) cb->instructions_begin(); + _code = nm; + _current = nm->relocation_begin() - 1; + _end = nm->relocation_end(); + _addr = (address) nm->instructions_begin(); assert(!has_current(), "just checking"); - address code_end = cb->instructions_end(); + address code_end = nm->instructions_end(); - assert(begin == NULL || begin >= cb->instructions_begin(), "in bounds"); + assert(begin == NULL || begin >= nm->instructions_begin(), "in bounds"); // FIX THIS assert(limit == NULL || limit <= code_end, "in bounds"); set_limits(begin, limit); } @@ -754,7 +755,7 @@ // oop is stored in the code stream return (oop*) pd_address_in_code(); } else { - // oop is stored in table at CodeBlob::oops_begin + // oop is stored in table at nmethod::oops_begin return code()->oop_addr_at(n); } } @@ -776,26 +777,28 @@ } -RelocIterator virtual_call_Relocation::parse_ic(CodeBlob* &code, address &ic_call, address &first_oop, +RelocIterator virtual_call_Relocation::parse_ic(nmethod* &nm, address &ic_call, address &first_oop, oop* &oop_addr, bool *is_optimized) { assert(ic_call != NULL, "ic_call address must be set"); assert(ic_call != NULL || first_oop != NULL, "must supply a non-null input"); - if (code == NULL) { + if (nm == NULL) { + CodeBlob* code; if (ic_call != NULL) { code = CodeCache::find_blob(ic_call); } else if (first_oop != NULL) { code = CodeCache::find_blob(first_oop); } - assert(code != NULL, "address to parse must be in CodeBlob"); + nm = code->as_nmethod_or_null(); + assert(nm != NULL, "address to parse must be in nmethod"); } - assert(ic_call == NULL || code->contains(ic_call), "must be in CodeBlob"); - assert(first_oop == NULL || code->contains(first_oop), "must be in CodeBlob"); + assert(ic_call == NULL || nm->contains(ic_call), "must be in nmethod"); + assert(first_oop == NULL || nm->contains(first_oop), "must be in nmethod"); address oop_limit = NULL; if (ic_call != NULL) { // search for the ic_call at the given address - RelocIterator iter(code, ic_call, ic_call+1); + RelocIterator iter(nm, ic_call, ic_call+1); bool ret = iter.next(); assert(ret == true, "relocInfo must exist at this address"); assert(iter.addr() == ic_call, "must find ic_call"); @@ -814,7 +817,7 @@ } // search for the first_oop, to get its oop_addr - RelocIterator all_oops(code, first_oop); + RelocIterator all_oops(nm, first_oop); RelocIterator iter = all_oops; iter.set_limit(first_oop+1); bool found_oop = false; @@ -842,7 +845,7 @@ } } guarantee(!did_reset, "cannot find ic_call"); - iter = RelocIterator(code); // search the whole CodeBlob + iter = RelocIterator(nm); // search the whole nmethod did_reset = true; } @@ -1175,9 +1178,9 @@ // For the debugger: extern "C" -void print_blob_locs(CodeBlob* cb) { - cb->print(); - RelocIterator iter(cb); +void print_blob_locs(nmethod* nm) { + nm->print(); + RelocIterator iter(nm); iter.print(); } extern "C"
--- a/hotspot/src/share/vm/code/relocInfo.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/code/relocInfo.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -512,7 +512,7 @@ address _limit; // stop producing relocations after this _addr relocInfo* _current; // the current relocation information relocInfo* _end; // end marker; we're done iterating when _current == _end - CodeBlob* _code; // compiled method containing _addr + nmethod* _code; // compiled method containing _addr address _addr; // instruction to which the relocation applies short _databuf; // spare buffer for compressed data short* _data; // pointer to the relocation's data @@ -549,7 +549,7 @@ address compute_section_start(int n) const; // out-of-line helper - void initialize(CodeBlob* nm, address begin, address limit); + void initialize(nmethod* nm, address begin, address limit); friend class PatchingRelocIterator; // make an uninitialized one, for PatchingRelocIterator: @@ -557,7 +557,7 @@ public: // constructor - RelocIterator(CodeBlob* cb, address begin = NULL, address limit = NULL); + RelocIterator(nmethod* nm, address begin = NULL, address limit = NULL); RelocIterator(CodeSection* cb, address begin = NULL, address limit = NULL); // get next reloc info, return !eos @@ -592,7 +592,7 @@ relocType type() const { return current()->type(); } int format() const { return (relocInfo::have_format) ? current()->format() : 0; } address addr() const { return _addr; } - CodeBlob* code() const { return _code; } + nmethod* code() const { return _code; } short* data() const { return _data; } int datalen() const { return _datalen; } bool has_current() const { return _datalen >= 0; } @@ -790,9 +790,9 @@ public: // accessors which only make sense for a bound Relocation - address addr() const { return binding()->addr(); } - CodeBlob* code() const { return binding()->code(); } - bool addr_in_const() const { return binding()->addr_in_const(); } + address addr() const { return binding()->addr(); } + nmethod* code() const { return binding()->code(); } + bool addr_in_const() const { return binding()->addr_in_const(); } protected: short* data() const { return binding()->data(); } int datalen() const { return binding()->datalen(); } @@ -982,12 +982,12 @@ // Figure out where an ic_call is hiding, given a set-oop or call. // Either ic_call or first_oop must be non-null; the other is deduced. - // Code if non-NULL must be the CodeBlob, else it is deduced. + // Code if non-NULL must be the nmethod, else it is deduced. // The address of the patchable oop is also deduced. // The returned iterator will enumerate over the oops and the ic_call, // as well as any other relocations that happen to be in that span of code. // Recognize relevant set_oops with: oop_reloc()->oop_addr() == oop_addr. - static RelocIterator parse_ic(CodeBlob* &code, address &ic_call, address &first_oop, oop* &oop_addr, bool *is_optimized); + static RelocIterator parse_ic(nmethod* &nm, address &ic_call, address &first_oop, oop* &oop_addr, bool *is_optimized); }; @@ -1304,8 +1304,8 @@ APPLY_TO_RELOCATIONS(EACH_CASE); #undef EACH_CASE -inline RelocIterator::RelocIterator(CodeBlob* cb, address begin, address limit) { - initialize(cb, begin, limit); +inline RelocIterator::RelocIterator(nmethod* nm, address begin, address limit) { + initialize(nm, begin, limit); } // if you are going to patch code, you should use this subclass of @@ -1323,8 +1323,8 @@ void operator=(const RelocIterator&); public: - PatchingRelocIterator(CodeBlob* cb, address begin =NULL, address limit =NULL) - : RelocIterator(cb, begin, limit) { prepass(); } + PatchingRelocIterator(nmethod* nm, address begin = NULL, address limit = NULL) + : RelocIterator(nm, begin, limit) { prepass(); } ~PatchingRelocIterator() { postpass(); } };
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1651,14 +1651,15 @@ log->stamp(); log->end_elem(); } - #ifndef PRODUCT - warning("CodeCache is full. Compiler has been disabled"); + warning("CodeCache is full. Compiler has been disabled."); + warning("Try increasing the code cache size using -XX:ReservedCodeCacheSize="); +#ifndef PRODUCT if (CompileTheWorld || ExitOnFullCodeCache) { before_exit(JavaThread::current()); exit_globals(); // will delete tty vm_direct_exit(CompileTheWorld ? 0 : 1); } - #endif +#endif if (UseCodeCacheFlushing) { NMethodSweeper::handle_full_code_cache(true); } else {
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -32,6 +32,23 @@ // highest ranked free list lock rank int CompactibleFreeListSpace::_lockRank = Mutex::leaf + 3; +// Defaults are 0 so things will break badly if incorrectly initialized. +int CompactibleFreeListSpace::IndexSetStart = 0; +int CompactibleFreeListSpace::IndexSetStride = 0; + +size_t MinChunkSize = 0; + +void CompactibleFreeListSpace::set_cms_values() { + // Set CMS global values + assert(MinChunkSize == 0, "already set"); + #define numQuanta(x,y) ((x+y-1)/y) + MinChunkSize = numQuanta(sizeof(FreeChunk), MinObjAlignmentInBytes) * MinObjAlignment; + + assert(IndexSetStart == 0 && IndexSetStride == 0, "already set"); + IndexSetStart = MinObjAlignment; + IndexSetStride = MinObjAlignment; +} + // Constructor CompactibleFreeListSpace::CompactibleFreeListSpace(BlockOffsetSharedArray* bs, MemRegion mr, bool use_adaptive_freelists, @@ -302,7 +319,7 @@ size_t CompactibleFreeListSpace::totalCountInIndexedFreeLists() const { size_t count = 0; - for (int i = MinChunkSize; i < IndexSetSize; i++) { + for (int i = (int)MinChunkSize; i < IndexSetSize; i++) { debug_only( ssize_t total_list_count = 0; for (FreeChunk* fc = _indexedFreeList[i].head(); fc != NULL;
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -91,10 +91,10 @@ enum SomeConstants { SmallForLinearAlloc = 16, // size < this then use _sLAB SmallForDictionary = 257, // size < this then use _indexedFreeList - IndexSetSize = SmallForDictionary, // keep this odd-sized - IndexSetStart = MinObjAlignment, - IndexSetStride = MinObjAlignment + IndexSetSize = SmallForDictionary // keep this odd-sized }; + static int IndexSetStart; + static int IndexSetStride; private: enum FitStrategyOptions { @@ -278,6 +278,9 @@ HeapWord* nearLargestChunk() const { return _nearLargestChunk; } void set_nearLargestChunk(HeapWord* v) { _nearLargestChunk = v; } + // Set CMS global values + static void set_cms_values(); + // Return the free chunk at the end of the space. If no such // chunk exists, return NULL. FreeChunk* find_chunk_at_end();
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -159,7 +159,7 @@ CardTableRS* ct, bool use_adaptive_freelists, FreeBlockDictionary::DictionaryChoice dictionaryChoice) : CardGeneration(rs, initial_byte_size, level, ct), - _dilatation_factor(((double)MinChunkSize)/((double)(oopDesc::header_size()))), + _dilatation_factor(((double)MinChunkSize)/((double)(CollectedHeap::min_fill_size()))), _debug_collection_type(Concurrent_collection_type) { HeapWord* bottom = (HeapWord*) _virtual_space.low(); @@ -222,7 +222,7 @@ // promoting generation, we'll instead just use the mimimum // object size (which today is a header's worth of space); // note that all arithmetic is in units of HeapWords. - assert(MinChunkSize >= oopDesc::header_size(), "just checking"); + assert(MinChunkSize >= CollectedHeap::min_fill_size(), "just checking"); assert(_dilatation_factor >= 1.0, "from previous assert"); }
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -133,9 +133,5 @@ void print_on(outputStream* st); }; -// Alignment helpers etc. -#define numQuanta(x,y) ((x+y-1)/y) -enum AlignmentConstants { - MinChunkSize = numQuanta(sizeof(FreeChunk), MinObjAlignmentInBytes) * MinObjAlignment -}; +extern size_t MinChunkSize;
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -3644,7 +3644,7 @@ do { free_words = r->free()/HeapWordSize; // If there's too little space, no one can allocate, so we're done. - if (free_words < (size_t)oopDesc::header_size()) return; + if (free_words < CollectedHeap::min_fill_size()) return; // Otherwise, try to claim it. block = r->par_allocate(free_words); } while (block == NULL);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -2523,14 +2523,14 @@ } if (ParallelGCThreads > 0) { const size_t OverpartitionFactor = 4; - const size_t MinChunkSize = 8; - const size_t ChunkSize = + const size_t MinWorkUnit = 8; + const size_t WorkUnit = MAX2(_g1->n_regions() / (ParallelGCThreads * OverpartitionFactor), - MinChunkSize); + MinWorkUnit); _collectionSetChooser->prepareForAddMarkedHeapRegionsPar(_g1->n_regions(), - ChunkSize); + WorkUnit); ParKnownGarbageTask parKnownGarbageTask(_collectionSetChooser, - (int) ChunkSize); + (int) WorkUnit); _g1->workers()->run_task(&parKnownGarbageTask); assert(_g1->check_heap_region_claim_values(HeapRegion::InitialClaimValue),
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -81,20 +81,24 @@ remove_expired_entries(end); if (_no_entries == QueueLength) { - // OK, right now when we fill up we bomb out - // there are a few ways of dealing with this "gracefully" + // OK, we've filled up the queue. There are a few ways + // of dealing with this "gracefully" // increase the array size (:-) // remove the oldest entry (this might allow more GC time for - // the time slice than what's allowed) + // the time slice than what's allowed) - this is what we + // currently do // consolidate the two entries with the minimum gap between them // (this might allow less GC time than what's allowed) - guarantee(NOT_PRODUCT(ScavengeALot ||) G1UseFixedWindowMMUTracker, - "array full, currently we can't recover unless +G1UseFixedWindowMMUTracker"); + // In the case where ScavengeALot is true, such overflow is not // uncommon; in such cases, we can, without much loss of precision // or performance (we are GC'ing most of the time anyway!), - // simply overwrite the oldest entry in the tracker: this - // is also the behaviour when G1UseFixedWindowMMUTracker is enabled. + // simply overwrite the oldest entry in the tracker. + + if (G1PolicyVerbose > 1) { + warning("MMU Tracker Queue overflow. Replacing earliest entry."); + } + _head_index = trim_index(_head_index + 1); assert(_head_index == _tail_index, "Because we have a full circular buffer"); _tail_index = trim_index(_tail_index + 1);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -254,9 +254,6 @@ "If non-0 is the size of the G1 survivor space, " \ "otherwise SurvivorRatio is used to determine the size") \ \ - product(bool, G1UseFixedWindowMMUTracker, false, \ - "If the MMU tracker's memory is full, forget the oldest entry") \ - \ product(uintx, G1HeapRegionSize, 0, \ "Size of the G1 regions.") \ \
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -711,6 +711,7 @@ // object in the region. if (region_ptr->data_size() == RegionSize) { result += pointer_delta(addr, region_addr); + DEBUG_ONLY(PSParallelCompact::check_new_location(addr, result);) return result; } @@ -1487,13 +1488,14 @@ space->set_top_for_allocations(); } - size_t obj_len = 8; + size_t min_size = CollectedHeap::min_fill_size(); + size_t obj_len = min_size; while (b + obj_len <= t) { CollectedHeap::fill_with_object(b, obj_len); mark_bitmap()->mark_obj(b, obj_len); summary_data().add_obj(b, obj_len); b += obj_len; - obj_len = (obj_len & 0x18) + 8; // 8 16 24 32 8 16 24 32 ... + obj_len = (obj_len & (min_size*3)) + min_size; // 8 16 24 32 8 16 24 32 ... } if (b < t) { // The loop didn't completely fill to t (top); adjust top downward. @@ -1680,11 +1682,13 @@ // +-------+ // Initially assume case a, c or e will apply. - size_t obj_len = (size_t)oopDesc::header_size(); + size_t obj_len = CollectedHeap::min_fill_size(); HeapWord* obj_beg = dense_prefix_end - obj_len; #ifdef _LP64 - if (_mark_bitmap.is_obj_end(dense_prefix_bit - 2)) { + if (MinObjAlignment > 1) { // object alignment > heap word size + // Cases a, c or e. + } else if (_mark_bitmap.is_obj_end(dense_prefix_bit - 2)) { // Case b above. obj_beg = dense_prefix_end - 1; } else if (!_mark_bitmap.is_obj_end(dense_prefix_bit - 3) &&
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1414,6 +1414,8 @@ { assert(old_addr >= new_addr || space_id(old_addr) != space_id(new_addr), "must move left or to a different space"); + assert(is_object_aligned((intptr_t)old_addr) && is_object_aligned((intptr_t)new_addr), + "checking alignment"); } #endif // ASSERT
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -761,7 +761,7 @@ if (p != NULL) { size_t remainder = s->free_in_words(); - if (remainder < (size_t)oopDesc::header_size() && remainder > 0) { + if (remainder < CollectedHeap::min_fill_size() && remainder > 0) { s->set_top(s->top() - size); p = NULL; } @@ -803,7 +803,7 @@ HeapWord *p = s->cas_allocate(size); if (p != NULL) { size_t remainder = pointer_delta(s->end(), p + size); - if (remainder < (size_t)oopDesc::header_size() && remainder > 0) { + if (remainder < CollectedHeap::min_fill_size() && remainder > 0) { if (s->cas_deallocate(p, size)) { // We were the last to allocate and created a fragment less than // a minimal object.
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -239,11 +239,11 @@ } size_t CollectedHeap::filler_array_hdr_size() { - return size_t(arrayOopDesc::header_size(T_INT)); + return size_t(align_object_offset(arrayOopDesc::header_size(T_INT))); // align to Long } size_t CollectedHeap::filler_array_min_size() { - return align_object_size(filler_array_hdr_size()); + return align_object_size(filler_array_hdr_size()); // align to MinObjAlignment } size_t CollectedHeap::filler_array_max_size() {
--- a/hotspot/src/share/vm/includeDB_compiler1 Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/includeDB_compiler1 Thu Jul 08 11:28:01 2010 -0700 @@ -71,8 +71,8 @@ c1_Compilation.cpp c1_MacroAssembler.hpp c1_Compilation.cpp c1_ValueMap.hpp c1_Compilation.cpp c1_ValueStack.hpp -c1_Compilation.cpp ciEnv.hpp c1_Compilation.cpp debugInfoRec.hpp +c1_Compilation.hpp ciEnv.hpp c1_Compilation.hpp exceptionHandlerTable.hpp c1_Compilation.hpp resourceArea.hpp @@ -82,6 +82,8 @@ c1_Compiler.cpp c1_Compilation.hpp c1_Compiler.cpp c1_Compiler.hpp c1_Compiler.cpp c1_FrameMap.hpp +c1_Compiler.cpp c1_GraphBuilder.hpp +c1_Compiler.cpp c1_LinearScan.hpp c1_Compiler.cpp c1_MacroAssembler.hpp c1_Compiler.cpp c1_Runtime1.hpp c1_Compiler.cpp c1_ValueType.hpp
--- a/hotspot/src/share/vm/includeDB_core Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/includeDB_core Thu Jul 08 11:28:01 2010 -0700 @@ -827,6 +827,7 @@ ciStreams.cpp ciStreams.hpp ciStreams.cpp ciUtilities.hpp +ciStreams.hpp bytecode.hpp ciStreams.hpp ciClassList.hpp ciStreams.hpp ciExceptionHandler.hpp ciStreams.hpp ciInstanceKlass.hpp @@ -3635,6 +3636,7 @@ rewriter.cpp gcLocker.hpp rewriter.cpp generateOopMap.hpp rewriter.cpp interpreter.hpp +rewriter.cpp methodComparator.hpp rewriter.cpp objArrayOop.hpp rewriter.cpp oop.inline.hpp rewriter.cpp oopFactory.hpp
--- a/hotspot/src/share/vm/interpreter/bytecode.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/bytecode.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -26,19 +26,12 @@ #include "incls/_bytecode.cpp.incl" // Implementation of Bytecode -// Should eventually get rid of these functions and use ThisRelativeObj methods instead -void Bytecode::set_code(Bytecodes::Code code) { - Bytecodes::check(code); - *addr_at(0) = u_char(code); -} - - -bool Bytecode::check_must_rewrite() const { - assert(Bytecodes::can_rewrite(code()), "post-check only"); +bool Bytecode::check_must_rewrite(Bytecodes::Code code) const { + assert(Bytecodes::can_rewrite(code), "post-check only"); // Some codes are conditionally rewriting. Look closely at them. - switch (code()) { + switch (code) { case Bytecodes::_aload_0: // Even if RewriteFrequentPairs is turned on, // the _aload_0 code might delay its rewrite until @@ -58,14 +51,85 @@ } +#ifdef ASSERT + +void Bytecode::assert_same_format_as(Bytecodes::Code testbc, bool is_wide) const { + Bytecodes::Code thisbc = Bytecodes::cast(byte_at(0)); + if (thisbc == Bytecodes::_breakpoint) return; // let the assertion fail silently + if (is_wide) { + assert(thisbc == Bytecodes::_wide, "expected a wide instruction"); + thisbc = Bytecodes::cast(byte_at(1)); + if (thisbc == Bytecodes::_breakpoint) return; + } + int thisflags = Bytecodes::flags(testbc, is_wide) & Bytecodes::_all_fmt_bits; + int testflags = Bytecodes::flags(thisbc, is_wide) & Bytecodes::_all_fmt_bits; + if (thisflags != testflags) + tty->print_cr("assert_same_format_as(%d) failed on bc=%d%s; %d != %d", + (int)testbc, (int)thisbc, (is_wide?"/wide":""), testflags, thisflags); + assert(thisflags == testflags, "expected format"); +} + +void Bytecode::assert_index_size(int size, Bytecodes::Code bc, bool is_wide) { + int have_fmt = (Bytecodes::flags(bc, is_wide) + & (Bytecodes::_fmt_has_u2 | Bytecodes::_fmt_has_u4 | + Bytecodes::_fmt_not_simple | + // Not an offset field: + Bytecodes::_fmt_has_o)); + int need_fmt = -1; + switch (size) { + case 1: need_fmt = 0; break; + case 2: need_fmt = Bytecodes::_fmt_has_u2; break; + case 4: need_fmt = Bytecodes::_fmt_has_u4; break; + } + if (is_wide) need_fmt |= Bytecodes::_fmt_not_simple; + if (have_fmt != need_fmt) { + tty->print_cr("assert_index_size %d: bc=%d%s %d != %d", size, bc, (is_wide?"/wide":""), have_fmt, need_fmt); + assert(have_fmt == need_fmt, "assert_index_size"); + } +} + +void Bytecode::assert_offset_size(int size, Bytecodes::Code bc, bool is_wide) { + int have_fmt = Bytecodes::flags(bc, is_wide) & Bytecodes::_all_fmt_bits; + int need_fmt = -1; + switch (size) { + case 2: need_fmt = Bytecodes::_fmt_bo2; break; + case 4: need_fmt = Bytecodes::_fmt_bo4; break; + } + if (is_wide) need_fmt |= Bytecodes::_fmt_not_simple; + if (have_fmt != need_fmt) { + tty->print_cr("assert_offset_size %d: bc=%d%s %d != %d", size, bc, (is_wide?"/wide":""), have_fmt, need_fmt); + assert(have_fmt == need_fmt, "assert_offset_size"); + } +} + +void Bytecode::assert_constant_size(int size, int where, Bytecodes::Code bc, bool is_wide) { + int have_fmt = Bytecodes::flags(bc, is_wide) & (Bytecodes::_all_fmt_bits + // Ignore any 'i' field (for iinc): + & ~Bytecodes::_fmt_has_i); + int need_fmt = -1; + switch (size) { + case 1: need_fmt = Bytecodes::_fmt_bc; break; + case 2: need_fmt = Bytecodes::_fmt_bc | Bytecodes::_fmt_has_u2; break; + } + if (is_wide) need_fmt |= Bytecodes::_fmt_not_simple; + int length = is_wide ? Bytecodes::wide_length_for(bc) : Bytecodes::length_for(bc); + if (have_fmt != need_fmt || where + size != length) { + tty->print_cr("assert_constant_size %d @%d: bc=%d%s %d != %d", size, where, bc, (is_wide?"/wide":""), have_fmt, need_fmt); + } + assert(have_fmt == need_fmt, "assert_constant_size"); + assert(where + size == length, "assert_constant_size oob"); +} + +void Bytecode::assert_native_index(Bytecodes::Code bc, bool is_wide) { + assert((Bytecodes::flags(bc, is_wide) & Bytecodes::_fmt_has_nbo) != 0, "native index"); +} + +#endif //ASSERT // Implementation of Bytecode_tableupswitch int Bytecode_tableswitch::dest_offset_at(int i) const { - address x = aligned_addr_at(1); - int x2 = aligned_offset(1 + (3 + i)*jintSize); - int val = java_signed_word_at(x2); - return java_signed_word_at(aligned_offset(1 + (3 + i)*jintSize)); + return get_Java_u4_at(aligned_offset(1 + (3 + i)*jintSize)); } @@ -74,6 +138,7 @@ void Bytecode_invoke::verify() const { Bytecodes::Code bc = adjusted_invoke_code(); assert(is_valid(), "check invoke"); + assert(method()->constants()->cache() != NULL, "do not call this from verifier or rewriter"); } @@ -116,27 +181,12 @@ int Bytecode_invoke::index() const { // Note: Rewriter::rewrite changes the Java_u2 of an invokedynamic to a native_u4, // at the same time it allocates per-call-site CP cache entries. - if (has_giant_index()) - return Bytes::get_native_u4(bcp() + 1); + Bytecodes::Code stdc = Bytecodes::java_code(code()); + Bytecode* invoke = Bytecode_at(bcp()); + if (invoke->has_index_u4(stdc)) + return invoke->get_index_u4(stdc); else - return Bytes::get_Java_u2(bcp() + 1); -} - - -// Implementation of Bytecode_static - -void Bytecode_static::verify() const { - assert(Bytecodes::java_code(code()) == Bytecodes::_putstatic - || Bytecodes::java_code(code()) == Bytecodes::_getstatic, "check static"); -} - - -BasicType Bytecode_static::result_type(methodOop method) const { - int index = java_hwrd_at(1); - constantPoolOop constants = method->constants(); - symbolOop field_type = constants->signature_ref_at(index); - BasicType basic_type = FieldType::basic_type(field_type); - return basic_type; + return invoke->get_index_u2_cpcache(stdc); } @@ -156,7 +206,8 @@ int Bytecode_field::index() const { - return java_hwrd_at(1); + Bytecode* invoke = Bytecode_at(bcp()); + return invoke->get_index_u2_cpcache(Bytecodes::_getfield); } @@ -164,7 +215,14 @@ int Bytecode_loadconstant::index() const { Bytecodes::Code stdc = Bytecodes::java_code(code()); - return stdc == Bytecodes::_ldc ? java_byte_at(1) : java_hwrd_at(1); + if (stdc != Bytecodes::_wide) { + if (Bytecodes::java_code(stdc) == Bytecodes::_ldc) + return get_index_u1(stdc); + else + return get_index_u2(stdc, false); + } + stdc = Bytecodes::code_at(addr_at(1)); + return get_index_u2(stdc, true); } //------------------------------------------------------------------------------
--- a/hotspot/src/share/vm/interpreter/bytecode.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/bytecode.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -26,92 +26,100 @@ // relative to an objects 'this' pointer. class ThisRelativeObj VALUE_OBJ_CLASS_SPEC { - private: - int sign_extend (int x, int size) const { const int s = (BytesPerInt - size)*BitsPerByte; return (x << s) >> s; } - public: // Address computation address addr_at (int offset) const { return (address)this + offset; } + int byte_at (int offset) const { return *(addr_at(offset)); } address aligned_addr_at (int offset) const { return (address)round_to((intptr_t)addr_at(offset), jintSize); } int aligned_offset (int offset) const { return aligned_addr_at(offset) - addr_at(0); } - // Java unsigned accessors (using Java spec byte ordering) - int java_byte_at (int offset) const { return *(jubyte*)addr_at(offset); } - int java_hwrd_at (int offset) const { return java_byte_at(offset) << (1 * BitsPerByte) | java_byte_at(offset + 1); } - int java_word_at (int offset) const { return java_hwrd_at(offset) << (2 * BitsPerByte) | java_hwrd_at(offset + 2); } - - // Java signed accessors (using Java spec byte ordering) - int java_signed_byte_at(int offset) const { return sign_extend(java_byte_at(offset), 1); } - int java_signed_hwrd_at(int offset) const { return sign_extend(java_hwrd_at(offset), 2); } - int java_signed_word_at(int offset) const { return java_word_at(offset) ; } - - // Fast accessors (using the machine's natural byte ordering) - int fast_byte_at (int offset) const { return *(jubyte *)addr_at(offset); } - int fast_hwrd_at (int offset) const { return *(jushort*)addr_at(offset); } - int fast_word_at (int offset) const { return *(juint *)addr_at(offset); } - - // Fast signed accessors (using the machine's natural byte ordering) - int fast_signed_byte_at(int offset) const { return *(jbyte *)addr_at(offset); } - int fast_signed_hwrd_at(int offset) const { return *(jshort*)addr_at(offset); } - int fast_signed_word_at(int offset) const { return *(jint *)addr_at(offset); } - - // Fast manipulators (using the machine's natural byte ordering) - void set_fast_byte_at (int offset, int x) const { *(jbyte *)addr_at(offset) = (jbyte )x; } - void set_fast_hwrd_at (int offset, int x) const { *(jshort*)addr_at(offset) = (jshort)x; } - void set_fast_word_at (int offset, int x) const { *(jint *)addr_at(offset) = (jint )x; } + // Word access: + int get_Java_u2_at (int offset) const { return Bytes::get_Java_u2(addr_at(offset)); } + int get_Java_u4_at (int offset) const { return Bytes::get_Java_u4(addr_at(offset)); } + int get_native_u2_at (int offset) const { return Bytes::get_native_u2(addr_at(offset)); } + int get_native_u4_at (int offset) const { return Bytes::get_native_u4(addr_at(offset)); } }; // The base class for different kinds of bytecode abstractions. // Provides the primitive operations to manipulate code relative // to an objects 'this' pointer. +// FIXME: Make this a ResourceObj, include the enclosing methodOop, and cache the opcode. class Bytecode: public ThisRelativeObj { protected: u_char byte_at(int offset) const { return *addr_at(offset); } - bool check_must_rewrite() const; + bool check_must_rewrite(Bytecodes::Code bc) const; public: // Attributes address bcp() const { return addr_at(0); } - address next_bcp() const { return addr_at(0) + Bytecodes::length_at(bcp()); } int instruction_size() const { return Bytecodes::length_at(bcp()); } + // Warning: Use code() with caution on live bytecode streams. 4926272 Bytecodes::Code code() const { return Bytecodes::code_at(addr_at(0)); } Bytecodes::Code java_code() const { return Bytecodes::java_code(code()); } - bool must_rewrite() const { return Bytecodes::can_rewrite(code()) && check_must_rewrite(); } - bool is_active_breakpoint() const { return Bytecodes::is_active_breakpoint_at(bcp()); } - - int one_byte_index() const { assert_index_size(1); return byte_at(1); } - int two_byte_index() const { assert_index_size(2); return (byte_at(1) << 8) + byte_at(2); } - - int offset() const { return (two_byte_index() << 16) >> 16; } - address destination() const { return bcp() + offset(); } - - // Attribute modification - void set_code(Bytecodes::Code code); + bool must_rewrite(Bytecodes::Code code) const { return Bytecodes::can_rewrite(code) && check_must_rewrite(code); } // Creation inline friend Bytecode* Bytecode_at(address bcp); - private: - void assert_index_size(int required_size) const { -#ifdef ASSERT - int isize = instruction_size() - 1; - if (isize == 2 && code() == Bytecodes::_iinc) - isize = 1; - else if (isize <= 2) - ; // no change - else if (code() == Bytecodes::_invokedynamic) - isize = 4; - else - isize = 2; - assert(isize = required_size, "wrong index size"); -#endif + // Static functions for parsing bytecodes in place. + int get_index_u1(Bytecodes::Code bc) const { + assert_same_format_as(bc); assert_index_size(1, bc); + return *(jubyte*)addr_at(1); + } + int get_index_u2(Bytecodes::Code bc, bool is_wide = false) const { + assert_same_format_as(bc, is_wide); assert_index_size(2, bc, is_wide); + address p = addr_at(is_wide ? 2 : 1); + if (can_use_native_byte_order(bc, is_wide)) + return Bytes::get_native_u2(p); + else return Bytes::get_Java_u2(p); + } + int get_index_u2_cpcache(Bytecodes::Code bc) const { + assert_same_format_as(bc); assert_index_size(2, bc); assert_native_index(bc); + return Bytes::get_native_u2(addr_at(1)) DEBUG_ONLY(+ constantPoolOopDesc::CPCACHE_INDEX_TAG); + } + int get_index_u4(Bytecodes::Code bc) const { + assert_same_format_as(bc); assert_index_size(4, bc); + assert(can_use_native_byte_order(bc), ""); + return Bytes::get_native_u4(addr_at(1)); + } + bool has_index_u4(Bytecodes::Code bc) const { + return bc == Bytecodes::_invokedynamic; + } + + int get_offset_s2(Bytecodes::Code bc) const { + assert_same_format_as(bc); assert_offset_size(2, bc); + return (jshort) Bytes::get_Java_u2(addr_at(1)); + } + int get_offset_s4(Bytecodes::Code bc) const { + assert_same_format_as(bc); assert_offset_size(4, bc); + return (jint) Bytes::get_Java_u4(addr_at(1)); + } + + int get_constant_u1(int offset, Bytecodes::Code bc) const { + assert_same_format_as(bc); assert_constant_size(1, offset, bc); + return *(jbyte*)addr_at(offset); + } + int get_constant_u2(int offset, Bytecodes::Code bc, bool is_wide = false) const { + assert_same_format_as(bc, is_wide); assert_constant_size(2, offset, bc, is_wide); + return (jshort) Bytes::get_Java_u2(addr_at(offset)); + } + + // These are used locally and also from bytecode streams. + void assert_same_format_as(Bytecodes::Code testbc, bool is_wide = false) const NOT_DEBUG_RETURN; + static void assert_index_size(int required_size, Bytecodes::Code bc, bool is_wide = false) NOT_DEBUG_RETURN; + static void assert_offset_size(int required_size, Bytecodes::Code bc, bool is_wide = false) NOT_DEBUG_RETURN; + static void assert_constant_size(int required_size, int where, Bytecodes::Code bc, bool is_wide = false) NOT_DEBUG_RETURN; + static void assert_native_index(Bytecodes::Code bc, bool is_wide = false) NOT_DEBUG_RETURN; + static bool can_use_native_byte_order(Bytecodes::Code bc, bool is_wide = false) { + return (!Bytes::is_Java_byte_ordering_different() || Bytecodes::native_byte_order(bc /*, is_wide*/)); } }; inline Bytecode* Bytecode_at(address bcp) { + // Warning: Use with caution on live bytecode streams. 4926272 return (Bytecode*)bcp; } @@ -124,8 +132,8 @@ int _offset; public: - int match() const { return java_signed_word_at(0 * jintSize); } - int offset() const { return java_signed_word_at(1 * jintSize); } + int match() const { return get_Java_u4_at(0 * jintSize); } + int offset() const { return get_Java_u4_at(1 * jintSize); } }; @@ -134,8 +142,8 @@ void verify() const PRODUCT_RETURN; // Attributes - int default_offset() const { return java_signed_word_at(aligned_offset(1 + 0*jintSize)); } - int number_of_pairs() const { return java_signed_word_at(aligned_offset(1 + 1*jintSize)); } + int default_offset() const { return get_Java_u4_at(aligned_offset(1 + 0*jintSize)); } + int number_of_pairs() const { return get_Java_u4_at(aligned_offset(1 + 1*jintSize)); } LookupswitchPair* pair_at(int i) const { assert(0 <= i && i < number_of_pairs(), "pair index out of bounds"); return (LookupswitchPair*)aligned_addr_at(1 + (1 + i)*2*jintSize); } // Creation @@ -154,9 +162,9 @@ void verify() const PRODUCT_RETURN; // Attributes - int default_offset() const { return java_signed_word_at(aligned_offset(1 + 0*jintSize)); } - int low_key() const { return java_signed_word_at(aligned_offset(1 + 1*jintSize)); } - int high_key() const { return java_signed_word_at(aligned_offset(1 + 2*jintSize)); } + int default_offset() const { return get_Java_u4_at(aligned_offset(1 + 0*jintSize)); } + int low_key() const { return get_Java_u4_at(aligned_offset(1 + 1*jintSize)); } + int high_key() const { return get_Java_u4_at(aligned_offset(1 + 2*jintSize)); } int dest_offset_at(int i) const; int length() { return high_key()-low_key()+1; } @@ -206,7 +214,6 @@ bool is_invokedynamic() const { return adjusted_invoke_code() == Bytecodes::_invokedynamic; } bool has_receiver() const { return !is_invokestatic() && !is_invokedynamic(); } - bool has_giant_index() const { return is_invokedynamic(); } bool is_valid() const { return is_invokeinterface() || is_invokevirtual() || @@ -252,26 +259,6 @@ } -// Abstraction for {get,put}static - -class Bytecode_static: public Bytecode { - public: - void verify() const; - - // Returns the result type of the send by inspecting the field ref - BasicType result_type(methodOop method) const; - - // Creation - inline friend Bytecode_static* Bytecode_static_at(const methodOop method, address bcp); -}; - -inline Bytecode_static* Bytecode_static_at(const methodOop method, address bcp) { - Bytecode_static* b = (Bytecode_static*)bcp; - debug_only(b->verify()); - return b; -} - - // Abstraction for checkcast class Bytecode_checkcast: public Bytecode { @@ -279,7 +266,7 @@ void verify() const { assert(Bytecodes::java_code(code()) == Bytecodes::_checkcast, "check checkcast"); } // Returns index - long index() const { return java_hwrd_at(1); }; + long index() const { return get_index_u2(Bytecodes::_checkcast); }; // Creation inline friend Bytecode_checkcast* Bytecode_checkcast_at(address bcp); @@ -299,7 +286,7 @@ void verify() const { assert(code() == Bytecodes::_instanceof, "check instanceof"); } // Returns index - long index() const { return java_hwrd_at(1); }; + long index() const { return get_index_u2(Bytecodes::_instanceof); }; // Creation inline friend Bytecode_instanceof* Bytecode_instanceof_at(address bcp); @@ -317,7 +304,7 @@ void verify() const { assert(java_code() == Bytecodes::_new, "check new"); } // Returns index - long index() const { return java_hwrd_at(1); }; + long index() const { return get_index_u2(Bytecodes::_new); }; // Creation inline friend Bytecode_new* Bytecode_new_at(address bcp); @@ -335,7 +322,7 @@ void verify() const { assert(java_code() == Bytecodes::_multianewarray, "check new"); } // Returns index - long index() const { return java_hwrd_at(1); }; + long index() const { return get_index_u2(Bytecodes::_multianewarray); }; // Creation inline friend Bytecode_multianewarray* Bytecode_multianewarray_at(address bcp); @@ -353,7 +340,7 @@ void verify() const { assert(java_code() == Bytecodes::_anewarray, "check anewarray"); } // Returns index - long index() const { return java_hwrd_at(1); }; + long index() const { return get_index_u2(Bytecodes::_anewarray); }; // Creation inline friend Bytecode_anewarray* Bytecode_anewarray_at(address bcp);
--- a/hotspot/src/share/vm/interpreter/bytecodeStream.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/bytecodeStream.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -48,6 +48,25 @@ } } } - _code = code; + _raw_code = code; return code; } + +#ifdef ASSERT +void BaseBytecodeStream::assert_raw_index_size(int size) const { + if (raw_code() == Bytecodes::_invokedynamic && is_raw()) { + // in raw mode, pretend indy is "bJJ__" + assert(size == 2, "raw invokedynamic instruction has 2-byte index only"); + } else { + bytecode()->assert_index_size(size, raw_code(), is_wide()); + } +} + +void BaseBytecodeStream::assert_raw_stream(bool want_raw) const { + if (want_raw) { + assert( is_raw(), "this function only works on raw streams"); + } else { + assert(!is_raw(), "this function only works on non-raw streams"); + } +} +#endif //ASSERT
--- a/hotspot/src/share/vm/interpreter/bytecodeStream.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/bytecodeStream.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -32,13 +32,13 @@ // while ((c = s.next()) >= 0) { // ... // } -// + // A RawBytecodeStream is a simple version of BytecodeStream. // It is used ONLY when we know the bytecodes haven't been rewritten -// yet, such as in the rewriter or the verifier. Currently only the -// verifier uses this class. +// yet, such as in the rewriter or the verifier. -class RawBytecodeStream: StackObj { +// Here is the common base class for both RawBytecodeStream and BytecodeStream: +class BaseBytecodeStream: StackObj { protected: // stream buffer methodHandle _method; // read from method directly @@ -49,15 +49,17 @@ int _end_bci; // bci after the current iteration interval // last bytecode read - Bytecodes::Code _code; + Bytecodes::Code _raw_code; bool _is_wide; + bool _is_raw; // false in 'cooked' BytecodeStream + + // Construction + BaseBytecodeStream(methodHandle method) : _method(method) { + set_interval(0, _method->code_size()); + _is_raw = false; + } public: - // Construction - RawBytecodeStream(methodHandle method) : _method(method) { - set_interval(0, _method->code_size()); - } - // Iteration control void set_interval(int beg_bci, int end_bci) { // iterate over the interval [beg_bci, end_bci) @@ -72,6 +74,46 @@ set_interval(beg_bci, _method->code_size()); } + bool is_raw() const { return _is_raw; } + + // Stream attributes + methodHandle method() const { return _method; } + + int bci() const { return _bci; } + int next_bci() const { return _next_bci; } + int end_bci() const { return _end_bci; } + + Bytecodes::Code raw_code() const { return _raw_code; } + bool is_wide() const { return _is_wide; } + int instruction_size() const { return (_next_bci - _bci); } + bool is_last_bytecode() const { return _next_bci >= _end_bci; } + + address bcp() const { return method()->code_base() + _bci; } + Bytecode* bytecode() const { return Bytecode_at(bcp()); } + + // State changes + void set_next_bci(int bci) { assert(0 <= bci && bci <= method()->code_size(), "illegal bci"); _next_bci = bci; } + + // Bytecode-specific attributes + int dest() const { return bci() + bytecode()->get_offset_s2(raw_code()); } + int dest_w() const { return bci() + bytecode()->get_offset_s4(raw_code()); } + + // One-byte indices. + int get_index_u1() const { assert_raw_index_size(1); return *(jubyte*)(bcp()+1); } + + protected: + void assert_raw_index_size(int size) const NOT_DEBUG_RETURN; + void assert_raw_stream(bool want_raw) const NOT_DEBUG_RETURN; +}; + +class RawBytecodeStream: public BaseBytecodeStream { + public: + // Construction + RawBytecodeStream(methodHandle method) : BaseBytecodeStream(method) { + _is_raw = true; + } + + public: // Iteration // Use raw_next() rather than next() for faster method reference Bytecodes::Code raw_next() { @@ -80,7 +122,7 @@ _bci = _next_bci; assert(!is_last_bytecode(), "caller should check is_last_bytecode()"); - address bcp = RawBytecodeStream::bcp(); + address bcp = this->bcp(); code = Bytecodes::code_or_bp_at(bcp); // set next bytecode position @@ -90,84 +132,49 @@ && code != Bytecodes::_lookupswitch, "can't be special bytecode"); _is_wide = false; _next_bci += l; - _code = code; + _raw_code = code; return code; - } else if (code == Bytecodes::_wide && _bci + 1 >= _end_bci) { - return Bytecodes::_illegal; } else { return raw_next_special(code); } } Bytecodes::Code raw_next_special(Bytecodes::Code code); - // Stream attributes - methodHandle method() const { return _method; } - - int bci() const { return _bci; } - int next_bci() const { return _next_bci; } - int end_bci() const { return _end_bci; } - - Bytecodes::Code code() const { return _code; } - bool is_wide() const { return _is_wide; } - int instruction_size() const { return (_next_bci - _bci); } - bool is_last_bytecode() const { return _next_bci >= _end_bci; } - - address bcp() const { return method()->code_base() + _bci; } - address next_bcp() { return method()->code_base() + _next_bci; } - - // State changes - void set_next_bci(int bci) { assert(0 <= bci && bci <= method()->code_size(), "illegal bci"); _next_bci = bci; } - - // Bytecode-specific attributes - int dest() const { return bci() + (short)Bytes::get_Java_u2(bcp() + 1); } - int dest_w() const { return bci() + (int )Bytes::get_Java_u4(bcp() + 1); } - - // Unsigned indices, widening - int get_index() const { assert_index_size(is_wide() ? 2 : 1); - return (is_wide()) ? Bytes::get_Java_u2(bcp() + 2) : bcp()[1]; } - int get_index_big() const { assert_index_size(2); - return (int)Bytes::get_Java_u2(bcp() + 1); } - int get_index_int() const { return has_giant_index() ? get_index_giant() : get_index_big(); } - int get_index_giant() const { assert_index_size(4); return Bytes::get_native_u4(bcp() + 1); } - int has_giant_index() const { return (code() == Bytecodes::_invokedynamic); } + // Unsigned indices, widening, with no swapping of bytes + int get_index() const { return (is_wide()) ? get_index_u2_raw(bcp() + 2) : get_index_u1(); } + // Get an unsigned 2-byte index, with no swapping of bytes. + int get_index_u2() const { assert(!is_wide(), ""); return get_index_u2_raw(bcp() + 1); } private: - void assert_index_size(int required_size) const { -#ifdef ASSERT - int isize = instruction_size() - (int)_is_wide - 1; - if (isize == 2 && code() == Bytecodes::_iinc) - isize = 1; - else if (isize <= 2) - ; // no change - else if (has_giant_index()) - isize = 4; - else - isize = 2; - assert(isize = required_size, "wrong index size"); -#endif + int get_index_u2_raw(address p) const { + assert_raw_index_size(2); assert_raw_stream(true); + return Bytes::get_Java_u2(p); } }; // In BytecodeStream, non-java bytecodes will be translated into the // corresponding java bytecodes. -class BytecodeStream: public RawBytecodeStream { +class BytecodeStream: public BaseBytecodeStream { + Bytecodes::Code _code; + public: // Construction - BytecodeStream(methodHandle method) : RawBytecodeStream(method) { } + BytecodeStream(methodHandle method) : BaseBytecodeStream(method) { } // Iteration Bytecodes::Code next() { - Bytecodes::Code code; + Bytecodes::Code raw_code, code; // set reading position _bci = _next_bci; if (is_last_bytecode()) { // indicate end of bytecode stream - code = Bytecodes::_illegal; + raw_code = code = Bytecodes::_illegal; } else { // get bytecode - address bcp = BytecodeStream::bcp(); - code = Bytecodes::java_code_at(bcp); + address bcp = this->bcp(); + raw_code = Bytecodes::code_at(bcp); + code = Bytecodes::java_code(raw_code); // set next bytecode position // // note that we cannot advance before having the @@ -181,14 +188,29 @@ _is_wide = false; // check for special (uncommon) cases if (code == Bytecodes::_wide) { - code = (Bytecodes::Code)bcp[1]; + raw_code = (Bytecodes::Code)bcp[1]; + code = raw_code; // wide BCs are always Java-normal _is_wide = true; } assert(Bytecodes::is_java_code(code), "sanity check"); } + _raw_code = raw_code; _code = code; return _code; } bool is_active_breakpoint() const { return Bytecodes::is_active_breakpoint_at(bcp()); } + Bytecodes::Code code() const { return _code; } + + // Unsigned indices, widening + int get_index() const { return is_wide() ? bytecode()->get_index_u2(raw_code(), true) : get_index_u1(); } + // Get an unsigned 2-byte index, swapping the bytes if necessary. + int get_index_u2() const { assert_raw_stream(false); + return bytecode()->get_index_u2(raw_code(), false); } + // Get an unsigned 2-byte index in native order. + int get_index_u2_cpcache() const { assert_raw_stream(false); + return bytecode()->get_index_u2_cpcache(raw_code()); } + int get_index_u4() const { assert_raw_stream(false); + return bytecode()->get_index_u4(raw_code()); } + bool has_index_u4() const { return bytecode()->has_index_u4(raw_code()); } };
--- a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -39,6 +39,7 @@ // (Also, ensure that occasional false positives are benign.) methodOop _current_method; bool _is_wide; + Bytecodes::Code _code; address _next_pc; // current decoding position void align() { _next_pc = (address)round_to((intptr_t)_next_pc, sizeof(jint)); } @@ -46,23 +47,26 @@ short get_short() { short i=Bytes::get_Java_u2(_next_pc); _next_pc+=2; return i; } int get_int() { int i=Bytes::get_Java_u4(_next_pc); _next_pc+=4; return i; } - int get_index() { return *(address)_next_pc++; } - int get_big_index() { int i=Bytes::get_Java_u2(_next_pc); _next_pc+=2; return i; } - int get_giant_index() { int i=Bytes::get_native_u4(_next_pc); _next_pc+=4; return i; } - int get_index_special() { return (is_wide()) ? get_big_index() : get_index(); } + int get_index_u1() { return *(address)_next_pc++; } + int get_index_u2() { int i=Bytes::get_Java_u2(_next_pc); _next_pc+=2; return i; } + int get_index_u2_cpcache() { int i=Bytes::get_native_u2(_next_pc); _next_pc+=2; return i + constantPoolOopDesc::CPCACHE_INDEX_TAG; } + int get_index_u4() { int i=Bytes::get_native_u4(_next_pc); _next_pc+=4; return i; } + int get_index_special() { return (is_wide()) ? get_index_u2() : get_index_u1(); } methodOop method() { return _current_method; } bool is_wide() { return _is_wide; } + Bytecodes::Code raw_code() { return Bytecodes::Code(_code); } - bool check_index(int i, bool in_cp_cache, int& cp_index, outputStream* st = tty); + bool check_index(int i, int& cp_index, outputStream* st = tty); void print_constant(int i, outputStream* st = tty); void print_field_or_method(int i, outputStream* st = tty); - void print_attributes(Bytecodes::Code code, int bci, outputStream* st = tty); + void print_attributes(int bci, outputStream* st = tty); void bytecode_epilog(int bci, outputStream* st = tty); public: BytecodePrinter() { _is_wide = false; + _code = Bytecodes::_illegal; } // This method is called while executing the raw bytecodes, so none of @@ -89,7 +93,8 @@ } else { code = Bytecodes::code_at(bcp); } - int bci = bcp - method->code_base(); + _code = code; + int bci = bcp - method->code_base(); st->print("[%d] ", (int) Thread::current()->osthread()->thread_id()); if (Verbose) { st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s", @@ -99,10 +104,11 @@ BytecodeCounter::counter_value(), bci, Bytecodes::name(code)); } _next_pc = is_wide() ? bcp+2 : bcp+1; - print_attributes(code, bci); + print_attributes(bci); // Set is_wide for the next one, since the caller of this doesn't skip // the next bytecode. _is_wide = (code == Bytecodes::_wide); + _code = Bytecodes::_illegal; } // Used for methodOop::print_codes(). The input bcp comes from @@ -116,6 +122,7 @@ if (is_wide()) { code = Bytecodes::code_at(bcp+1); } + _code = code; int bci = bcp - method->code_base(); // Print bytecode index and name if (is_wide()) { @@ -124,7 +131,7 @@ st->print("%d %s", bci, Bytecodes::name(code)); } _next_pc = is_wide() ? bcp+2 : bcp+1; - print_attributes(code, bci, st); + print_attributes(bci, st); bytecode_epilog(bci, st); } }; @@ -185,12 +192,13 @@ } } -bool BytecodePrinter::check_index(int i, bool in_cp_cache, int& cp_index, outputStream* st) { +bool BytecodePrinter::check_index(int i, int& cp_index, outputStream* st) { constantPoolOop constants = method()->constants(); int ilimit = constants->length(), climit = 0; + Bytecodes::Code code = raw_code(); constantPoolCacheOop cache = NULL; - if (in_cp_cache) { + if (Bytecodes::uses_cp_cache(code)) { cache = constants->cache(); if (cache != NULL) { //climit = cache->length(); // %%% private! @@ -201,7 +209,7 @@ } } - if (in_cp_cache && constantPoolCacheOopDesc::is_secondary_index(i)) { + if (cache != NULL && constantPoolCacheOopDesc::is_secondary_index(i)) { i = constantPoolCacheOopDesc::decode_secondary_index(i); st->print(" secondary cache[%d] of", i); if (i >= 0 && i < climit) { @@ -218,8 +226,6 @@ } if (cache != NULL) { - i = Bytes::swap_u2(i); - if (WizardMode) st->print(" (swap=%d)", i); goto check_cache_index; } @@ -234,6 +240,17 @@ return false; check_cache_index: +#ifdef ASSERT + { + const int CPCACHE_INDEX_TAG = constantPoolOopDesc::CPCACHE_INDEX_TAG; + if (i >= CPCACHE_INDEX_TAG && i < climit + CPCACHE_INDEX_TAG) { + i -= CPCACHE_INDEX_TAG; + } else { + st->print_cr(" CP[%d] missing bias?", i); + return false; + } + } +#endif //ASSERT if (i >= 0 && i < climit) { if (cache->entry_at(i)->is_secondary_entry()) { st->print_cr(" secondary entry?"); @@ -248,7 +265,7 @@ void BytecodePrinter::print_constant(int i, outputStream* st) { int orig_i = i; - if (!check_index(orig_i, false, i, st)) return; + if (!check_index(orig_i, i, st)) return; constantPoolOop constants = method()->constants(); constantTag tag = constants->tag_at(i); @@ -279,7 +296,7 @@ void BytecodePrinter::print_field_or_method(int i, outputStream* st) { int orig_i = i; - if (!check_index(orig_i, true, i, st)) return; + if (!check_index(orig_i, i, st)) return; constantPoolOop constants = method()->constants(); constantTag tag = constants->tag_at(i); @@ -303,9 +320,9 @@ } -void BytecodePrinter::print_attributes(Bytecodes::Code code, int bci, outputStream* st) { +void BytecodePrinter::print_attributes(int bci, outputStream* st) { // Show attributes of pre-rewritten codes - code = Bytecodes::java_code(code); + Bytecodes::Code code = Bytecodes::java_code(raw_code()); // If the code doesn't have any fields there's nothing to print. // note this is ==1 because the tableswitch and lookupswitch are // zero size (for some reason) and we want to print stuff out for them. @@ -323,12 +340,12 @@ st->print_cr(" " INT32_FORMAT, get_short()); break; case Bytecodes::_ldc: - print_constant(get_index(), st); + print_constant(get_index_u1(), st); break; case Bytecodes::_ldc_w: case Bytecodes::_ldc2_w: - print_constant(get_big_index(), st); + print_constant(get_index_u2(), st); break; case Bytecodes::_iload: @@ -352,7 +369,7 @@ break; case Bytecodes::_newarray: { - BasicType atype = (BasicType)get_index(); + BasicType atype = (BasicType)get_index_u1(); const char* str = type2name(atype); if (str == NULL || atype == T_OBJECT || atype == T_ARRAY) { assert(false, "Unidentified basic type"); @@ -361,15 +378,15 @@ } break; case Bytecodes::_anewarray: { - int klass_index = get_big_index(); + int klass_index = get_index_u2(); constantPoolOop constants = method()->constants(); symbolOop name = constants->klass_name_at(klass_index); st->print_cr(" %s ", name->as_C_string()); } break; case Bytecodes::_multianewarray: { - int klass_index = get_big_index(); - int nof_dims = get_index(); + int klass_index = get_index_u2(); + int nof_dims = get_index_u1(); constantPoolOop constants = method()->constants(); symbolOop name = constants->klass_name_at(klass_index); st->print_cr(" %s %d", name->as_C_string(), nof_dims); @@ -451,31 +468,31 @@ case Bytecodes::_getstatic: case Bytecodes::_putfield: case Bytecodes::_getfield: - print_field_or_method(get_big_index(), st); + print_field_or_method(get_index_u2_cpcache(), st); break; case Bytecodes::_invokevirtual: case Bytecodes::_invokespecial: case Bytecodes::_invokestatic: - print_field_or_method(get_big_index(), st); + print_field_or_method(get_index_u2_cpcache(), st); break; case Bytecodes::_invokeinterface: - { int i = get_big_index(); - int n = get_index(); - get_index(); // ignore zero byte + { int i = get_index_u2_cpcache(); + int n = get_index_u1(); + get_byte(); // ignore zero byte print_field_or_method(i, st); } break; case Bytecodes::_invokedynamic: - print_field_or_method(get_giant_index(), st); + print_field_or_method(get_index_u4(), st); break; case Bytecodes::_new: case Bytecodes::_checkcast: case Bytecodes::_instanceof: - { int i = get_big_index(); + { int i = get_index_u2(); constantPoolOop constants = method()->constants(); symbolOop name = constants->klass_name_at(i); st->print_cr(" %d <%s>", i, name->as_C_string());
--- a/hotspot/src/share/vm/interpreter/bytecodes.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/bytecodes.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -37,14 +37,11 @@ bool Bytecodes::_is_initialized = false; const char* Bytecodes::_name [Bytecodes::number_of_codes]; -const char* Bytecodes::_format [Bytecodes::number_of_codes]; -const char* Bytecodes::_wide_format [Bytecodes::number_of_codes]; BasicType Bytecodes::_result_type [Bytecodes::number_of_codes]; s_char Bytecodes::_depth [Bytecodes::number_of_codes]; -u_char Bytecodes::_length [Bytecodes::number_of_codes]; -bool Bytecodes::_can_trap [Bytecodes::number_of_codes]; +u_char Bytecodes::_lengths [Bytecodes::number_of_codes]; Bytecodes::Code Bytecodes::_java_code [Bytecodes::number_of_codes]; -bool Bytecodes::_can_rewrite [Bytecodes::number_of_codes]; +u_short Bytecodes::_flags [(1<<BitsPerByte)*2]; Bytecodes::Code Bytecodes::code_at(methodOop method, int bci) { @@ -91,6 +88,7 @@ return (len > 0 && len == (int)len) ? len : -1; } } + // Note: Length functions must return <=0 for invalid bytecodes. return 0; } @@ -124,15 +122,22 @@ void Bytecodes::def(Code code, const char* name, const char* format, const char* wide_format, BasicType result_type, int depth, bool can_trap, Code java_code) { assert(wide_format == NULL || format != NULL, "short form must exist if there's a wide form"); + int len = (format != NULL ? (int) strlen(format) : 0); + int wlen = (wide_format != NULL ? (int) strlen(wide_format) : 0); _name [code] = name; - _format [code] = format; - _wide_format [code] = wide_format; _result_type [code] = result_type; _depth [code] = depth; - _can_trap [code] = can_trap; - _length [code] = format != NULL ? (u_char)strlen(format) : 0; + _lengths [code] = (wlen << 4) | (len & 0xF); _java_code [code] = java_code; - if (java_code != code) _can_rewrite[java_code] = true; + int bc_flags = 0; + if (can_trap) bc_flags |= _bc_can_trap; + if (java_code != code) bc_flags |= _bc_can_rewrite; + _flags[(u1)code+0*(1<<BitsPerByte)] = compute_flags(format, bc_flags); + _flags[(u1)code+1*(1<<BitsPerByte)] = compute_flags(wide_format, bc_flags); + assert(is_defined(code) == (format != NULL), ""); + assert(wide_is_defined(code) == (wide_format != NULL), ""); + assert(length_for(code) == len, ""); + assert(wide_length_for(code) == wlen, ""); } @@ -140,23 +145,92 @@ // // b: bytecode // c: signed constant, Java byte-ordering -// i: unsigned index , Java byte-ordering -// j: unsigned index , native byte-ordering -// o: branch offset , Java byte-ordering +// i: unsigned local index, Java byte-ordering (I = native byte ordering) +// j: unsigned CP cache index, Java byte-ordering (J = native byte ordering) +// k: unsigned CP index, Java byte-ordering +// o: branch offset, Java byte-ordering // _: unused/ignored // w: wide bytecode // -// Note: Right now the format strings are used for 2 purposes: +// Note: The format strings are used for 2 purposes: // 1. to specify the length of the bytecode // (= number of characters in format string) -// 2. to specify the bytecode attributes -// -// The bytecode attributes are currently used only for bytecode tracing -// (see BytecodeTracer); thus if more specific format information is -// used, one would also have to adjust the bytecode tracer. +// 2. to derive bytecode format flags (_fmt_has_k, etc.) // // Note: For bytecodes with variable length, the format string is the empty string. +int Bytecodes::compute_flags(const char* format, int more_flags) { + if (format == NULL) return 0; // not even more_flags + int flags = more_flags; + const char* fp = format; + switch (*fp) { + case '\0': + flags |= _fmt_not_simple; // but variable + break; + case 'b': + flags |= _fmt_not_variable; // but simple + ++fp; // skip 'b' + break; + case 'w': + flags |= _fmt_not_variable | _fmt_not_simple; + ++fp; // skip 'w' + guarantee(*fp == 'b', "wide format must start with 'wb'"); + ++fp; // skip 'b' + break; + } + + int has_nbo = 0, has_jbo = 0, has_size = 0; + for (;;) { + int this_flag = 0; + char fc = *fp++; + switch (fc) { + case '\0': // end of string + assert(flags == (jchar)flags, "change _format_flags"); + return flags; + + case '_': continue; // ignore these + + case 'j': this_flag = _fmt_has_j; has_jbo = 1; break; + case 'k': this_flag = _fmt_has_k; has_jbo = 1; break; + case 'i': this_flag = _fmt_has_i; has_jbo = 1; break; + case 'c': this_flag = _fmt_has_c; has_jbo = 1; break; + case 'o': this_flag = _fmt_has_o; has_jbo = 1; break; + + // uppercase versions mark native byte order (from Rewriter) + // actually, only the 'J' case happens currently + case 'J': this_flag = _fmt_has_j; has_nbo = 1; break; + case 'K': this_flag = _fmt_has_k; has_nbo = 1; break; + case 'I': this_flag = _fmt_has_i; has_nbo = 1; break; + case 'C': this_flag = _fmt_has_c; has_nbo = 1; break; + case 'O': this_flag = _fmt_has_o; has_nbo = 1; break; + default: guarantee(false, "bad char in format"); + } + + flags |= this_flag; + + guarantee(!(has_jbo && has_nbo), "mixed byte orders in format"); + if (has_nbo) + flags |= _fmt_has_nbo; + + int this_size = 1; + if (*fp == fc) { + // advance beyond run of the same characters + this_size = 2; + while (*++fp == fc) this_size++; + switch (this_size) { + case 2: flags |= _fmt_has_u2; break; + case 4: flags |= _fmt_has_u4; break; + default: guarantee(false, "bad rep count in format"); + } + } + guarantee(has_size == 0 || // no field yet + this_size == has_size || // same size + this_size < has_size && *fp == '\0', // last field can be short + "mixed field sizes in format"); + has_size = this_size; + } +} + void Bytecodes::initialize() { if (_is_initialized) return; assert(number_of_codes <= 256, "too many bytecodes"); @@ -191,9 +265,9 @@ def(_dconst_1 , "dconst_1" , "b" , NULL , T_DOUBLE , 2, false); def(_bipush , "bipush" , "bc" , NULL , T_INT , 1, false); def(_sipush , "sipush" , "bcc" , NULL , T_INT , 1, false); - def(_ldc , "ldc" , "bi" , NULL , T_ILLEGAL, 1, true ); - def(_ldc_w , "ldc_w" , "bii" , NULL , T_ILLEGAL, 1, true ); - def(_ldc2_w , "ldc2_w" , "bii" , NULL , T_ILLEGAL, 2, true ); + def(_ldc , "ldc" , "bk" , NULL , T_ILLEGAL, 1, true ); + def(_ldc_w , "ldc_w" , "bkk" , NULL , T_ILLEGAL, 1, true ); + def(_ldc2_w , "ldc2_w" , "bkk" , NULL , T_ILLEGAL, 2, true ); def(_iload , "iload" , "bi" , "wbii" , T_INT , 1, false); def(_lload , "lload" , "bi" , "wbii" , T_LONG , 2, false); def(_fload , "fload" , "bi" , "wbii" , T_FLOAT , 1, false); @@ -351,26 +425,26 @@ def(_dreturn , "dreturn" , "b" , NULL , T_DOUBLE , -2, true); def(_areturn , "areturn" , "b" , NULL , T_OBJECT , -1, true); def(_return , "return" , "b" , NULL , T_VOID , 0, true); - def(_getstatic , "getstatic" , "bjj" , NULL , T_ILLEGAL, 1, true ); - def(_putstatic , "putstatic" , "bjj" , NULL , T_ILLEGAL, -1, true ); - def(_getfield , "getfield" , "bjj" , NULL , T_ILLEGAL, 0, true ); - def(_putfield , "putfield" , "bjj" , NULL , T_ILLEGAL, -2, true ); - def(_invokevirtual , "invokevirtual" , "bjj" , NULL , T_ILLEGAL, -1, true); - def(_invokespecial , "invokespecial" , "bjj" , NULL , T_ILLEGAL, -1, true); - def(_invokestatic , "invokestatic" , "bjj" , NULL , T_ILLEGAL, 0, true); - def(_invokeinterface , "invokeinterface" , "bjj__", NULL , T_ILLEGAL, -1, true); - def(_invokedynamic , "invokedynamic" , "bjjjj", NULL , T_ILLEGAL, 0, true ); - def(_new , "new" , "bii" , NULL , T_OBJECT , 1, true ); + def(_getstatic , "getstatic" , "bJJ" , NULL , T_ILLEGAL, 1, true ); + def(_putstatic , "putstatic" , "bJJ" , NULL , T_ILLEGAL, -1, true ); + def(_getfield , "getfield" , "bJJ" , NULL , T_ILLEGAL, 0, true ); + def(_putfield , "putfield" , "bJJ" , NULL , T_ILLEGAL, -2, true ); + def(_invokevirtual , "invokevirtual" , "bJJ" , NULL , T_ILLEGAL, -1, true); + def(_invokespecial , "invokespecial" , "bJJ" , NULL , T_ILLEGAL, -1, true); + def(_invokestatic , "invokestatic" , "bJJ" , NULL , T_ILLEGAL, 0, true); + def(_invokeinterface , "invokeinterface" , "bJJ__", NULL , T_ILLEGAL, -1, true); + def(_invokedynamic , "invokedynamic" , "bJJJJ", NULL , T_ILLEGAL, 0, true ); + def(_new , "new" , "bkk" , NULL , T_OBJECT , 1, true ); def(_newarray , "newarray" , "bc" , NULL , T_OBJECT , 0, true ); - def(_anewarray , "anewarray" , "bii" , NULL , T_OBJECT , 0, true ); + def(_anewarray , "anewarray" , "bkk" , NULL , T_OBJECT , 0, true ); def(_arraylength , "arraylength" , "b" , NULL , T_VOID , 0, true ); def(_athrow , "athrow" , "b" , NULL , T_VOID , -1, true ); - def(_checkcast , "checkcast" , "bii" , NULL , T_OBJECT , 0, true ); - def(_instanceof , "instanceof" , "bii" , NULL , T_INT , 0, true ); + def(_checkcast , "checkcast" , "bkk" , NULL , T_OBJECT , 0, true ); + def(_instanceof , "instanceof" , "bkk" , NULL , T_INT , 0, true ); def(_monitorenter , "monitorenter" , "b" , NULL , T_VOID , -1, true ); def(_monitorexit , "monitorexit" , "b" , NULL , T_VOID , -1, true ); def(_wide , "wide" , "" , NULL , T_VOID , 0, false); - def(_multianewarray , "multianewarray" , "biic" , NULL , T_OBJECT , 1, true ); + def(_multianewarray , "multianewarray" , "bkkc" , NULL , T_OBJECT , 1, true ); def(_ifnull , "ifnull" , "boo" , NULL , T_VOID , -1, false); def(_ifnonnull , "ifnonnull" , "boo" , NULL , T_VOID , -1, false); def(_goto_w , "goto_w" , "boooo", NULL , T_VOID , 0, false); @@ -380,35 +454,35 @@ // JVM bytecodes // bytecode bytecode name format wide f. result tp stk traps std code - def(_fast_agetfield , "fast_agetfield" , "bjj" , NULL , T_OBJECT , 0, true , _getfield ); - def(_fast_bgetfield , "fast_bgetfield" , "bjj" , NULL , T_INT , 0, true , _getfield ); - def(_fast_cgetfield , "fast_cgetfield" , "bjj" , NULL , T_CHAR , 0, true , _getfield ); - def(_fast_dgetfield , "fast_dgetfield" , "bjj" , NULL , T_DOUBLE , 0, true , _getfield ); - def(_fast_fgetfield , "fast_fgetfield" , "bjj" , NULL , T_FLOAT , 0, true , _getfield ); - def(_fast_igetfield , "fast_igetfield" , "bjj" , NULL , T_INT , 0, true , _getfield ); - def(_fast_lgetfield , "fast_lgetfield" , "bjj" , NULL , T_LONG , 0, true , _getfield ); - def(_fast_sgetfield , "fast_sgetfield" , "bjj" , NULL , T_SHORT , 0, true , _getfield ); + def(_fast_agetfield , "fast_agetfield" , "bJJ" , NULL , T_OBJECT , 0, true , _getfield ); + def(_fast_bgetfield , "fast_bgetfield" , "bJJ" , NULL , T_INT , 0, true , _getfield ); + def(_fast_cgetfield , "fast_cgetfield" , "bJJ" , NULL , T_CHAR , 0, true , _getfield ); + def(_fast_dgetfield , "fast_dgetfield" , "bJJ" , NULL , T_DOUBLE , 0, true , _getfield ); + def(_fast_fgetfield , "fast_fgetfield" , "bJJ" , NULL , T_FLOAT , 0, true , _getfield ); + def(_fast_igetfield , "fast_igetfield" , "bJJ" , NULL , T_INT , 0, true , _getfield ); + def(_fast_lgetfield , "fast_lgetfield" , "bJJ" , NULL , T_LONG , 0, true , _getfield ); + def(_fast_sgetfield , "fast_sgetfield" , "bJJ" , NULL , T_SHORT , 0, true , _getfield ); - def(_fast_aputfield , "fast_aputfield" , "bjj" , NULL , T_OBJECT , 0, true , _putfield ); - def(_fast_bputfield , "fast_bputfield" , "bjj" , NULL , T_INT , 0, true , _putfield ); - def(_fast_cputfield , "fast_cputfield" , "bjj" , NULL , T_CHAR , 0, true , _putfield ); - def(_fast_dputfield , "fast_dputfield" , "bjj" , NULL , T_DOUBLE , 0, true , _putfield ); - def(_fast_fputfield , "fast_fputfield" , "bjj" , NULL , T_FLOAT , 0, true , _putfield ); - def(_fast_iputfield , "fast_iputfield" , "bjj" , NULL , T_INT , 0, true , _putfield ); - def(_fast_lputfield , "fast_lputfield" , "bjj" , NULL , T_LONG , 0, true , _putfield ); - def(_fast_sputfield , "fast_sputfield" , "bjj" , NULL , T_SHORT , 0, true , _putfield ); + def(_fast_aputfield , "fast_aputfield" , "bJJ" , NULL , T_OBJECT , 0, true , _putfield ); + def(_fast_bputfield , "fast_bputfield" , "bJJ" , NULL , T_INT , 0, true , _putfield ); + def(_fast_cputfield , "fast_cputfield" , "bJJ" , NULL , T_CHAR , 0, true , _putfield ); + def(_fast_dputfield , "fast_dputfield" , "bJJ" , NULL , T_DOUBLE , 0, true , _putfield ); + def(_fast_fputfield , "fast_fputfield" , "bJJ" , NULL , T_FLOAT , 0, true , _putfield ); + def(_fast_iputfield , "fast_iputfield" , "bJJ" , NULL , T_INT , 0, true , _putfield ); + def(_fast_lputfield , "fast_lputfield" , "bJJ" , NULL , T_LONG , 0, true , _putfield ); + def(_fast_sputfield , "fast_sputfield" , "bJJ" , NULL , T_SHORT , 0, true , _putfield ); def(_fast_aload_0 , "fast_aload_0" , "b" , NULL , T_OBJECT , 1, true , _aload_0 ); - def(_fast_iaccess_0 , "fast_iaccess_0" , "b_jj" , NULL , T_INT , 1, true , _aload_0 ); - def(_fast_aaccess_0 , "fast_aaccess_0" , "b_jj" , NULL , T_OBJECT , 1, true , _aload_0 ); - def(_fast_faccess_0 , "fast_faccess_0" , "b_jj" , NULL , T_OBJECT , 1, true , _aload_0 ); + def(_fast_iaccess_0 , "fast_iaccess_0" , "b_JJ" , NULL , T_INT , 1, true , _aload_0 ); + def(_fast_aaccess_0 , "fast_aaccess_0" , "b_JJ" , NULL , T_OBJECT , 1, true , _aload_0 ); + def(_fast_faccess_0 , "fast_faccess_0" , "b_JJ" , NULL , T_OBJECT , 1, true , _aload_0 ); def(_fast_iload , "fast_iload" , "bi" , NULL , T_INT , 1, false, _iload); def(_fast_iload2 , "fast_iload2" , "bi_i" , NULL , T_INT , 2, false, _iload); def(_fast_icaload , "fast_icaload" , "bi_" , NULL , T_INT , 0, false, _iload); // Faster method invocation. - def(_fast_invokevfinal , "fast_invokevfinal" , "bjj" , NULL , T_ILLEGAL, -1, true, _invokevirtual ); + def(_fast_invokevfinal , "fast_invokevfinal" , "bJJ" , NULL , T_ILLEGAL, -1, true, _invokevirtual ); def(_fast_linearswitch , "fast_linearswitch" , "" , NULL , T_VOID , -1, false, _lookupswitch ); def(_fast_binaryswitch , "fast_binaryswitch" , "" , NULL , T_VOID , -1, false, _lookupswitch );
--- a/hotspot/src/share/vm/interpreter/bytecodes.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/bytecodes.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -280,17 +280,43 @@ number_of_codes }; + // Flag bits derived from format strings, can_trap, can_rewrite, etc.: + enum Flags { + // semantic flags: + _bc_can_trap = 1<<0, // bytecode execution can trap or block + _bc_can_rewrite = 1<<1, // bytecode execution has an alternate form + + // format bits (determined only by the format string): + _fmt_has_c = 1<<2, // constant, such as sipush "bcc" + _fmt_has_j = 1<<3, // constant pool cache index, such as getfield "bjj" + _fmt_has_k = 1<<4, // constant pool index, such as ldc "bk" + _fmt_has_i = 1<<5, // local index, such as iload + _fmt_has_o = 1<<6, // offset, such as ifeq + _fmt_has_nbo = 1<<7, // contains native-order field(s) + _fmt_has_u2 = 1<<8, // contains double-byte field(s) + _fmt_has_u4 = 1<<9, // contains quad-byte field + _fmt_not_variable = 1<<10, // not of variable length (simple or wide) + _fmt_not_simple = 1<<11, // either wide or variable length + _all_fmt_bits = (_fmt_not_simple*2 - _fmt_has_c), + + // Example derived format syndromes: + _fmt_b = _fmt_not_variable, + _fmt_bc = _fmt_b | _fmt_has_c, + _fmt_bi = _fmt_b | _fmt_has_i, + _fmt_bkk = _fmt_b | _fmt_has_k | _fmt_has_u2, + _fmt_bJJ = _fmt_b | _fmt_has_j | _fmt_has_u2 | _fmt_has_nbo, + _fmt_bo2 = _fmt_b | _fmt_has_o | _fmt_has_u2, + _fmt_bo4 = _fmt_b | _fmt_has_o | _fmt_has_u4 + }; + private: static bool _is_initialized; static const char* _name [number_of_codes]; - static const char* _format [number_of_codes]; - static const char* _wide_format [number_of_codes]; static BasicType _result_type [number_of_codes]; static s_char _depth [number_of_codes]; - static u_char _length [number_of_codes]; - static bool _can_trap [number_of_codes]; + static u_char _lengths [number_of_codes]; static Code _java_code [number_of_codes]; - static bool _can_rewrite [number_of_codes]; + static jchar _flags [(1<<BitsPerByte)*2]; // all second page for wide formats static void def(Code code, const char* name, const char* format, const char* wide_format, BasicType result_type, int depth, bool can_trap); static void def(Code code, const char* name, const char* format, const char* wide_format, BasicType result_type, int depth, bool can_trap, Code java_code); @@ -322,24 +348,20 @@ static Code non_breakpoint_code_at(address bcp, methodOop method = NULL); // Bytecode attributes - static bool is_defined (int code) { return 0 <= code && code < number_of_codes && _format[code] != NULL; } - static bool wide_is_defined(int code) { return is_defined(code) && _wide_format[code] != NULL; } + static bool is_defined (int code) { return 0 <= code && code < number_of_codes && flags(code, false) != 0; } + static bool wide_is_defined(int code) { return is_defined(code) && flags(code, true) != 0; } static const char* name (Code code) { check(code); return _name [code]; } - static const char* format (Code code) { check(code); return _format [code]; } - static const char* wide_format (Code code) { return _wide_format[code]; } static BasicType result_type (Code code) { check(code); return _result_type [code]; } static int depth (Code code) { check(code); return _depth [code]; } - static int length_for (Code code) { return _length[code]; } - static bool can_trap (Code code) { check(code); return _can_trap [code]; } + // Note: Length functions must return <=0 for invalid bytecodes. + // Calling check(code) in length functions would throw an unwanted assert. + static int length_for (Code code) { /*no check*/ return _lengths [code] & 0xF; } + static int wide_length_for(Code code) { /*no check*/ return _lengths [code] >> 4; } + static bool can_trap (Code code) { check(code); return has_all_flags(code, _bc_can_trap, false); } static Code java_code (Code code) { check(code); return _java_code [code]; } - static bool can_rewrite (Code code) { check(code); return _can_rewrite [code]; } - static int wide_length_for(Code code) { - if (!is_defined(code)) { - return 0; - } - const char* wf = wide_format(code); - return (wf == NULL) ? 0 : (int)strlen(wf); - } + static bool can_rewrite (Code code) { check(code); return has_all_flags(code, _bc_can_rewrite, false); } + static bool native_byte_order(Code code) { check(code); return has_all_flags(code, _fmt_has_nbo, false); } + static bool uses_cp_cache (Code code) { check(code); return has_all_flags(code, _fmt_has_j, false); } // if 'end' is provided, it indicates the end of the code buffer which // should not be read past when parsing. static int special_length_at(address bcp, address end = NULL); @@ -355,6 +377,16 @@ static bool is_zero_const (Code code) { return (code == _aconst_null || code == _iconst_0 || code == _fconst_0 || code == _dconst_0); } + static int compute_flags (const char* format, int more_flags = 0); // compute the flags + static int flags (int code, bool is_wide) { + assert(code == (u_char)code, "must be a byte"); + return _flags[code + (is_wide ? (1<<BitsPerByte) : 0)]; + } + static int format_bits (Code code, bool is_wide) { return flags(code, is_wide) & _all_fmt_bits; } + static bool has_all_flags (Code code, int test_flags, bool is_wide) { + return (flags(code, is_wide) & test_flags) == test_flags; + } + // Initialization static void initialize (); };
--- a/hotspot/src/share/vm/interpreter/interpreter.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/interpreter.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -226,8 +226,9 @@ // not yet been executed (in Java semantics, not in actual operation). bool AbstractInterpreter::is_not_reached(methodHandle method, int bci) { address bcp = method->bcp_from(bci); + Bytecodes::Code code = Bytecodes::code_at(bcp, method()); - if (!Bytecode_at(bcp)->must_rewrite()) { + if (!Bytecode_at(bcp)->must_rewrite(code)) { // might have been reached return false; }
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -63,7 +63,7 @@ IRT_ENTRY(void, InterpreterRuntime::ldc(JavaThread* thread, bool wide)) // access constant pool constantPoolOop pool = method(thread)->constants(); - int index = wide ? two_byte_index(thread) : one_byte_index(thread); + int index = wide ? get_index_u2(thread, Bytecodes::_ldc_w) : get_index_u1(thread, Bytecodes::_ldc); constantTag tag = pool->tag_at(index); if (tag.is_unresolved_klass() || tag.is_klass()) { @@ -135,7 +135,7 @@ IRT_ENTRY(void, InterpreterRuntime::multianewarray(JavaThread* thread, jint* first_size_address)) // We may want to pass in more arguments - could make this slightly faster constantPoolOop constants = method(thread)->constants(); - int i = two_byte_index(thread); + int i = get_index_u2(thread, Bytecodes::_multianewarray); klassOop klass = constants->klass_at(i, CHECK); int nof_dims = number_of_dimensions(thread); assert(oop(klass)->is_klass(), "not a class"); @@ -169,7 +169,7 @@ // Quicken instance-of and check-cast bytecodes IRT_ENTRY(void, InterpreterRuntime::quicken_io_cc(JavaThread* thread)) // Force resolving; quicken the bytecode - int which = two_byte_index(thread); + int which = get_index_u2(thread, Bytecodes::_checkcast); constantPoolOop cpool = method(thread)->constants(); // We'd expect to assert that we're only here to quicken bytecodes, but in a multithreaded // program we might have seen an unquick'd bytecode in the interpreter but have another @@ -463,7 +463,7 @@ { JvmtiHideSingleStepping jhss(thread); - LinkResolver::resolve_field(info, pool, two_byte_index(thread), + LinkResolver::resolve_field(info, pool, get_index_u2_cpcache(thread, bytecode), bytecode, false, CHECK); } // end JvmtiHideSingleStepping @@ -634,7 +634,7 @@ { JvmtiHideSingleStepping jhss(thread); LinkResolver::resolve_invoke(info, receiver, pool, - two_byte_index(thread), bytecode, CHECK); + get_index_u2_cpcache(thread, bytecode), bytecode, CHECK); if (JvmtiExport::can_hotswap_or_post_breakpoint()) { int retry_count = 0; while (info.resolved_method()->is_old()) { @@ -645,7 +645,7 @@ "Could not resolve to latest version of redefined method"); // method is redefined in the middle of resolve so re-try. LinkResolver::resolve_invoke(info, receiver, pool, - two_byte_index(thread), bytecode, CHECK); + get_index_u2_cpcache(thread, bytecode), bytecode, CHECK); } } } // end JvmtiHideSingleStepping @@ -704,7 +704,7 @@ caller_bci = caller_method->bci_from(caller_bcp); site_index = Bytes::get_native_u4(caller_bcp+1); } - assert(site_index == four_byte_index(thread), ""); + assert(site_index == InterpreterRuntime::bytecode(thread)->get_index_u4(bytecode), ""); assert(constantPoolCacheOopDesc::is_secondary_index(site_index), "proper format"); // there is a second CPC entries that is of interest; it caches signature info: int main_index = pool->cache()->secondary_entry_at(site_index)->main_entry_index();
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -40,9 +40,13 @@ return Bytecodes::code_at(bcp(thread), method(thread)); } static bool already_resolved(JavaThread *thread) { return cache_entry(thread)->is_resolved(code(thread)); } - static int one_byte_index(JavaThread *thread) { return bcp(thread)[1]; } - static int two_byte_index(JavaThread *thread) { return Bytes::get_Java_u2(bcp(thread) + 1); } - static int four_byte_index(JavaThread *thread) { return Bytes::get_native_u4(bcp(thread) + 1); } + static Bytecode* bytecode(JavaThread *thread) { return Bytecode_at(bcp(thread)); } + static int get_index_u1(JavaThread *thread, Bytecodes::Code bc) + { return bytecode(thread)->get_index_u1(bc); } + static int get_index_u2(JavaThread *thread, Bytecodes::Code bc) + { return bytecode(thread)->get_index_u2(bc); } + static int get_index_u2_cpcache(JavaThread *thread, Bytecodes::Code bc) + { return bytecode(thread)->get_index_u2_cpcache(bc); } static int number_of_dimensions(JavaThread *thread) { return bcp(thread)[3]; } static ConstantPoolCacheEntry* cache_entry_at(JavaThread *thread, int i) { return method(thread)->constants()->cache()->entry_at(i); }
--- a/hotspot/src/share/vm/interpreter/rewriter.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/rewriter.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -103,16 +103,15 @@ // Rewrite a classfile-order CP index into a native-order CPC index. -int Rewriter::rewrite_member_reference(address bcp, int offset) { +void Rewriter::rewrite_member_reference(address bcp, int offset) { address p = bcp + offset; int cp_index = Bytes::get_Java_u2(p); int cache_index = cp_entry_to_cp_cache(cp_index); Bytes::put_native_u2(p, cache_index); - return cp_index; } -void Rewriter::rewrite_invokedynamic(address bcp, int offset, int delete_me) { +void Rewriter::rewrite_invokedynamic(address bcp, int offset) { address p = bcp + offset; assert(p[-1] == Bytecodes::_invokedynamic, ""); int cp_index = Bytes::get_Java_u2(p); @@ -178,7 +177,7 @@ case Bytecodes::_lookupswitch : { #ifndef CC_INTERP Bytecode_lookupswitch* bc = Bytecode_lookupswitch_at(bcp); - bc->set_code( + (*bcp) = ( bc->number_of_pairs() < BinarySwitchThreshold ? Bytecodes::_fast_linearswitch : Bytecodes::_fast_binaryswitch @@ -197,7 +196,7 @@ rewrite_member_reference(bcp, prefix_length+1); break; case Bytecodes::_invokedynamic: - rewrite_invokedynamic(bcp, prefix_length+1, int(sizeof"@@@@DELETE ME")); + rewrite_invokedynamic(bcp, prefix_length+1); break; case Bytecodes::_jsr : // fall through case Bytecodes::_jsr_w : nof_jsrs++; break; @@ -308,5 +307,19 @@ // Set up method entry points for compiler and interpreter. m->link_method(m, CHECK); + +#ifdef ASSERT + if (StressMethodComparator) { + static int nmc = 0; + for (int j = i; j >= 0 && j >= i-4; j--) { + if ((++nmc % 1000) == 0) tty->print_cr("Have run MethodComparator %d times...", nmc); + bool z = MethodComparator::methods_EMCP(m(), (methodOop)_methods->obj_at(j)); + if (j == i && !z) { + tty->print("MethodComparator FAIL: "); m->print(); m->print_codes(); + assert(z, "method must compare equal to itself"); + } + } + } +#endif //ASSERT } }
--- a/hotspot/src/share/vm/interpreter/rewriter.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/rewriter.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -64,8 +64,8 @@ void scan_method(methodOop m); methodHandle rewrite_jsrs(methodHandle m, TRAPS); void rewrite_Object_init(methodHandle m, TRAPS); - int rewrite_member_reference(address bcp, int offset); - void rewrite_invokedynamic(address bcp, int offset, int cp_index); + void rewrite_member_reference(address bcp, int offset); + void rewrite_invokedynamic(address bcp, int offset); public: // Driver routine:
--- a/hotspot/src/share/vm/interpreter/templateTable.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/templateTable.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -434,15 +434,15 @@ def(Bytecodes::_dreturn , ____|disp|clvm|____, dtos, dtos, _return , dtos ); def(Bytecodes::_areturn , ____|disp|clvm|____, atos, atos, _return , atos ); def(Bytecodes::_return , ____|disp|clvm|____, vtos, vtos, _return , vtos ); - def(Bytecodes::_getstatic , ubcp|____|clvm|____, vtos, vtos, getstatic , 1 ); - def(Bytecodes::_putstatic , ubcp|____|clvm|____, vtos, vtos, putstatic , 2 ); - def(Bytecodes::_getfield , ubcp|____|clvm|____, vtos, vtos, getfield , 1 ); - def(Bytecodes::_putfield , ubcp|____|clvm|____, vtos, vtos, putfield , 2 ); - def(Bytecodes::_invokevirtual , ubcp|disp|clvm|____, vtos, vtos, invokevirtual , 2 ); - def(Bytecodes::_invokespecial , ubcp|disp|clvm|____, vtos, vtos, invokespecial , 1 ); - def(Bytecodes::_invokestatic , ubcp|disp|clvm|____, vtos, vtos, invokestatic , 1 ); - def(Bytecodes::_invokeinterface , ubcp|disp|clvm|____, vtos, vtos, invokeinterface , 1 ); - def(Bytecodes::_invokedynamic , ubcp|disp|clvm|____, vtos, vtos, invokedynamic , 1 ); + def(Bytecodes::_getstatic , ubcp|____|clvm|____, vtos, vtos, getstatic , f1_byte ); + def(Bytecodes::_putstatic , ubcp|____|clvm|____, vtos, vtos, putstatic , f2_byte ); + def(Bytecodes::_getfield , ubcp|____|clvm|____, vtos, vtos, getfield , f1_byte ); + def(Bytecodes::_putfield , ubcp|____|clvm|____, vtos, vtos, putfield , f2_byte ); + def(Bytecodes::_invokevirtual , ubcp|disp|clvm|____, vtos, vtos, invokevirtual , f2_byte ); + def(Bytecodes::_invokespecial , ubcp|disp|clvm|____, vtos, vtos, invokespecial , f1_byte ); + def(Bytecodes::_invokestatic , ubcp|disp|clvm|____, vtos, vtos, invokestatic , f1_byte ); + def(Bytecodes::_invokeinterface , ubcp|disp|clvm|____, vtos, vtos, invokeinterface , f1_byte ); + def(Bytecodes::_invokedynamic , ubcp|disp|clvm|____, vtos, vtos, invokedynamic , f1_oop ); def(Bytecodes::_new , ubcp|____|clvm|____, vtos, atos, _new , _ ); def(Bytecodes::_newarray , ubcp|____|clvm|____, itos, atos, newarray , _ ); def(Bytecodes::_anewarray , ubcp|____|clvm|____, itos, atos, anewarray , _ ); @@ -502,7 +502,7 @@ def(Bytecodes::_fast_iload2 , ubcp|____|____|____, vtos, itos, fast_iload2 , _ ); def(Bytecodes::_fast_icaload , ubcp|____|____|____, vtos, itos, fast_icaload , _ ); - def(Bytecodes::_fast_invokevfinal , ubcp|disp|clvm|____, vtos, vtos, fast_invokevfinal , 2 ); + def(Bytecodes::_fast_invokevfinal , ubcp|disp|clvm|____, vtos, vtos, fast_invokevfinal , f2_byte ); def(Bytecodes::_fast_linearswitch , ubcp|disp|____|____, itos, vtos, fast_linearswitch , _ ); def(Bytecodes::_fast_binaryswitch , ubcp|disp|____|____, itos, vtos, fast_binaryswitch , _ );
--- a/hotspot/src/share/vm/interpreter/templateTable.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/interpreter/templateTable.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -73,6 +73,7 @@ public: enum Operation { add, sub, mul, div, rem, _and, _or, _xor, shl, shr, ushr }; enum Condition { equal, not_equal, less, less_equal, greater, greater_equal }; + enum CacheByte { f1_byte = 1, f2_byte = 2, f1_oop = 0x11 }; // byte_no codes private: static bool _is_initialized; // true if TemplateTable has been initialized @@ -244,13 +245,18 @@ static void _return(TosState state); - static void resolve_cache_and_index(int byte_no, Register cache, Register index); + static void resolve_cache_and_index(int byte_no, // one of 1,2,11 + Register result , // either noreg or output for f1/f2 + Register cache, // output for CP cache + Register index, // output for CP index + size_t index_size); // one of 1,2,4 static void load_invoke_cp_cache_entry(int byte_no, Register method, Register itable_index, Register flags, - bool is_invokevirtual = false, - bool is_virtual_final = false); + bool is_invokevirtual, + bool is_virtual_final, + bool is_invokedynamic); static void load_field_cp_cache_entry(Register obj, Register cache, Register index,
--- a/hotspot/src/share/vm/memory/iterator.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/memory/iterator.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -58,8 +58,8 @@ } void MarkingCodeBlobClosure::do_code_blob(CodeBlob* cb) { - if (!cb->is_nmethod()) return; - nmethod* nm = (nmethod*) cb; + nmethod* nm = cb->as_nmethod_or_null(); + if (nm == NULL) return; if (!nm->test_set_oops_do_mark()) { NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, 1st visit\n")); do_newly_marked_nmethod(nm); @@ -74,11 +74,14 @@ void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) { if (!_do_marking) { - NOT_PRODUCT(if (TraceScavenge && Verbose && cb->is_nmethod()) ((nmethod*)cb)->print_on(tty, "oops_do, unmarked visit\n")); + nmethod* nm = cb->as_nmethod_or_null(); + NOT_PRODUCT(if (TraceScavenge && Verbose && nm != NULL) nm->print_on(tty, "oops_do, unmarked visit\n")); // This assert won't work, since there are lots of mini-passes // (mostly in debug mode) that co-exist with marking phases. //assert(!(cb->is_nmethod() && ((nmethod*)cb)->test_oops_do_mark()), "found marked nmethod during mark-free phase"); - cb->oops_do(_cl); + if (nm != NULL) { + nm->oops_do(_cl); + } } else { MarkingCodeBlobClosure::do_code_blob(cb); }
--- a/hotspot/src/share/vm/memory/space.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/memory/space.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -861,9 +861,9 @@ } size = align_object_size(size); - const size_t min_int_array_size = typeArrayOopDesc::header_size(T_INT); - if (size >= min_int_array_size) { - size_t length = (size - min_int_array_size) * (HeapWordSize / sizeof(jint)); + const size_t array_header_size = typeArrayOopDesc::header_size(T_INT); + if (size >= (size_t)align_object_size(array_header_size)) { + size_t length = (size - array_header_size) * (HeapWordSize / sizeof(jint)); // allocate uninitialized int array typeArrayOop t = (typeArrayOop) allocate(size); assert(t != NULL, "allocation should succeed"); @@ -871,7 +871,7 @@ t->set_klass(Universe::intArrayKlassObj()); t->set_length((int)length); } else { - assert((int) size == instanceOopDesc::header_size(), + assert(size == CollectedHeap::min_fill_size(), "size for smallest fake object doesn't match"); instanceOop obj = (instanceOop) allocate(size); obj->set_mark(markOopDesc::prototype());
--- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ // Skip mangling the space corresponding to the object header to // ensure that the returned space is not considered parsable by // any concurrent GC thread. - size_t hdr_size = CollectedHeap::min_fill_size(); + size_t hdr_size = oopDesc::header_size(); Copy::fill_to_words(obj + hdr_size, size - hdr_size, badHeapWordVal); #endif // ASSERT // This addition is safe because we know that top is
--- a/hotspot/src/share/vm/memory/universe.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/memory/universe.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -748,7 +748,7 @@ // 4Gb static const uint64_t NarrowOopHeapMax = (uint64_t(max_juint) + 1); // 32Gb -static const uint64_t OopEncodingHeapMax = NarrowOopHeapMax << LogMinObjAlignmentInBytes; +// OopEncodingHeapMax == NarrowOopHeapMax << LogMinObjAlignmentInBytes; char* Universe::preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode) { size_t base = 0; @@ -1261,7 +1261,7 @@ // decide which low-order bits we require to be clear: size_t alignSize = MinObjAlignmentInBytes; - size_t min_object_size = oopDesc::header_size(); + size_t min_object_size = CollectedHeap::min_fill_size(); // make an inclusive limit: uintptr_t max = (uintptr_t)high_boundary - min_object_size*wordSize;
--- a/hotspot/src/share/vm/oops/arrayOop.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/arrayOop.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -92,7 +92,7 @@ static int header_size(BasicType type) { size_t typesize_in_bytes = header_size_in_bytes(); return (int)(Universe::element_type_should_be_aligned(type) - ? align_object_size(typesize_in_bytes/HeapWordSize) + ? align_object_offset(typesize_in_bytes/HeapWordSize) : typesize_in_bytes/HeapWordSize); }
--- a/hotspot/src/share/vm/oops/constantPoolKlass.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/constantPoolKlass.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -310,15 +310,12 @@ Klass::oop_print_on(obj, st); constantPoolOop cp = constantPoolOop(obj); if (cp->flags() != 0) { - st->print(" - flags : 0x%x", cp->flags()); + st->print(" - flags: 0x%x", cp->flags()); if (cp->has_pseudo_string()) st->print(" has_pseudo_string"); if (cp->has_invokedynamic()) st->print(" has_invokedynamic"); st->cr(); } - - // Temp. remove cache so we can do lookups with original indicies. - constantPoolCacheHandle cache (THREAD, cp->cache()); - cp->set_cache(NULL); + st->print_cr(" - cache: " INTPTR_FORMAT, cp->cache()); for (int index = 1; index < cp->length(); index++) { // Index 0 is unused st->print(" - %3d : ", index); @@ -334,8 +331,8 @@ case JVM_CONSTANT_Fieldref : case JVM_CONSTANT_Methodref : case JVM_CONSTANT_InterfaceMethodref : - st->print("klass_index=%d", cp->klass_ref_index_at(index)); - st->print(" name_and_type_index=%d", cp->name_and_type_ref_index_at(index)); + st->print("klass_index=%d", cp->uncached_klass_ref_index_at(index)); + st->print(" name_and_type_index=%d", cp->uncached_name_and_type_ref_index_at(index)); break; case JVM_CONSTANT_UnresolvedString : case JVM_CONSTANT_String : @@ -382,9 +379,6 @@ st->cr(); } st->cr(); - - // Restore cache - cp->set_cache(cache()); } #endif @@ -398,6 +392,9 @@ cp->print_address_on(st); st->print(" for "); cp->pool_holder()->print_value_on(st); + if (cp->cache() != NULL) { + st->print(" cache=" PTR_FORMAT, cp->cache()); + } } const char* constantPoolKlass::internal_name() const {
--- a/hotspot/src/share/vm/oops/constantPoolOop.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/constantPoolOop.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -297,11 +297,9 @@ int constantPoolOopDesc::remap_instruction_operand_from_cache(int operand) { - // Operand was fetched by a stream using get_Java_u2, yet was stored - // by Rewriter::rewrite_member_reference in native order. - // So now we have to fix the damage by swapping back to native order. - assert((int)(u2)operand == operand, "clean u2"); - int cpc_index = Bytes::swap_u2(operand); + int cpc_index = operand; + DEBUG_ONLY(cpc_index -= CPCACHE_INDEX_TAG); + assert((int)(u2)cpc_index == cpc_index, "clean u2"); int member_index = cache()->entry_at(cpc_index)->constant_pool_index(); return member_index; }
--- a/hotspot/src/share/vm/oops/constantPoolOop.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/constantPoolOop.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -434,6 +434,10 @@ // Debugging const char* printable_name_at(int which) PRODUCT_RETURN0; +#ifdef ASSERT + enum { CPCACHE_INDEX_TAG = 0x10000 }; // helps keep CP cache indices distinct from CP indices +#endif //ASSERT + private: symbolOop impl_name_ref_at(int which, bool uncached); @@ -441,7 +445,7 @@ int impl_klass_ref_index_at(int which, bool uncached); int impl_name_and_type_ref_index_at(int which, bool uncached); - int remap_instruction_operand_from_cache(int operand); + int remap_instruction_operand_from_cache(int operand); // operand must be biased by CPCACHE_INDEX_TAG // Used while constructing constant pool (only by ClassFileParser) jint klass_index_at(int which) {
--- a/hotspot/src/share/vm/oops/generateOopMap.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/generateOopMap.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -1254,7 +1254,7 @@ case Bytecodes::_invokestatic: case Bytecodes::_invokedynamic: case Bytecodes::_invokeinterface: - int idx = currentBC->get_index_int(); + int idx = currentBC->has_index_u4() ? currentBC->get_index_u4() : currentBC->get_index_u2(); constantPoolOop cp = method()->constants(); int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx); int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx); @@ -1286,7 +1286,7 @@ case Bytecodes::_invokestatic: case Bytecodes::_invokedynamic: case Bytecodes::_invokeinterface: - int idx = currentBC->get_index_int(); + int idx = currentBC->has_index_u4() ? currentBC->get_index_u4() : currentBC->get_index_u2(); constantPoolOop cp = method()->constants(); int nameAndTypeIdx = cp->name_and_type_ref_index_at(idx); int signatureIdx = cp->signature_ref_index_at(nameAndTypeIdx); @@ -1356,8 +1356,8 @@ case Bytecodes::_ldc2_w: ppush(vvCTS); break; - case Bytecodes::_ldc: do_ldc(itr->get_index(), itr->bci()); break; - case Bytecodes::_ldc_w: do_ldc(itr->get_index_big(), itr->bci());break; + case Bytecodes::_ldc: do_ldc(itr->get_index(), itr->bci()); break; + case Bytecodes::_ldc_w: do_ldc(itr->get_index_u2(), itr->bci()); break; case Bytecodes::_iload: case Bytecodes::_fload: ppload(vCTS, itr->get_index()); break; @@ -1550,17 +1550,17 @@ case Bytecodes::_jsr_w: do_jsr(itr->dest_w()); break; case Bytecodes::_getstatic: do_field(true, true, - itr->get_index_big(), + itr->get_index_u2_cpcache(), itr->bci()); break; - case Bytecodes::_putstatic: do_field(false, true, itr->get_index_big(), itr->bci()); break; - case Bytecodes::_getfield: do_field(true, false, itr->get_index_big(), itr->bci()); break; - case Bytecodes::_putfield: do_field(false, false, itr->get_index_big(), itr->bci()); break; + case Bytecodes::_putstatic: do_field(false, true, itr->get_index_u2_cpcache(), itr->bci()); break; + case Bytecodes::_getfield: do_field(true, false, itr->get_index_u2_cpcache(), itr->bci()); break; + case Bytecodes::_putfield: do_field(false, false, itr->get_index_u2_cpcache(), itr->bci()); break; case Bytecodes::_invokevirtual: - case Bytecodes::_invokespecial: do_method(false, false, itr->get_index_big(), itr->bci()); break; - case Bytecodes::_invokestatic: do_method(true, false, itr->get_index_big(), itr->bci()); break; - case Bytecodes::_invokedynamic: do_method(true, false, itr->get_index_int(), itr->bci()); break; - case Bytecodes::_invokeinterface: do_method(false, true, itr->get_index_big(), itr->bci()); break; + case Bytecodes::_invokespecial: do_method(false, false, itr->get_index_u2_cpcache(), itr->bci()); break; + case Bytecodes::_invokestatic: do_method(true, false, itr->get_index_u2_cpcache(), itr->bci()); break; + case Bytecodes::_invokedynamic: do_method(true, false, itr->get_index_u4(), itr->bci()); break; + case Bytecodes::_invokeinterface: do_method(false, true, itr->get_index_u2_cpcache(), itr->bci()); break; case Bytecodes::_newarray: case Bytecodes::_anewarray: pp_new_ref(vCTS, itr->bci()); break; case Bytecodes::_checkcast: do_checkcast(); break;
--- a/hotspot/src/share/vm/oops/methodKlass.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/methodKlass.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -237,7 +237,7 @@ Klass::oop_print_on(obj, st); methodOop m = methodOop(obj); // get the effect of PrintOopAddress, always, for methods: - st->print (" - this oop: "INTPTR_FORMAT, (intptr_t)m); + st->print_cr(" - this oop: "INTPTR_FORMAT, (intptr_t)m); st->print (" - method holder: "); m->method_holder()->print_value_on(st); st->cr(); st->print (" - constants: "INTPTR_FORMAT" ", (address)m->constants()); m->constants()->print_value_on(st); st->cr();
--- a/hotspot/src/share/vm/oops/oop.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/oop.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -149,10 +149,6 @@ // Need this as public for garbage collection. template <class T> T* obj_field_addr(int offset) const; - // Oop encoding heap max - static const uint64_t OopEncodingHeapMax = - (uint64_t(max_juint) + 1) << LogMinObjAlignmentInBytes; - static bool is_null(oop obj); static bool is_null(narrowOop obj);
--- a/hotspot/src/share/vm/oops/oop.inline.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/oops/oop.inline.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -146,8 +146,13 @@ // offset from the heap base. Saving the check for null can save instructions // in inner GC loops so these are separated. +inline bool check_obj_alignment(oop obj) { + return (intptr_t)obj % MinObjAlignmentInBytes == 0; +} + inline narrowOop oopDesc::encode_heap_oop_not_null(oop v) { assert(!is_null(v), "oop value can never be zero"); + assert(check_obj_alignment(v), "Address not aligned"); assert(Universe::heap()->is_in_reserved(v), "Address not in heap"); address base = Universe::narrow_oop_base(); int shift = Universe::narrow_oop_shift(); @@ -167,7 +172,9 @@ assert(!is_null(v), "narrow oop value can never be zero"); address base = Universe::narrow_oop_base(); int shift = Universe::narrow_oop_shift(); - return (oop)(void*)((uintptr_t)base + ((uintptr_t)v << shift)); + oop result = (oop)(void*)((uintptr_t)base + ((uintptr_t)v << shift)); + assert(check_obj_alignment(result), "Address not aligned"); + return result; } inline oop oopDesc::decode_heap_oop(narrowOop v) { @@ -522,10 +529,6 @@ return mark()->has_bias_pattern(); } -inline bool check_obj_alignment(oop obj) { - return (intptr_t)obj % MinObjAlignmentInBytes == 0; -} - // used only for asserts inline bool oopDesc::is_oop(bool ignore_mark_word) const { @@ -600,6 +603,8 @@ // Used by scavengers inline void oopDesc::forward_to(oop p) { + assert(check_obj_alignment(p), + "forwarding to something not aligned"); assert(Universe::heap()->is_in_reserved(p), "forwarding to something not in heap"); markOop m = markOopDesc::encode_pointer_as_mark(p); @@ -609,6 +614,8 @@ // Used by parallel scavengers inline bool oopDesc::cas_forward_to(oop p, markOop compare) { + assert(check_obj_alignment(p), + "forwarding to something not aligned"); assert(Universe::heap()->is_in_reserved(p), "forwarding to something not in heap"); markOop m = markOopDesc::encode_pointer_as_mark(p);
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -188,8 +188,8 @@ return NULL; } - // Always inline MethodHandle methods. - if (callee_method->is_method_handle_invoke()) + // Always inline MethodHandle methods and generated MethodHandle adapters. + if (callee_method->is_method_handle_invoke() || callee_method->is_method_handle_adapter()) return NULL; // First check all inlining restrictions which are required for correctness @@ -340,7 +340,7 @@ Bytecodes::Code call_bc = iter.cur_bc(); // An invokedynamic instruction does not have a klass. if (call_bc != Bytecodes::_invokedynamic) { - int index = iter.get_index_int(); + int index = iter.get_index_u2_cpcache(); if (!caller_method->is_klass_loaded(index, true)) { return false; }
--- a/hotspot/src/share/vm/opto/compile.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/compile.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -2176,14 +2176,14 @@ #ifdef _LP64 case Op_CastPP: - if (n->in(1)->is_DecodeN() && Universe::narrow_oop_use_implicit_null_checks()) { + if (n->in(1)->is_DecodeN() && Matcher::gen_narrow_oop_implicit_null_checks()) { Compile* C = Compile::current(); Node* in1 = n->in(1); const Type* t = n->bottom_type(); Node* new_in1 = in1->clone(); new_in1->as_DecodeN()->set_type(t); - if (!Matcher::clone_shift_expressions) { + if (!Matcher::narrow_oop_use_complex_address()) { // // x86, ARM and friends can handle 2 adds in addressing mode // and Matcher can fold a DecodeN node into address by using @@ -2231,8 +2231,12 @@ new_in2 = in2->in(1); } else if (in2->Opcode() == Op_ConP) { const Type* t = in2->bottom_type(); - if (t == TypePtr::NULL_PTR && Universe::narrow_oop_use_implicit_null_checks()) { - new_in2 = ConNode::make(C, TypeNarrowOop::NULL_PTR); + if (t == TypePtr::NULL_PTR) { + // Don't convert CmpP null check into CmpN if compressed + // oops implicit null check is not generated. + // This will allow to generate normal oop implicit null check. + if (Matcher::gen_narrow_oop_implicit_null_checks()) + new_in2 = ConNode::make(C, TypeNarrowOop::NULL_PTR); // // This transformation together with CastPP transformation above // will generated code for implicit NULL checks for compressed oops. @@ -2289,9 +2293,9 @@ case Op_DecodeN: assert(!n->in(1)->is_EncodeP(), "should be optimized out"); - // DecodeN could be pinned on Sparc where it can't be fold into + // DecodeN could be pinned when it can't be fold into // an address expression, see the code for Op_CastPP above. - assert(n->in(0) == NULL || !Matcher::clone_shift_expressions, "no control except on sparc"); + assert(n->in(0) == NULL || !Matcher::narrow_oop_use_complex_address(), "no control"); break; case Op_EncodeP: { @@ -2496,6 +2500,10 @@ } } + // Skip next transformation if compressed oops are not used. + if (!UseCompressedOops || !Matcher::gen_narrow_oop_implicit_null_checks()) + return; + // Go over safepoints nodes to skip DecodeN nodes for debug edges. // It could be done for an uncommon traps or any safepoints/calls // if the DecodeN node is referenced only in a debug info.
--- a/hotspot/src/share/vm/opto/connode.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/connode.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -437,7 +437,7 @@ // If not converting int->oop, throw away cast after constant propagation Node *CastPPNode::Ideal_DU_postCCP( PhaseCCP *ccp ) { const Type *t = ccp->type(in(1)); - if (!t->isa_oop_ptr() || (in(1)->is_DecodeN() && Universe::narrow_oop_use_implicit_null_checks())) { + if (!t->isa_oop_ptr() || (in(1)->is_DecodeN() && Matcher::gen_narrow_oop_implicit_null_checks())) { return NULL; // do not transform raw pointers or narrow oops } return ConstraintCastNode::Ideal_DU_postCCP(ccp);
--- a/hotspot/src/share/vm/opto/graphKit.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/graphKit.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -3487,7 +3487,6 @@ Node* tls = __ thread(); // ThreadLocalStorage - Node* no_ctrl = NULL; Node* no_base = __ top(); float likely = PROB_LIKELY(0.999); float unlikely = PROB_UNLIKELY(0.999); @@ -3511,10 +3510,10 @@ Node* index_adr = __ AddP(no_base, tls, __ ConX(index_offset)); // Now some values - - Node* index = __ load(no_ctrl, index_adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw); - Node* buffer = __ load(no_ctrl, buffer_adr, TypeRawPtr::NOTNULL, T_ADDRESS, Compile::AliasIdxRaw); - + // Use ctrl to avoid hoisting these values past a safepoint, which could + // potentially reset these fields in the JavaThread. + Node* index = __ load(__ ctrl(), index_adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw); + Node* buffer = __ load(__ ctrl(), buffer_adr, TypeRawPtr::NOTNULL, T_ADDRESS, Compile::AliasIdxRaw); // Convert the store obj pointer to an int prior to doing math on it // Must use ctrl to prevent "integerized oop" existing across safepoint
--- a/hotspot/src/share/vm/opto/lcm.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/lcm.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -32,7 +32,8 @@ // with suitable memory ops nearby. Use the memory op to do the NULL check. // I can generate a memory op if there is not one nearby. // The proj is the control projection for the not-null case. -// The val is the pointer being checked for nullness. +// The val is the pointer being checked for nullness or +// decodeHeapOop_not_null node if it did not fold into address. void Block::implicit_null_check(PhaseCFG *cfg, Node *proj, Node *val, int allowed_reasons) { // Assume if null check need for 0 offset then always needed // Intel solaris doesn't support any null checks yet and no @@ -96,6 +97,13 @@ } } + // Check for decodeHeapOop_not_null node which did not fold into address + bool is_decoden = ((intptr_t)val) & 1; + val = (Node*)(((intptr_t)val) & ~1); + + assert(!is_decoden || (val->in(0) == NULL) && val->is_Mach() && + (val->as_Mach()->ideal_Opcode() == Op_DecodeN), "sanity"); + // Search the successor block for a load or store who's base value is also // the tested value. There may be several. Node_List *out = new Node_List(Thread::current()->resource_area()); @@ -148,7 +156,8 @@ if( !mach->needs_anti_dependence_check() ) continue; // Not an memory op; skip it { - // Check that value is used in memory address. + // Check that value is used in memory address in + // instructions with embedded load (CmpP val1,(val2+off)). Node* base; Node* index; const MachOper* oper = mach->memory_inputs(base, index); @@ -213,7 +222,11 @@ uint vidx = 0; // Capture index of value into memop uint j; for( j = mach->req()-1; j > 0; j-- ) { - if( mach->in(j) == val ) vidx = j; + if( mach->in(j) == val ) { + vidx = j; + // Ignore DecodeN val which could be hoisted to where needed. + if( is_decoden ) continue; + } // Block of memory-op input Block *inb = cfg->_bbs[mach->in(j)->_idx]; Block *b = this; // Start from nul check @@ -270,6 +283,26 @@ extern int implicit_null_checks; implicit_null_checks++; + if( is_decoden ) { + // Check if we need to hoist decodeHeapOop_not_null first. + Block *valb = cfg->_bbs[val->_idx]; + if( this != valb && this->_dom_depth < valb->_dom_depth ) { + // Hoist it up to the end of the test block. + valb->find_remove(val); + this->add_inst(val); + cfg->_bbs.map(val->_idx,this); + // DecodeN on x86 may kill flags. Check for flag-killing projections + // that also need to be hoisted. + for (DUIterator_Fast jmax, j = val->fast_outs(jmax); j < jmax; j++) { + Node* n = val->fast_out(j); + if( n->Opcode() == Op_MachProj ) { + cfg->_bbs[n->_idx]->find_remove(n); + this->add_inst(n); + cfg->_bbs.map(n->_idx,this); + } + } + } + } // Hoist the memory candidate up to the end of the test block. Block *old_block = cfg->_bbs[best->_idx]; old_block->find_remove(best);
--- a/hotspot/src/share/vm/opto/matcher.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/matcher.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1334,7 +1334,7 @@ if( j == max_scan ) // No post-domination before scan end? return true; // Then break the match tree up } - if (m->is_DecodeN() && Matcher::clone_shift_expressions) { + if (m->is_DecodeN() && Matcher::narrow_oop_use_complex_address()) { // These are commonly used in address expressions and can // efficiently fold into them on X64 in some cases. return false; @@ -2110,8 +2110,8 @@ _null_check_tests.push(proj); Node* val = cmp->in(1); #ifdef _LP64 - if (UseCompressedOops && !Matcher::clone_shift_expressions && - val->bottom_type()->isa_narrowoop()) { + if (val->bottom_type()->isa_narrowoop() && + !Matcher::narrow_oop_use_complex_address()) { // // Look for DecodeN node which should be pinned to orig_proj. // On platforms (Sparc) which can not handle 2 adds @@ -2127,6 +2127,9 @@ if (d->is_DecodeN() && d->in(1) == val) { val = d; val->set_req(0, NULL); // Unpin now. + // Mark this as special case to distinguish from + // a regular case: CmpP(DecodeN, NULL). + val = (Node*)(((intptr_t)val) | 1); break; } } @@ -2146,9 +2149,21 @@ for( uint i=0; i < cnt; i+=2 ) { Node *test = _null_check_tests[i]; Node *val = _null_check_tests[i+1]; + bool is_decoden = ((intptr_t)val) & 1; + val = (Node*)(((intptr_t)val) & ~1); if (has_new_node(val)) { + Node* new_val = new_node(val); + if (is_decoden) { + assert(val->is_DecodeN() && val->in(0) == NULL, "sanity"); + // Note: new_val may have a control edge if + // the original ideal node DecodeN was matched before + // it was unpinned in Matcher::collect_null_checks(). + // Unpin the mach node and mark it. + new_val->set_req(0, NULL); + new_val = (Node*)(((intptr_t)new_val) | 1); + } // Is a match-tree root, so replace with the matched value - _null_check_tests.map(i+1, new_node(val)); + _null_check_tests.map(i+1, new_val); } else { // Yank from candidate list _null_check_tests.map(i+1,_null_check_tests[--cnt]);
--- a/hotspot/src/share/vm/opto/matcher.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/matcher.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -352,6 +352,38 @@ // registers? True for Intel but false for most RISCs static const bool clone_shift_expressions; + static bool narrow_oop_use_complex_address(); + + // Generate implicit null check for narrow oops if it can fold + // into address expression (x64). + // + // [R12 + narrow_oop_reg<<3 + offset] // fold into address expression + // NullCheck narrow_oop_reg + // + // When narrow oops can't fold into address expression (Sparc) and + // base is not null use decode_not_null and normal implicit null check. + // Note, decode_not_null node can be used here since it is referenced + // only on non null path but it requires special handling, see + // collect_null_checks(): + // + // decode_not_null narrow_oop_reg, oop_reg // 'shift' and 'add base' + // [oop_reg + offset] + // NullCheck oop_reg + // + // With Zero base and when narrow oops can not fold into address + // expression use normal implicit null check since only shift + // is needed to decode narrow oop. + // + // decode narrow_oop_reg, oop_reg // only 'shift' + // [oop_reg + offset] + // NullCheck oop_reg + // + inline static bool gen_narrow_oop_implicit_null_checks() { + return Universe::narrow_oop_use_implicit_null_checks() && + (narrow_oop_use_complex_address() || + Universe::narrow_oop_base() != NULL); + } + // Is it better to copy float constants, or load them directly from memory? // Intel can load a float constant from a direct address, requiring no // extra registers. Most RISCs will have to materialize an address into a
--- a/hotspot/src/share/vm/opto/parse2.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/parse2.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1317,8 +1317,8 @@ case Bytecodes::_iconst_3: push(intcon( 3)); break; case Bytecodes::_iconst_4: push(intcon( 4)); break; case Bytecodes::_iconst_5: push(intcon( 5)); break; - case Bytecodes::_bipush: push(intcon( iter().get_byte())); break; - case Bytecodes::_sipush: push(intcon( iter().get_short())); break; + case Bytecodes::_bipush: push(intcon(iter().get_constant_u1())); break; + case Bytecodes::_sipush: push(intcon(iter().get_constant_u2())); break; case Bytecodes::_aconst_null: push(null()); break; case Bytecodes::_ldc: case Bytecodes::_ldc_w:
--- a/hotspot/src/share/vm/opto/superword.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/opto/superword.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -514,6 +514,13 @@ bool SuperWord::are_adjacent_refs(Node* s1, Node* s2) { if (!s1->is_Mem() || !s2->is_Mem()) return false; if (!in_bb(s1) || !in_bb(s2)) return false; + + // Do not use superword for non-primitives + if (!is_java_primitive(s1->as_Mem()->memory_type()) || + !is_java_primitive(s2->as_Mem()->memory_type())) { + return false; + } + // FIXME - co_locate_pack fails on Stores in different mem-slices, so // only pack memops that are in the same alias set until that's fixed. if (_phase->C->get_alias_index(s1->as_Mem()->adr_type()) !=
--- a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -638,7 +638,7 @@ // length of bytecode (mnemonic + operands) address bcp = bs.bcp(); - int len = bs.next_bcp() - bcp; + int len = bs.instruction_size(); assert(len > 0, "length must be > 0"); // copy the bytecodes
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -726,6 +726,32 @@ GrowableArray<const void *>* JvmtiExport::_pending_compiled_method_unload_code_begins; JavaThread* JvmtiExport::_current_poster; +void JvmtiExport::post_compiled_method_unload_internal(JavaThread* self, jmethodID method, const void *code_begin) { + EVT_TRIG_TRACE(JVMTI_EVENT_COMPILED_METHOD_UNLOAD, + ("JVMTI [%s] method compile unload event triggered", + JvmtiTrace::safe_get_thread_name(self))); + + // post the event for each environment that has this event enabled. + JvmtiEnvIterator it; + for (JvmtiEnv* env = it.first(); env != NULL; env = it.next(env)) { + if (env->is_enabled(JVMTI_EVENT_COMPILED_METHOD_UNLOAD)) { + + EVT_TRACE(JVMTI_EVENT_COMPILED_METHOD_UNLOAD, + ("JVMTI [%s] class compile method unload event sent jmethodID " PTR_FORMAT, + JvmtiTrace::safe_get_thread_name(self), method)); + + ResourceMark rm(self); + + JvmtiEventMark jem(self); + JvmtiJavaThreadEventTransition jet(self); + jvmtiEventCompiledMethodUnload callback = env->callbacks()->CompiledMethodUnload; + if (callback != NULL) { + (*callback)(env->jvmti_external(), method, code_begin); + } + } + } +} + // post any pending CompiledMethodUnload events void JvmtiExport::post_pending_compiled_method_unload_events() { @@ -788,26 +814,7 @@ // flag, cleanup _current_poster to indicate that no thread is now servicing the // pending events list, and finally notify any thread that might be waiting. for (;;) { - EVT_TRIG_TRACE(JVMTI_EVENT_COMPILED_METHOD_UNLOAD, - ("JVMTI [%s] method compile unload event triggered", - JvmtiTrace::safe_get_thread_name(self))); - - // post the event for each environment that has this event enabled. - JvmtiEnvIterator it; - for (JvmtiEnv* env = it.first(); env != NULL; env = it.next(env)) { - if (env->is_enabled(JVMTI_EVENT_COMPILED_METHOD_UNLOAD)) { - EVT_TRACE(JVMTI_EVENT_COMPILED_METHOD_UNLOAD, - ("JVMTI [%s] class compile method unload event sent jmethodID " PTR_FORMAT, - JvmtiTrace::safe_get_thread_name(self), method)); - - JvmtiEventMark jem(self); - JvmtiJavaThreadEventTransition jet(self); - jvmtiEventCompiledMethodUnload callback = env->callbacks()->CompiledMethodUnload; - if (callback != NULL) { - (*callback)(env->jvmti_external(), method, code_begin); - } - } - } + post_compiled_method_unload_internal(self, method, code_begin); // event posted, now re-grab monitor and get the next event // If there's no next event then we are done. If this is the first @@ -1864,17 +1871,25 @@ } // used at a safepoint to post a CompiledMethodUnload event -void JvmtiExport::post_compiled_method_unload_at_safepoint(jmethodID mid, const void *code_begin) { - assert(SafepointSynchronize::is_at_safepoint(), "must be executed at a safepoint"); - - // create list lazily - if (_pending_compiled_method_unload_method_ids == NULL) { - _pending_compiled_method_unload_method_ids = new (ResourceObj::C_HEAP) GrowableArray<jmethodID>(10,true); - _pending_compiled_method_unload_code_begins = new (ResourceObj::C_HEAP) GrowableArray<const void *>(10,true); +void JvmtiExport::post_compiled_method_unload(jmethodID mid, const void *code_begin) { + if (SafepointSynchronize::is_at_safepoint()) { + // Class unloading can cause nmethod unloading which is reported + // by the VMThread. These must be batched to be processed later. + if (_pending_compiled_method_unload_method_ids == NULL) { + // create list lazily + _pending_compiled_method_unload_method_ids = new (ResourceObj::C_HEAP) GrowableArray<jmethodID>(10,true); + _pending_compiled_method_unload_code_begins = new (ResourceObj::C_HEAP) GrowableArray<const void *>(10,true); + } + _pending_compiled_method_unload_method_ids->append(mid); + _pending_compiled_method_unload_code_begins->append(code_begin); + _have_pending_compiled_method_unload_events = true; + } else { + // Unloading caused by the sweeper can be reported synchronously. + if (have_pending_compiled_method_unload_events()) { + post_pending_compiled_method_unload_events(); + } + post_compiled_method_unload_internal(JavaThread::current(), mid, code_begin); } - _pending_compiled_method_unload_method_ids->append(mid); - _pending_compiled_method_unload_code_begins->append(code_begin); - _have_pending_compiled_method_unload_events = true; } void JvmtiExport::post_dynamic_code_generated_internal(const char *name, const void *code_begin, const void *code_end) {
--- a/hotspot/src/share/vm/prims/jvmtiExport.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/prims/jvmtiExport.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -144,6 +144,9 @@ // posts any pending CompiledMethodUnload events. static void post_pending_compiled_method_unload_events(); + // Perform the actual notification to interested JvmtiEnvs. + static void post_compiled_method_unload_internal(JavaThread* self, jmethodID mid, const void* code_begin); + // posts a DynamicCodeGenerated event (internal/private implementation). // The public post_dynamic_code_generated* functions make use of the // internal implementation. @@ -299,8 +302,8 @@ static void post_compiled_method_load(nmethod *nm) KERNEL_RETURN; static void post_dynamic_code_generated(const char *name, const void *code_begin, const void *code_end) KERNEL_RETURN; - // used at a safepoint to post a CompiledMethodUnload event - static void post_compiled_method_unload_at_safepoint(jmethodID mid, const void *code_begin) KERNEL_RETURN; + // used to post a CompiledMethodUnload event + static void post_compiled_method_unload(jmethodID mid, const void *code_begin) KERNEL_RETURN; // similiar to post_dynamic_code_generated except that it can be used to // post a DynamicCodeGenerated event while holding locks in the VM. Any event
--- a/hotspot/src/share/vm/prims/methodComparator.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/prims/methodComparator.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -130,8 +130,8 @@ case Bytecodes::_multianewarray : // fall through case Bytecodes::_checkcast : // fall through case Bytecodes::_instanceof : { - u2 cpi_old = _s_old->get_index_big(); - u2 cpi_new = _s_new->get_index_big(); + u2 cpi_old = _s_old->get_index_u2(); + u2 cpi_new = _s_new->get_index_u2(); if ((_old_cp->klass_at_noresolve(cpi_old) != _new_cp->klass_at_noresolve(cpi_new))) return false; if (c_old == Bytecodes::_multianewarray && @@ -147,9 +147,10 @@ case Bytecodes::_invokevirtual : // fall through case Bytecodes::_invokespecial : // fall through case Bytecodes::_invokestatic : // fall through + case Bytecodes::_invokedynamic : // fall through case Bytecodes::_invokeinterface : { - u2 cpci_old = _s_old->get_index_int(); - u2 cpci_new = _s_new->get_index_int(); + int cpci_old = _s_old->has_index_u4() ? _s_old->get_index_u4() : _s_old->get_index_u2_cpcache(); + int cpci_new = _s_new->has_index_u4() ? _s_new->get_index_u4() : _s_new->get_index_u2_cpcache(); // Check if the names of classes, field/method names and signatures at these indexes // are the same. Indices which are really into constantpool cache (rather than constant // pool itself) are accepted by the constantpool query routines below. @@ -162,14 +163,10 @@ case Bytecodes::_ldc : // fall through case Bytecodes::_ldc_w : { - u2 cpi_old, cpi_new; - if (c_old == Bytecodes::_ldc) { - cpi_old = _s_old->bcp()[1]; - cpi_new = _s_new->bcp()[1]; - } else { - cpi_old = _s_old->get_index_big(); - cpi_new = _s_new->get_index_big(); - } + Bytecode_loadconstant* ldc_old = Bytecode_loadconstant_at(_s_old->method()(), _s_old->bcp()); + Bytecode_loadconstant* ldc_new = Bytecode_loadconstant_at(_s_new->method()(), _s_new->bcp()); + int cpi_old = ldc_old->index(); + int cpi_new = ldc_new->index(); constantTag tag_old = _old_cp->tag_at(cpi_old); constantTag tag_new = _new_cp->tag_at(cpi_new); if (tag_old.is_int() || tag_old.is_float()) { @@ -179,7 +176,9 @@ if (_old_cp->int_at(cpi_old) != _new_cp->int_at(cpi_new)) return false; } else { - if (_old_cp->float_at(cpi_old) != _new_cp->float_at(cpi_new)) + // Use jint_cast to compare the bits rather than numerical values. + // This makes a difference for NaN constants. + if (jint_cast(_old_cp->float_at(cpi_old)) != jint_cast(_new_cp->float_at(cpi_new))) return false; } } else if (tag_old.is_string() || tag_old.is_unresolved_string()) { @@ -199,8 +198,8 @@ } case Bytecodes::_ldc2_w : { - u2 cpi_old = _s_old->get_index_big(); - u2 cpi_new = _s_new->get_index_big(); + u2 cpi_old = _s_old->get_index_u2(); + u2 cpi_new = _s_new->get_index_u2(); constantTag tag_old = _old_cp->tag_at(cpi_old); constantTag tag_new = _new_cp->tag_at(cpi_new); if (tag_old.value() != tag_new.value()) @@ -209,7 +208,9 @@ if (_old_cp->long_at(cpi_old) != _new_cp->long_at(cpi_new)) return false; } else { - if (_old_cp->double_at(cpi_old) != _new_cp->double_at(cpi_new)) + // Use jlong_cast to compare the bits rather than numerical values. + // This makes a difference for NaN constants. + if (jlong_cast(_old_cp->double_at(cpi_old)) != jlong_cast(_new_cp->double_at(cpi_new))) return false; } break; @@ -221,7 +222,7 @@ break; case Bytecodes::_sipush : - if (_s_old->get_index_big() != _s_new->get_index_big()) + if (_s_old->get_index_u2() != _s_new->get_index_u2()) return false; break; @@ -260,8 +261,8 @@ case Bytecodes::_ifnonnull : // fall through case Bytecodes::_ifnull : // fall through case Bytecodes::_jsr : { - short old_ofs = (short) _s_old->get_index_big(); - short new_ofs = (short) _s_new->get_index_big(); + int old_ofs = _s_old->bytecode()->get_offset_s2(c_old); + int new_ofs = _s_new->bytecode()->get_offset_s2(c_new); if (_switchable_test) { int old_dest = _s_old->bci() + old_ofs; int new_dest = _s_new->bci() + new_ofs; @@ -285,9 +286,11 @@ if (_s_old->is_wide() != _s_new->is_wide()) return false; if (! _s_old->is_wide()) { - if (_s_old->get_index_big() != _s_new->get_index_big()) + // We could use get_index_u1 and get_constant_u1, but it's simpler to grab both bytes at once: + if (Bytes::get_Java_u2(_s_old->bcp() + 1) != Bytes::get_Java_u2(_s_new->bcp() + 1)) return false; } else { + // We could use get_index_u2 and get_constant_u2, but it's simpler to grab all four bytes at once: if (Bytes::get_Java_u4(_s_old->bcp() + 1) != Bytes::get_Java_u4(_s_new->bcp() + 1)) return false; } @@ -295,8 +298,8 @@ case Bytecodes::_goto_w : // fall through case Bytecodes::_jsr_w : { - int old_ofs = (int) Bytes::get_Java_u4(_s_old->bcp() + 1); - int new_ofs = (int) Bytes::get_Java_u4(_s_new->bcp() + 1); + int old_ofs = _s_old->bytecode()->get_offset_s4(c_old); + int new_ofs = _s_new->bytecode()->get_offset_s4(c_new); if (_switchable_test) { int old_dest = _s_old->bci() + old_ofs; int new_dest = _s_new->bci() + new_ofs; @@ -357,8 +360,8 @@ } } } else { // !_switchable_test, can use fast rough compare - int len_old = _s_old->next_bcp() - _s_old->bcp(); - int len_new = _s_new->next_bcp() - _s_new->bcp(); + int len_old = _s_old->instruction_size(); + int len_new = _s_new->instruction_size(); if (len_old != len_new) return false; if (memcmp(_s_old->bcp(), _s_new->bcp(), len_old) != 0)
--- a/hotspot/src/share/vm/prims/methodHandleWalk.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/prims/methodHandleWalk.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -732,7 +732,7 @@ case Bytecodes::_dreturn: case Bytecodes::_areturn: case Bytecodes::_return: - assert(strcmp(Bytecodes::format(op), "b") == 0, "wrong bytecode format"); + assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_b, "wrong bytecode format"); _bytecode.push(op); break; @@ -748,7 +748,7 @@ case Bytecodes::_fstore: case Bytecodes::_dstore: case Bytecodes::_astore: - assert(strcmp(Bytecodes::format(op), "bi") == 0, "wrong bytecode format"); + assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_bi, "wrong bytecode format"); assert((char) index == index, "index does not fit in 8-bit"); _bytecode.push(op); _bytecode.push(index); @@ -757,18 +757,18 @@ // bii case Bytecodes::_ldc2_w: case Bytecodes::_checkcast: - assert(strcmp(Bytecodes::format(op), "bii") == 0, "wrong bytecode format"); + assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_bkk, "wrong bytecode format"); assert((short) index == index, "index does not fit in 16-bit"); _bytecode.push(op); _bytecode.push(index >> 8); _bytecode.push(index); break; - // bjj + // bJJ case Bytecodes::_invokestatic: case Bytecodes::_invokespecial: case Bytecodes::_invokevirtual: - assert(strcmp(Bytecodes::format(op), "bjj") == 0, "wrong bytecode format"); + assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_bJJ, "wrong bytecode format"); assert((short) index == index, "index does not fit in 16-bit"); _bytecode.push(op); _bytecode.push(index >> 8);
--- a/hotspot/src/share/vm/runtime/arguments.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/arguments.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1211,8 +1211,44 @@ } #endif // KERNEL +void set_object_alignment() { + // Object alignment. + assert(is_power_of_2(ObjectAlignmentInBytes), "ObjectAlignmentInBytes must be power of 2"); + MinObjAlignmentInBytes = ObjectAlignmentInBytes; + assert(MinObjAlignmentInBytes >= HeapWordsPerLong * HeapWordSize, "ObjectAlignmentInBytes value is too small"); + MinObjAlignment = MinObjAlignmentInBytes / HeapWordSize; + assert(MinObjAlignmentInBytes == MinObjAlignment * HeapWordSize, "ObjectAlignmentInBytes value is incorrect"); + MinObjAlignmentInBytesMask = MinObjAlignmentInBytes - 1; + + LogMinObjAlignmentInBytes = exact_log2(ObjectAlignmentInBytes); + LogMinObjAlignment = LogMinObjAlignmentInBytes - LogHeapWordSize; + + // Oop encoding heap max + OopEncodingHeapMax = (uint64_t(max_juint) + 1) << LogMinObjAlignmentInBytes; + +#ifndef KERNEL + // Set CMS global values + CompactibleFreeListSpace::set_cms_values(); +#endif // KERNEL +} + +bool verify_object_alignment() { + // Object alignment. + if (!is_power_of_2(ObjectAlignmentInBytes)) { + jio_fprintf(defaultStream::error_stream(), + "error: ObjectAlignmentInBytes=%d must be power of 2", (int)ObjectAlignmentInBytes); + return false; + } + if ((int)ObjectAlignmentInBytes < BytesPerLong) { + jio_fprintf(defaultStream::error_stream(), + "error: ObjectAlignmentInBytes=%d must be greater or equal %d", (int)ObjectAlignmentInBytes, BytesPerLong); + return false; + } + return true; +} + inline uintx max_heap_for_compressed_oops() { - LP64_ONLY(return oopDesc::OopEncodingHeapMax - MaxPermSize - os::vm_page_size()); + LP64_ONLY(return OopEncodingHeapMax - MaxPermSize - os::vm_page_size()); NOT_LP64(ShouldNotReachHere(); return 0); } @@ -1776,6 +1812,8 @@ status = status && verify_interval(TLABWasteTargetPercent, 1, 100, "TLABWasteTargetPercent"); + status = status && verify_object_alignment(); + return status; } @@ -2848,6 +2886,9 @@ UseCompressedOops = false; #endif + // Set object alignment values. + set_object_alignment(); + #ifdef SERIALGC force_serial_gc(); #endif // SERIALGC
--- a/hotspot/src/share/vm/runtime/globals.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/globals.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -321,6 +321,9 @@ diagnostic(bool, PrintCompressedOopsMode, false, \ "Print compressed oops base address and encoding mode") \ \ + lp64_product(intx, ObjectAlignmentInBytes, 8, \ + "Default object alignment in bytes, 8 is minimum") \ + \ /* UseMembar is theoretically a temp flag used for memory barrier \ * removal testing. It was supposed to be removed before FCS but has \ * been re-added (see 6401008) */ \ @@ -920,6 +923,10 @@ \ product(intx, AlwaysInflate, 0, "(Unstable) Force inflation") \ \ + product(intx, MonitorBound, 0, "Bound Monitor population") \ + \ + product(bool, MonitorInUseLists, false, "Track Monitors for Deflation") \ + \ product(intx, Atomics, 0, \ "(Unsafe,Unstable) Diagnostic - Controls emission of atomics") \ \ @@ -1117,6 +1124,9 @@ product(intx, TraceRedefineClasses, 0, \ "Trace level for JVMTI RedefineClasses") \ \ + develop(bool, StressMethodComparator, false, \ + "run the MethodComparator on all loaded methods") \ + \ /* change to false by default sometime after Mustang */ \ product(bool, VerifyMergedCPBytecodes, true, \ "Verify bytecodes after RedefineClasses constant pool merging") \
--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -82,9 +82,6 @@ Mutex* DerivedPointerTableGC_lock = NULL; Mutex* Compile_lock = NULL; Monitor* MethodCompileQueue_lock = NULL; -#ifdef TIERED -Monitor* C1_lock = NULL; -#endif // TIERED Monitor* CompileThread_lock = NULL; Mutex* CompileTaskAlloc_lock = NULL; Mutex* CompileStatistics_lock = NULL; @@ -255,11 +252,6 @@ def(Debug3_lock , Mutex , nonleaf+4, true ); def(ProfileVM_lock , Monitor, nonleaf+4, false); // used for profiling of the VMThread def(CompileThread_lock , Monitor, nonleaf+5, false ); -#ifdef TIERED - def(C1_lock , Monitor, nonleaf+5, false ); -#endif // TIERED - - } GCMutexLocker::GCMutexLocker(Monitor * mutex) {
--- a/hotspot/src/share/vm/runtime/mutexLocker.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -84,9 +84,6 @@ extern Mutex* EvacFailureStack_lock; // guards the evac failure scan stack extern Mutex* Compile_lock; // a lock held when Compilation is updating code (used to block CodeCache traversal, CHA updates, etc) extern Monitor* MethodCompileQueue_lock; // a lock held when method compilations are enqueued, dequeued -#ifdef TIERED -extern Monitor* C1_lock; // a lock to ensure on single c1 compile is ever active -#endif // TIERED extern Monitor* CompileThread_lock; // a lock held by compile threads during compilation system initialization extern Mutex* CompileTaskAlloc_lock; // a lock held when CompileTasks are allocated extern Mutex* CompileStatistics_lock; // a lock held when updating compilation statistics
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1435,7 +1435,7 @@ // for the rest of its life! Just another racing bug in the life of // fixup_callers_callsite ... // - RelocIterator iter(cb, call->instruction_address(), call->next_instruction_address()); + RelocIterator iter(nm, call->instruction_address(), call->next_instruction_address()); iter.next(); assert(iter.has_current(), "must have a reloc at java call site"); relocInfo::relocType typ = iter.reloc()->type(); @@ -2055,11 +2055,11 @@ void scan() { while (_index < _table->table_size()) { AdapterHandlerEntry* a = _table->bucket(_index); + _index++; if (a != NULL) { _current = a; return; } - _index++; } }
--- a/hotspot/src/share/vm/runtime/synchronizer.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/synchronizer.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -185,6 +185,8 @@ } ; static SharedGlobals GVars ; +static int MonitorScavengeThreshold = 1000000 ; +static volatile int ForceMonitorScavenge = 0 ; // Scavenge required and pending // Tunables ... @@ -746,8 +748,85 @@ ObjectMonitor * ObjectSynchronizer::gBlockList = NULL ; ObjectMonitor * volatile ObjectSynchronizer::gFreeList = NULL ; static volatile intptr_t ListLock = 0 ; // protects global monitor free-list cache +static volatile int MonitorFreeCount = 0 ; // # on gFreeList +static volatile int MonitorPopulation = 0 ; // # Extant -- in circulation #define CHAINMARKER ((oop)-1) +// Constraining monitor pool growth via MonitorBound ... +// +// The monitor pool is grow-only. We scavenge at STW safepoint-time, but the +// the rate of scavenging is driven primarily by GC. As such, we can find +// an inordinate number of monitors in circulation. +// To avoid that scenario we can artificially induce a STW safepoint +// if the pool appears to be growing past some reasonable bound. +// Generally we favor time in space-time tradeoffs, but as there's no +// natural back-pressure on the # of extant monitors we need to impose some +// type of limit. Beware that if MonitorBound is set to too low a value +// we could just loop. In addition, if MonitorBound is set to a low value +// we'll incur more safepoints, which are harmful to performance. +// See also: GuaranteedSafepointInterval +// +// As noted elsewhere, the correct long-term solution is to deflate at +// monitorexit-time, in which case the number of inflated objects is bounded +// by the number of threads. That policy obviates the need for scavenging at +// STW safepoint time. As an aside, scavenging can be time-consuming when the +// # of extant monitors is large. Unfortunately there's a day-1 assumption baked +// into much HotSpot code that the object::monitor relationship, once established +// or observed, will remain stable except over potential safepoints. +// +// We can use either a blocking synchronous VM operation or an async VM operation. +// -- If we use a blocking VM operation : +// Calls to ScavengeCheck() should be inserted only into 'safe' locations in paths +// that lead to ::inflate() or ::omAlloc(). +// Even though the safepoint will not directly induce GC, a GC might +// piggyback on the safepoint operation, so the caller should hold no naked oops. +// Furthermore, monitor::object relationships are NOT necessarily stable over this call +// unless the caller has made provisions to "pin" the object to the monitor, say +// by incrementing the monitor's _count field. +// -- If we use a non-blocking asynchronous VM operation : +// the constraints above don't apply. The safepoint will fire in the future +// at a more convenient time. On the other hand the latency between posting and +// running the safepoint introduces or admits "slop" or laxity during which the +// monitor population can climb further above the threshold. The monitor population, +// however, tends to converge asymptotically over time to a count that's slightly +// above the target value specified by MonitorBound. That is, we avoid unbounded +// growth, albeit with some imprecision. +// +// The current implementation uses asynchronous VM operations. +// +// Ideally we'd check if (MonitorPopulation > MonitorBound) in omAlloc() +// immediately before trying to grow the global list via allocation. +// If the predicate was true then we'd induce a synchronous safepoint, wait +// for the safepoint to complete, and then again to allocate from the global +// free list. This approach is much simpler and precise, admitting no "slop". +// Unfortunately we can't safely safepoint in the midst of omAlloc(), so +// instead we use asynchronous safepoints. + +static void InduceScavenge (Thread * Self, const char * Whence) { + // Induce STW safepoint to trim monitors + // Ultimately, this results in a call to deflate_idle_monitors() in the near future. + // More precisely, trigger an asynchronous STW safepoint as the number + // of active monitors passes the specified threshold. + // TODO: assert thread state is reasonable + + if (ForceMonitorScavenge == 0 && Atomic::xchg (1, &ForceMonitorScavenge) == 0) { + if (Knob_Verbose) { + ::printf ("Monitor scavenge - Induced STW @%s (%d)\n", Whence, ForceMonitorScavenge) ; + ::fflush(stdout) ; + } + // Induce a 'null' safepoint to scavenge monitors + // Must VM_Operation instance be heap allocated as the op will be enqueue and posted + // to the VMthread and have a lifespan longer than that of this activation record. + // The VMThread will delete the op when completed. + VMThread::execute (new VM_ForceAsyncSafepoint()) ; + + if (Knob_Verbose) { + ::printf ("Monitor scavenge - STW posted @%s (%d)\n", Whence, ForceMonitorScavenge) ; + ::fflush(stdout) ; + } + } +} + ObjectMonitor * ATTR ObjectSynchronizer::omAlloc (Thread * Self) { // A large MAXPRIVATE value reduces both list lock contention // and list coherency traffic, but also tends to increase the @@ -770,6 +849,11 @@ Self->omFreeCount -- ; // CONSIDER: set m->FreeNext = BAD -- diagnostic hygiene guarantee (m->object() == NULL, "invariant") ; + if (MonitorInUseLists) { + m->FreeNext = Self->omInUseList; + Self->omInUseList = m; + Self->omInUseCount ++; + } return m ; } @@ -784,6 +868,7 @@ // on various locks. Thread::muxAcquire (&ListLock, "omAlloc") ; for (int i = Self->omFreeProvision; --i >= 0 && gFreeList != NULL; ) { + MonitorFreeCount --; ObjectMonitor * take = gFreeList ; gFreeList = take->FreeNext ; guarantee (take->object() == NULL, "invariant") ; @@ -796,6 +881,15 @@ if (Self->omFreeProvision > MAXPRIVATE ) Self->omFreeProvision = MAXPRIVATE ; TEVENT (omFirst - reprovision) ; continue ; + + const int mx = MonitorBound ; + if (mx > 0 && (MonitorPopulation-MonitorFreeCount) > mx) { + // We can't safely induce a STW safepoint from omAlloc() as our thread + // state may not be appropriate for such activities and callers may hold + // naked oops, so instead we defer the action. + InduceScavenge (Self, "omAlloc") ; + } + continue; } // 3: allocate a block of new ObjectMonitors @@ -836,6 +930,8 @@ // Acquire the ListLock to manipulate BlockList and FreeList. // An Oyama-Taura-Yonezawa scheme might be more efficient. Thread::muxAcquire (&ListLock, "omAlloc [2]") ; + MonitorPopulation += _BLOCKSIZE-1; + MonitorFreeCount += _BLOCKSIZE-1; // Add the new block to the list of extant blocks (gBlockList). // The very first objectMonitor in a block is reserved and dedicated. @@ -894,7 +990,9 @@ if (List == NULL) return ; ObjectMonitor * Tail = NULL ; ObjectMonitor * s ; + int Tally = 0; for (s = List ; s != NULL ; s = s->FreeNext) { + Tally ++ ; Tail = s ; guarantee (s->object() == NULL, "invariant") ; guarantee (!s->is_busy(), "invariant") ; @@ -906,6 +1004,7 @@ Thread::muxAcquire (&ListLock, "omFlush") ; Tail->FreeNext = gFreeList ; gFreeList = List ; + MonitorFreeCount += Tally; Thread::muxRelease (&ListLock) ; TEVENT (omFlush) ; } @@ -1747,16 +1846,15 @@ // Having a large number of monitors in-circulation negatively // impacts the performance of some applications (e.g., PointBase). // Broadly, we want to minimize the # of monitors in circulation. -// Alternately, we could partition the active monitors into sub-lists -// of those that need scanning and those that do not. -// Specifically, we would add a new sub-list of objectmonitors -// that are in-circulation and potentially active. deflate_idle_monitors() -// would scan only that list. Other monitors could reside on a quiescent -// list. Such sequestered monitors wouldn't need to be scanned by -// deflate_idle_monitors(). omAlloc() would first check the global free list, -// then the quiescent list, and, failing those, would allocate a new block. -// Deflate_idle_monitors() would scavenge and move monitors to the -// quiescent list. +// +// We have added a flag, MonitorInUseLists, which creates a list +// of active monitors for each thread. deflate_idle_monitors() +// only scans the per-thread inuse lists. omAlloc() puts all +// assigned monitors on the per-thread list. deflate_idle_monitors() +// returns the non-busy monitors to the global free list. +// An alternative could have used a single global inuse list. The +// downside would have been the additional cost of acquiring the global list lock +// for every omAlloc(). // // Perversely, the heap size -- and thus the STW safepoint rate -- // typically drives the scavenge rate. Large heaps can mean infrequent GC, @@ -1769,18 +1867,100 @@ // An even better solution would be to deflate on-the-fly, aggressively, // at monitorexit-time as is done in EVM's metalock or Relaxed Locks. + +// Deflate a single monitor if not in use +// Return true if deflated, false if in use +bool ObjectSynchronizer::deflate_monitor(ObjectMonitor* mid, oop obj, + ObjectMonitor** FreeHeadp, ObjectMonitor** FreeTailp) { + bool deflated; + // Normal case ... The monitor is associated with obj. + guarantee (obj->mark() == markOopDesc::encode(mid), "invariant") ; + guarantee (mid == obj->mark()->monitor(), "invariant"); + guarantee (mid->header()->is_neutral(), "invariant"); + + if (mid->is_busy()) { + if (ClearResponsibleAtSTW) mid->_Responsible = NULL ; + deflated = false; + } else { + // Deflate the monitor if it is no longer being used + // It's idle - scavenge and return to the global free list + // plain old deflation ... + TEVENT (deflate_idle_monitors - scavenge1) ; + if (TraceMonitorInflation) { + if (obj->is_instance()) { + ResourceMark rm; + tty->print_cr("Deflating object " INTPTR_FORMAT " , mark " INTPTR_FORMAT " , type %s", + (intptr_t) obj, (intptr_t) obj->mark(), Klass::cast(obj->klass())->external_name()); + } + } + + // Restore the header back to obj + obj->release_set_mark(mid->header()); + mid->clear(); + + assert (mid->object() == NULL, "invariant") ; + + // Move the object to the working free list defined by FreeHead,FreeTail. + if (*FreeHeadp == NULL) *FreeHeadp = mid; + if (*FreeTailp != NULL) { + ObjectMonitor * prevtail = *FreeTailp; + prevtail->FreeNext = mid; + } + *FreeTailp = mid; + deflated = true; + } + return deflated; +} + void ObjectSynchronizer::deflate_idle_monitors() { assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); int nInuse = 0 ; // currently associated with objects int nInCirculation = 0 ; // extant int nScavenged = 0 ; // reclaimed + bool deflated = false; ObjectMonitor * FreeHead = NULL ; // Local SLL of scavenged monitors ObjectMonitor * FreeTail = NULL ; + TEVENT (deflate_idle_monitors) ; + // Prevent omFlush from changing mids in Thread dtor's during deflation + // And in case the vm thread is acquiring a lock during a safepoint + // See e.g. 6320749 + Thread::muxAcquire (&ListLock, "scavenge - return") ; + + if (MonitorInUseLists) { + ObjectMonitor* mid; + ObjectMonitor* next; + ObjectMonitor* curmidinuse; + for (JavaThread* cur = Threads::first(); cur != NULL; cur = cur->next()) { + curmidinuse = NULL; + for (mid = cur->omInUseList; mid != NULL; ) { + oop obj = (oop) mid->object(); + deflated = false; + if (obj != NULL) { + deflated = deflate_monitor(mid, obj, &FreeHead, &FreeTail); + } + if (deflated) { + // extract from per-thread in-use-list + if (mid == cur->omInUseList) { + cur->omInUseList = mid->FreeNext; + } else if (curmidinuse != NULL) { + curmidinuse->FreeNext = mid->FreeNext; // maintain the current thread inuselist + } + next = mid->FreeNext; + mid->FreeNext = NULL; // This mid is current tail in the FreeHead list + mid = next; + cur->omInUseCount--; + nScavenged ++ ; + } else { + curmidinuse = mid; + mid = mid->FreeNext; + nInuse ++; + } + } + } + } else for (ObjectMonitor* block = gBlockList; block != NULL; block = next(block)) { // Iterate over all extant monitors - Scavenge all idle monitors. - TEVENT (deflate_idle_monitors) ; - for (ObjectMonitor* block = gBlockList; block != NULL; block = next(block)) { assert(block->object() == CHAINMARKER, "must be a block header"); nInCirculation += _BLOCKSIZE ; for (int i = 1 ; i < _BLOCKSIZE; i++) { @@ -1795,61 +1975,39 @@ guarantee (!mid->is_busy(), "invariant") ; continue ; } - - // Normal case ... The monitor is associated with obj. - guarantee (obj->mark() == markOopDesc::encode(mid), "invariant") ; - guarantee (mid == obj->mark()->monitor(), "invariant"); - guarantee (mid->header()->is_neutral(), "invariant"); - - if (mid->is_busy()) { - if (ClearResponsibleAtSTW) mid->_Responsible = NULL ; - nInuse ++ ; + deflated = deflate_monitor(mid, obj, &FreeHead, &FreeTail); + + if (deflated) { + mid->FreeNext = NULL ; + nScavenged ++ ; } else { - // Deflate the monitor if it is no longer being used - // It's idle - scavenge and return to the global free list - // plain old deflation ... - TEVENT (deflate_idle_monitors - scavenge1) ; - if (TraceMonitorInflation) { - if (obj->is_instance()) { - ResourceMark rm; - tty->print_cr("Deflating object " INTPTR_FORMAT " , mark " INTPTR_FORMAT " , type %s", - (intptr_t) obj, (intptr_t) obj->mark(), Klass::cast(obj->klass())->external_name()); - } - } - - // Restore the header back to obj - obj->release_set_mark(mid->header()); - mid->clear(); - - assert (mid->object() == NULL, "invariant") ; - - // Move the object to the working free list defined by FreeHead,FreeTail. - mid->FreeNext = NULL ; - if (FreeHead == NULL) FreeHead = mid ; - if (FreeTail != NULL) FreeTail->FreeNext = mid ; - FreeTail = mid ; - nScavenged ++ ; + nInuse ++; } } } + MonitorFreeCount += nScavenged; + + // Consider: audit gFreeList to ensure that MonitorFreeCount and list agree. + + if (Knob_Verbose) { + ::printf ("Deflate: InCirc=%d InUse=%d Scavenged=%d ForceMonitorScavenge=%d : pop=%d free=%d\n", + nInCirculation, nInuse, nScavenged, ForceMonitorScavenge, + MonitorPopulation, MonitorFreeCount) ; + ::fflush(stdout) ; + } + + ForceMonitorScavenge = 0; // Reset + // Move the scavenged monitors back to the global free list. - // In theory we don't need the freelist lock as we're at a STW safepoint. - // omAlloc() and omFree() can only be called while a thread is _not in safepoint state. - // But it's remotely possible that omFlush() or release_monitors_owned_by_thread() - // might be called while not at a global STW safepoint. In the interest of - // safety we protect the following access with ListLock. - // An even more conservative and prudent approach would be to guard - // the main loop in scavenge_idle_monitors() with ListLock. if (FreeHead != NULL) { guarantee (FreeTail != NULL && nScavenged > 0, "invariant") ; assert (FreeTail->FreeNext == NULL, "invariant") ; // constant-time list splice - prepend scavenged segment to gFreeList - Thread::muxAcquire (&ListLock, "scavenge - return") ; FreeTail->FreeNext = gFreeList ; gFreeList = FreeHead ; - Thread::muxRelease (&ListLock) ; } + Thread::muxRelease (&ListLock) ; if (_sync_Deflations != NULL) _sync_Deflations->inc(nScavenged) ; if (_sync_MonExtant != NULL) _sync_MonExtant ->set_value(nInCirculation);
--- a/hotspot/src/share/vm/runtime/synchronizer.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/synchronizer.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -150,6 +150,8 @@ // Basically we deflate all monitors that are not busy. // An adaptive profile-based deflation policy could be used if needed static void deflate_idle_monitors(); + static bool deflate_monitor(ObjectMonitor* mid, oop obj, ObjectMonitor** FreeHeadp, + ObjectMonitor** FreeTailp); static void oops_do(OopClosure* f); // debugging
--- a/hotspot/src/share/vm/runtime/thread.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/thread.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -139,6 +139,8 @@ omFreeList = NULL ; omFreeCount = 0 ; omFreeProvision = 32 ; + omInUseList = NULL ; + omInUseCount = 0 ; _SR_lock = new Monitor(Mutex::suspend_resume, "SR_lock", true); _suspend_flags = 0; @@ -2797,6 +2799,7 @@ _task = NULL; _queue = queue; _counters = counters; + _buffer_blob = NULL; #ifndef PRODUCT _ideal_graph_printer = NULL;
--- a/hotspot/src/share/vm/runtime/thread.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/thread.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -225,6 +225,8 @@ ObjectMonitor * omFreeList ; int omFreeCount ; // length of omFreeList int omFreeProvision ; // reload chunk size + ObjectMonitor * omInUseList; // SLL to track monitors in circulation + int omInUseCount; // length of omInUseList public: enum { @@ -493,7 +495,6 @@ static ByteSize stack_base_offset() { return byte_offset_of(Thread, _stack_base ); } static ByteSize stack_size_offset() { return byte_offset_of(Thread, _stack_size ); } - static ByteSize omFreeList_offset() { return byte_offset_of(Thread, omFreeList); } #define TLAB_FIELD_OFFSET(name) \ static ByteSize tlab_##name##_offset() { return byte_offset_of(Thread, _tlab) + ThreadLocalAllocBuffer::name##_offset(); } @@ -1576,6 +1577,7 @@ CompileLog* _log; CompileTask* _task; CompileQueue* _queue; + BufferBlob* _buffer_blob; public: @@ -1594,6 +1596,9 @@ ciEnv* env() { return _env; } void set_env(ciEnv* env) { _env = env; } + BufferBlob* get_buffer_blob() { return _buffer_blob; } + void set_buffer_blob(BufferBlob* b) { _buffer_blob = b; }; + // Get/set the thread's logging information CompileLog* log() { return _log; } void init_log(CompileLog* log) {
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -607,8 +607,6 @@ nonstatic_field(CodeBlob, _instructions_offset, int) \ nonstatic_field(CodeBlob, _frame_complete_offset, int) \ nonstatic_field(CodeBlob, _data_offset, int) \ - nonstatic_field(CodeBlob, _oops_offset, int) \ - nonstatic_field(CodeBlob, _oops_length, int) \ nonstatic_field(CodeBlob, _frame_size, int) \ nonstatic_field(CodeBlob, _oop_maps, OopMapSet*) \ \ @@ -626,6 +624,8 @@ nonstatic_field(nmethod, _deoptimize_offset, int) \ nonstatic_field(nmethod, _orig_pc_offset, int) \ nonstatic_field(nmethod, _stub_offset, int) \ + nonstatic_field(nmethod, _consts_offset, int) \ + nonstatic_field(nmethod, _oops_offset, int) \ nonstatic_field(nmethod, _scopes_data_offset, int) \ nonstatic_field(nmethod, _scopes_pcs_offset, int) \ nonstatic_field(nmethod, _dependencies_offset, int) \ @@ -1328,14 +1328,6 @@ declare_constant(LogBytesPerWord) \ declare_constant(BytesPerLong) \ \ - /********************/ \ - /* Object alignment */ \ - /********************/ \ - \ - declare_constant(MinObjAlignment) \ - declare_constant(MinObjAlignmentInBytes) \ - declare_constant(LogMinObjAlignmentInBytes) \ - \ /********************************************/ \ /* Generation and Space Hierarchy Constants */ \ /********************************************/ \
--- a/hotspot/src/share/vm/utilities/copy.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/utilities/copy.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -51,7 +51,7 @@ class Copy : AllStatic { public: // Block copy methods have four attributes. We don't define all possibilities. - // alignment: aligned according to minimum Java object alignment (MinObjAlignment) + // alignment: aligned to BytesPerLong // arrayof: arraycopy operation with both operands aligned on the same // boundary as the first element of an array of the copy unit. // This is currently a HeapWord boundary on all platforms, except @@ -70,7 +70,7 @@ // [ '_atomic' ] // // Except in the arrayof case, whatever the alignment is, we assume we can copy - // whole alignment units. E.g., if MinObjAlignment is 2x word alignment, an odd + // whole alignment units. E.g., if BytesPerLong is 2x word alignment, an odd // count may copy an extra word. In the arrayof case, we are allowed to copy // only the number of copy units specified. @@ -305,17 +305,17 @@ } static void assert_params_aligned(HeapWord* from, HeapWord* to) { #ifdef ASSERT - if (mask_bits((uintptr_t)from, MinObjAlignmentInBytes-1) != 0) - basic_fatal("not object aligned"); - if (mask_bits((uintptr_t)to, MinObjAlignmentInBytes-1) != 0) - basic_fatal("not object aligned"); + if (mask_bits((uintptr_t)from, BytesPerLong-1) != 0) + basic_fatal("not long aligned"); + if (mask_bits((uintptr_t)to, BytesPerLong-1) != 0) + basic_fatal("not long aligned"); #endif } static void assert_params_aligned(HeapWord* to) { #ifdef ASSERT - if (mask_bits((uintptr_t)to, MinObjAlignmentInBytes-1) != 0) - basic_fatal("not object aligned"); + if (mask_bits((uintptr_t)to, BytesPerLong-1) != 0) + basic_fatal("not long aligned"); #endif }
--- a/hotspot/src/share/vm/utilities/globalDefinitions.cpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/utilities/globalDefinitions.cpp Thu Jul 08 11:28:01 2010 -0700 @@ -34,6 +34,18 @@ int BytesPerHeapOop = 0; int BitsPerHeapOop = 0; +// Object alignment, in units of HeapWords. +// Defaults are -1 so things will break badly if incorrectly initialized. +int MinObjAlignment = -1; +int MinObjAlignmentInBytes = -1; +int MinObjAlignmentInBytesMask = 0; + +int LogMinObjAlignment = -1; +int LogMinObjAlignmentInBytes = -1; + +// Oop encoding heap max +uint64_t OopEncodingHeapMax = 0; + void basic_fatal(const char* msg) { fatal(msg); }
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Thu Jul 08 11:28:01 2010 -0700 @@ -73,6 +73,9 @@ extern int BytesPerHeapOop; extern int BitsPerHeapOop; +// Oop encoding heap max +extern uint64_t OopEncodingHeapMax; + const int BitsPerJavaInteger = 32; const int BitsPerJavaLong = 64; const int BitsPerSize_t = size_tSize * BitsPerByte; @@ -292,12 +295,12 @@ // Minimum is max(BytesPerLong, BytesPerDouble, BytesPerOop) / HeapWordSize, so jlong, jdouble and // reference fields can be naturally aligned. -const int MinObjAlignment = HeapWordsPerLong; -const int MinObjAlignmentInBytes = MinObjAlignment * HeapWordSize; -const int MinObjAlignmentInBytesMask = MinObjAlignmentInBytes - 1; +extern int MinObjAlignment; +extern int MinObjAlignmentInBytes; +extern int MinObjAlignmentInBytesMask; -const int LogMinObjAlignment = LogHeapWordsPerLong; -const int LogMinObjAlignmentInBytes = LogMinObjAlignment + LogHeapWordSize; +extern int LogMinObjAlignment; +extern int LogMinObjAlignmentInBytes; // Machine dependent stuff @@ -332,18 +335,16 @@ return align_size_up(size, MinObjAlignment); } -// Pad out certain offsets to jlong alignment, in HeapWord units. +inline bool is_object_aligned(intptr_t addr) { + return addr == align_object_size(addr); +} -#define align_object_offset_(offset) align_size_up_(offset, HeapWordsPerLong) +// Pad out certain offsets to jlong alignment, in HeapWord units. inline intptr_t align_object_offset(intptr_t offset) { return align_size_up(offset, HeapWordsPerLong); } -inline bool is_object_aligned(intptr_t offset) { - return offset == align_object_offset(offset); -} - //---------------------------------------------------------------------------------------------------- // Utility macros for compilers
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/test/compiler/6958485/Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/** + * @test + * @bug 6958485 + * @summary fix for 6879921 was insufficient + * + * @run main/othervm -Xbatch -XX:CompileOnly=Test.init Test + */ + +public class Test { + + public static void init(Object src[], boolean[] dst) { + // initialize the arrays + for (int i =0; i<src.length; i++) { + dst[i] = src[i] != null ? false : true; + } + } + + public static void test() { + Object[] src = new Object[34]; + boolean[] dst = new boolean[34]; + + init(src, dst); + } + + public static void main(String[] args) { + for (int i=0; i< 2000; i++) { + test(); + } + } +}
--- a/hotspot/test/runtime/6888954/vmerrors.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/hotspot/test/runtime/6888954/vmerrors.sh Thu Jul 08 11:28:01 2010 -0700 @@ -65,7 +65,7 @@ done rm -f $$ - i=$(expr $i + 1) + i=`expr $i + 1` done exit $rc
--- a/jaxp/.hgtags Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxp/.hgtags Thu Jul 08 11:28:01 2010 -0700 @@ -71,3 +71,6 @@ 2de307cd3b4e71127e75dff70809c1b1fbc1a494 jdk7-b94 07050840f98cda357aa6a8d416fdccbd03038d35 jdk7-b95 9510ed0e1c7ab46a8b6659234e1dc7786407a72b jdk7-b96 +ca01ec32561fee1855630b68a2fcd0042257a8ef jdk7-b97 +d4adf4f2d14c7b79df0a81de884b6b57c6850802 jdk7-b98 +7ef8469021fbc824ac49d57c83a14b1bb08f1766 jdk7-b99
--- a/jaxp/build-defs.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxp/build-defs.xml Thu Jul 08 11:28:01 2010 -0700 @@ -55,9 +55,29 @@ <drop-import name="jaxp_src"/> <!-- <drop-import name="jaxp_tests"/> --> + <!-- Fail and print helpful messages if source does not exist. --> + <target name="-src-help"> + <fail message="${failed.url.src.message}"> + <condition> + <and> + <not> + <available file="${jaxp_src.src.dir}" type="dir"/> + </not> + <istrue value="${allow.downloads}"/> + </and> + </condition> + </fail> + <fail message="${failed.nourl.src.message}"> + <condition> + <not> + <available file="${jaxp_src.src.dir}" type="dir"/> + </not> + </condition> + </fail> + </target> - <!-- Special build area preparation. --> - <target name="-drop-build-prep" depends="init, -init-src-dirs"> + <!-- Special build area setup. --> + <target name="-drop-build-setup" depends="init, -init-src-dirs"> <mkdir dir="${build.classes.dir}"/> <copy todir="${build.classes.dir}"> <fileset dir="${primary.src.dir}" @@ -84,7 +104,7 @@ <!-- Source directory selection. --> <target name="-init-src-dirs" - depends="init, -use-drop"> + depends="init, -use-drop,-src-help"> <echo message="Using primary.src.dir=${primary.src.dir}"/> <pathconvert property="src.list.id" refid="src.dir.id"/> <echo message="Using src.dir.id=${src.list.id}"/>
--- a/jaxp/build-drop-template.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxp/build-drop-template.xml Thu Jul 08 11:28:01 2010 -0700 @@ -75,6 +75,7 @@ <target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used"> <condition property="@DROP@.url.should.be.used"> <and> + <istrue value="${allow.downloads}"/> <not> <isset property="@DROP@.master.bundle.copy.exists"/> </not>
--- a/jaxp/build.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxp/build.properties Thu Jul 08 11:28:01 2010 -0700 @@ -104,4 +104,24 @@ drops.dir=${drops.dir}${line.separator}\ ${line.separator} +# Failure messages when source cannot be found on the file system +failed.nourl.src.message=\ +ERROR: Cannot find source for project ${ant.project.name}.\ +${line.separator}${line.separator}\ +HINT: Try setting drops.dir to indicate where the bundles can be found, \ +or try setting the ant property allow.downloads=true to download the bundle from the URL.\ +${line.separator}\ +e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \ +${line.separator} + +# Failure message when source cannot be downloaded +failed.url.src.message=\ +ERROR: Cannot find source for project ${ant.project.name}.\ +${line.separator}${line.separator}\ +HINT: Try setting drops.dir to indicate where the bundles can be found, \ +or try checking the URL with your browser.\ +${line.separator}\ +e.g. ant -Ddrops.dir=some_directory \ +${line.separator} + #------------------------------------------------------------
--- a/jaxp/build.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxp/build.xml Thu Jul 08 11:28:01 2010 -0700 @@ -36,6 +36,11 @@ javac.debug - true or false for debug classfiles javac.target - classfile version target javac.source - source version + drops.dir - directory that holds source drop bundles + allow.download - permit downloads from public url (default is false) + (used if bundles not found in drops.dir) + + Run 'make help' for help using the Makefile. </description> <!-- Mac is special, need to downgrade these before build.properties. --> @@ -106,16 +111,20 @@ <jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/> </target> - <target name="-build-prep" - depends="init, -init-src-dirs, -drop-build-prep"> + <target name="-build-setup" + depends="init, -init-src-dirs, -drop-build-setup"> </target> <!-- Build (compilation) of sources to class files. --> <target name="build" - depends="init, -init-src-dirs, -build-prep"> + depends="compile, -build-setup"> + </target> + <target name="compile" + depends="init, -init-src-dirs"> + <mkdir dir="${build.classes.dir}"/> <javac - includeAntRuntime="false" - classpath="${build.classes.dir}" + includeAntRuntime="false" + classpath="${build.classes.dir}:${tools.jar}" fork="true" destdir="${build.classes.dir}" memoryInitialSize="${javac.memoryInitialSize}"
--- a/jaxp/jaxp.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxp/jaxp.properties Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 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 @@ -24,13 +24,13 @@ # drops.master.copy.base=${drops.dir} -drops.master.url.base=https://jaxp.dev.java.net/files/documents/913/147490 -jaxp_src.bundle.name=jdk7-jaxp-m6.zip -jaxp_src.bundle.md5.checksum=080827d779c114365f8504bd79b34604 +jaxp_src.bundle.name=jdk7-jaxp-m7.zip +jaxp_src.bundle.md5.checksum=22e95fbdb9fb7d8b6b6fc0a1d76d1fbd jaxp_src.master.bundle.dir=${drops.master.copy.base} -jaxp_src.master.bundle.url.base=${drops.master.url.base} +jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/147490 -jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip -jaxp_tests.master.bundle.dir=${drops.master.copy.base} -jaxp_tests.master.bundle.url.base=${drops.master.url.base} +#jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip +#jaxp_tests.master.bundle.dir=${drops.master.copy.base} +#jaxp_tests.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/147490 +
--- a/jaxp/make/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxp/make/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -65,6 +65,11 @@ endif endif +# If downloads are allowed +ifeq ($(ALLOW_DOWNLOADS),true) + ANT_OPTIONS += -Dallow.downloads=true +endif + # Figure out the platform we are using _SYSTEM_UNAME := $(shell uname) _PLATFORM_KIND = unix @@ -159,6 +164,8 @@ @echo " $(ANT_TARGETS)" @echo " " @echo " Environment or command line variables (all optional):" + $(call helpenvline, ALT_DROPS_DIR,\ + "Directory that contains the drop source bundles i.e. drops.dir") $(call helpenvline, ALT_BOOTDIR,\ "JAVA_HOME to use when running ant") $(call helpenvline, ALT_LANGTOOLS_DIST,\
--- a/jaxws/.hgtags Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxws/.hgtags Thu Jul 08 11:28:01 2010 -0700 @@ -71,3 +71,6 @@ 8515e093efd14ac054e941ef743f76561a393a70 jdk7-b94 ee06cfb113d554b5c8a9a53383bae2b168533829 jdk7-b95 208fd4451232f7a522ddb20334c598656844ccb7 jdk7-b96 +dac23846092ad4956ed41b5278f8686476ae46ef jdk7-b97 +4571098071094e705e680db5324bfa15a57b1290 jdk7-b98 +818366ce23d8919cafaa4db4c51605ee2a7c8eaf jdk7-b99
--- a/jaxws/build-defs.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxws/build-defs.xml Thu Jul 08 11:28:01 2010 -0700 @@ -55,9 +55,36 @@ <drop-import name="jaxws_src"/> <drop-import name="jaf_src"/> <!-- <drop-import name="jaxws_tests"/> --> + + <!-- Fail and print helpful messages if source does not exist. --> + <target name="-src-help"> + <fail message="${failed.url.src.message}"> + <condition> + <and> + <not> + <and> + <available file="${jaxws_src.src.dir}" type="dir"/> + <available file="${jaf_src.src.dir}" type="dir"/> + </and> + </not> + <istrue value="${allow.downloads}"/> + </and> + </condition> + </fail> + <fail message="${failed.nourl.src.message}"> + <condition> + <not> + <and> + <available file="${jaxws_src.src.dir}" type="dir"/> + <available file="${jaf_src.src.dir}" type="dir"/> + </and> + </not> + </condition> + </fail> + </target> - <!-- Special build area preparation. --> - <target name="-drop-build-prep" depends="init, -init-src-dirs"> + <!-- Special build area setup. --> + <target name="-drop-build-setup" depends="init, -init-src-dirs"> <mkdir dir="${build.classes.dir}"/> <copy todir="${build.classes.dir}"> <fileset dir="${primary.src.dir}" @@ -99,7 +126,7 @@ <!-- Source directory selection. --> <target name="-init-src-dirs" - depends="init, -use-drop"> + depends="init, -use-drop,-src-help"> <echo message="Using primary.src.dir=${primary.src.dir}"/> <pathconvert property="src.list.id" refid="src.dir.id"/> <echo message="Using src.dir.id=${src.list.id}"/>
--- a/jaxws/build-drop-template.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxws/build-drop-template.xml Thu Jul 08 11:28:01 2010 -0700 @@ -75,6 +75,7 @@ <target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used"> <condition property="@DROP@.url.should.be.used"> <and> + <istrue value="${allow.downloads}"/> <not> <isset property="@DROP@.master.bundle.copy.exists"/> </not>
--- a/jaxws/build.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxws/build.properties Thu Jul 08 11:28:01 2010 -0700 @@ -104,4 +104,24 @@ drops.dir=${drops.dir}${line.separator}\ ${line.separator} +# Failure messages when source cannot be found on the file system +failed.nourl.src.message=\ +ERROR: Cannot find source for project ${ant.project.name}.\ +${line.separator}${line.separator}\ +HINT: Try setting drops.dir to indicate where the bundles can be found, \ +or try setting the ant property allow.downloads=true to download the bundle from the URL.\ +${line.separator}\ +e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \ +${line.separator} + +# Failure message when source cannot be downloaded +failed.url.src.message=\ +ERROR: Cannot find source for project ${ant.project.name}.\ +${line.separator}${line.separator}\ +HINT: Try setting drops.dir to indicate where the bundles can be found, \ +or try checking the URL with your browser.\ +${line.separator}\ +e.g. ant -Ddrops.dir=some_directory \ +${line.separator} + #------------------------------------------------------------
--- a/jaxws/build.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxws/build.xml Thu Jul 08 11:28:01 2010 -0700 @@ -36,6 +36,11 @@ javac.debug - true or false for debug classfiles javac.target - classfile version target javac.source - source version + drops.dir - directory that holds source drop bundles + allow.download - permit downloads from public url (default is false) + (used if bundles not found in drops.dir) + + Run 'make help' for help using the Makefile. </description> <!-- Mac is special, need to downgrade these before build.properties. --> @@ -106,13 +111,17 @@ <jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/> </target> - <target name="-build-prep" - depends="init, -init-src-dirs, -drop-build-prep"> + <target name="-build-setup" + depends="init, -init-src-dirs, -drop-build-setup"> </target> <!-- Build (compilation) of sources to class files. --> <target name="build" - depends="init, -init-src-dirs, -build-prep"> + depends="compile, -build-setup"> + </target> + <target name="compile" + depends="init, -init-src-dirs"> + <mkdir dir="${build.classes.dir}"/> <javac includeAntRuntime="false" classpath="${build.classes.dir}:${tools.jar}"
--- a/jaxws/jaxws.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxws/jaxws.properties Thu Jul 08 11:28:01 2010 -0700 @@ -24,19 +24,18 @@ # drops.master.copy.base=${drops.dir} -drops.master.url.base=http://kenai.com/projects/jdk7-drops/downloads/download -jaxws_src.bundle.name=jdk7-jaxws-2009_09_28.zip -jaxws_src.bundle.md5.checksum=f5010ebf636db9f465a61a7a74944543 +jaxws_src.bundle.name=jdk7-jaxws-b100.zip +jaxws_src.bundle.md5.checksum=e4fea255c6222b118bb1d0d3054d36e1 jaxws_src.master.bundle.dir=${drops.master.copy.base} -#jaxws_src.bundle.url.base=https://jaxws.dev.java.net/files/documents/913/142147 -jaxws_src.master.bundle.url.base=${drops.master.url.base} +jaxws_src.master.bundle.url.base=https://jax-ws.dev.java.net/files/documents/4202/150896 jaf_src.bundle.name=jdk7-jaf-2009_08_28.zip jaf_src.bundle.md5.checksum=eb8cb7a4a7f14e211fbe2354878a2472 jaf_src.master.bundle.dir=${drops.master.copy.base} -jaf_src.master.bundle.url.base=${drops.master.url.base} +jaf_src.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download -jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip -jaxws_tests.master.bundle.dir=${drops.master.copy.base} -jaxws_tests.master.bundle.url.base=${drops.master.url.base} +#jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip +#jaxws_tests.master.bundle.dir=${drops.master.copy.base} +#jaxws_tests.master.bundle.url.base=http://kenai.com/projects/jdk7-drops/downloads/download +
--- a/jaxws/make/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jaxws/make/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -65,6 +65,11 @@ endif endif +# If downloads are allowed +ifeq ($(ALLOW_DOWNLOADS),true) + ANT_OPTIONS += -Dallow.downloads=true +endif + # Figure out the platform we are using _SYSTEM_UNAME := $(shell uname) _PLATFORM_KIND = unix @@ -159,6 +164,8 @@ @echo " $(ANT_TARGETS)" @echo " " @echo " Environment or command line variables (all optional):" + $(call helpenvline, ALT_DROPS_DIR,\ + "Directory that contains the drop source bundles i.e. drops.dir") $(call helpenvline, ALT_BOOTDIR,\ "JAVA_HOME to use when running ant") $(call helpenvline, ALT_LANGTOOLS_DIST,\
--- a/jdk/.hgtags Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/.hgtags Thu Jul 08 11:28:01 2010 -0700 @@ -72,3 +72,5 @@ db951e984ccf50756160fee3078c791300b0917e jdk7-b95 51b9e5dbc2da0631414484b934ac3fb62e48a2c6 jdk7-b96 b1903d7528d33b521df42bc9291bdcdd2f444a29 jdk7-b97 +82593186fa54ab12f17af31f86a7bf364efaf4df jdk7-b98 +2587c9f0b60dc3146b4247b8674ada456a643d6f jdk7-b99
--- a/jdk/make/common/Defs-linux.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/common/Defs-linux.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -320,6 +320,7 @@ endif override LIBPOSIX4 = override LIBSOCKET = +override LIBNSL = override LIBTHREAD = override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true
--- a/jdk/make/common/Defs-solaris.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/common/Defs-solaris.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -645,6 +645,9 @@ # Socket library LIBSOCKET = -lsocket +# Network Services library +LIBNSL = -lnsl + # GLOBAL_KPIC: If set means all libraries are PIC, position independent code # EXCEPT for select compiles # If a .o file is compiled non-PIC then it should be forced
--- a/jdk/make/common/Release.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/common/Release.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -54,6 +54,13 @@ # This is a stopgap until 6839872 is fixed. EXCLUDE_PROPWARN_PKGS += sun.dyn +# +# Include the exported private packages in ct.sym. +# This is an interim solution until the ct.sym is replaced +# with a new module system (being discussed for JDK 7). +# +EXPORTED_PRIVATE_PKGS = com.sun.servicetag + # 64-bit solaris has a few special cases. We define the variable # SOLARIS64 for use in this Makefile to easily test those cases ifeq ($(PLATFORM), solaris) @@ -982,7 +989,7 @@ -processor com.sun.tools.javac.sym.CreateSymbols \ -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ - $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) + $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \ -C $(OUTPUTDIR)/symbols META-INF $(BOOT_JAR_JFLAGS) @$(java-vm-cleanup)
--- a/jdk/make/common/shared/Defs-control.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/common/shared/Defs-control.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -35,9 +35,6 @@ JDK_MAKE_SHARED_DIR = $(JDK_TOPDIR)/make/common/shared endif -ifndef CONTROL_TOPDIR - CONTROL_TOPDIR=$(TOPDIR) -endif ifndef HOTSPOT_TOPDIR HOTSPOT_TOPDIR=$(TOPDIR)/hotspot endif
--- a/jdk/make/common/shared/Defs-windows.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/common/shared/Defs-windows.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -331,23 +331,50 @@ endif endif -# Compilers for 64bit may be from SDK. For VS 2010 we use those. -# The Express compilers don't contain 64 bit compilers, so in -# that case, you additionally need the SDK. At this time, -# there's no 64 bit SDK available that has VS 2010. -# Presumably SDK v7.1 will provide that and we may want to update -# the logic here to work with that. -# However official builds will use the Professional version. +# Compilers for 64bit may be from the free SDK, or Visual Studio Professional +# The free Express compilers don't contain 64 bit compilers, which is why +# you instead need the SDK. +# So for VS2010 based builds, either VS2010 Pro with the 7.0a SDK, or +# the Windows 7.1 standalone SDK with compilers may be used. +# Release enginering will use VS2010 Pro, so the frequency of testing of +# SDK based builds will depend entirely on individual usage. ifeq ($(ARCH_DATA_MODEL), 64) ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc + # VS2010 default location is used when building 64 bit using the 7.1 SDK + # This is safe to hardwire as the SDK installer won't let you change it + # and the VS2010 variable is only used if the compilers are from the SDK + xVS2010 :="$(_program_files32)/Microsoft Visual Studio 10.0/" + VS2010 :=$(call FullPath,$(xVS2010)) xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))" _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS)) endif ifneq ($(_vs100tools),) _compiler_bin :=$(_vs100tools)/../../Vc/bin/amd64 - _redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT - xMSSDK70 :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/" - MSSDK70 :=$(call FullPath,$(xMSSDK70)) + x_redist_sdk :=$(_vs100tools)/../../Vc/redist/x64/Microsoft.VC100.CRT + _redist_sdk :=$(call FullPath,$(x_redist_sdk)) + # The SDK doesn't have the redist directory, but the DLL is installed + # into the windows directory. + ifeq ($(_redist_sdk),) + _redist_sdk :=c:/windows/system32 + endif + # Not currently using MSSDK7n, but maybe we can make use of it for + # doing default location lookup to find some SDK tools that presently + # require the developer to explicitly set the path. + # The 7.0a path is from VS2010 Pro, the 7.1 path is the standalone SDK. + # Either will work for us. + # If a developer chooses to install the standalone SDK in some other + # location, then this will fail to find it, which won't matter so long as + # we aren't using this variable. If we do they'd still need to set the + # ALT_MSDEVTOOLS_PATH as now. + # %WindowsSdkDir% could be referenced instead but the SDK installer + # doesn't set it and in the case of the VS2010 compilers, + # you can't change this location in the installer anyway. + xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.0a/" + MSSDK7n :=$(call FullPath,$(xMSSDK7n)) + ifeq ($(MSSDK7n),) + xMSSDK7n :="$(_program_files32)/Microsoft SDKs/Windows/v7.1/" + MSSDK7n :=$(call FullPath,$(xMSSDK7n)) + endif else xVS2008 :="$(_program_files32)/Microsoft Visual Studio 9.0/" VS2008 :=$(call FullPath,$(xVS2008)) @@ -355,7 +382,7 @@ _compiler_bin :=$(VS2008)/VC/Bin/$(ARCH) xMSSDK61 :="$(_program_files)/Microsoft SDKs/Windows/v6.1/" MSSDK61 :=$(call FullPath,$(xMSSDK61)) - _redist_sdk :=$(VS2008)/VC/redist/x86/Microsoft.VC90.CRT + _redist_sdk :=$(VS2008)/VC/redist/x64/Microsoft.VC90.CRT else ifneq ($(_ms_sdk),) ifeq ($(ARCH), ia64)
--- a/jdk/make/docs/CORE_PKGS.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/docs/CORE_PKGS.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -234,6 +234,7 @@ javax.xml.ws.http \ javax.xml.ws.soap \ javax.xml.ws.spi \ + javax.xml.ws.spi.http \ javax.xml.ws.wsaddressing \ javax.xml.transform \ javax.xml.transform.sax \
--- a/jdk/make/java/hpi/hpi_common.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/java/hpi/hpi_common.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -86,5 +86,5 @@ # Things that must be linked in. # ifneq ($(PLATFORM), windows) -OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl +OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) -ldl endif
--- a/jdk/make/java/java/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/java/java/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -204,7 +204,7 @@ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib else -OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \ +OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) -ldl \ -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) endif
--- a/jdk/make/java/java_hprof_demo/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/java/java_hprof_demo/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -84,7 +84,7 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS += wsock32.lib winmm.lib else - OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl + OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl endif #
--- a/jdk/make/java/net/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/java/net/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -96,7 +96,7 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS = ws2_32.lib $(JVMLIB) else - OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB) + OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) -ldl $(JVMLIB) endif ifeq ($(PLATFORM), linux) OTHER_LDLIBS += -lpthread
--- a/jdk/make/jpda/transport/socket/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/jpda/transport/socket/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -38,11 +38,11 @@ include $(BUILDDIR)/common/Defs.gmk ifeq ($(PLATFORM), linux) - OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread + OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread endif ifeq ($(PLATFORM), solaris) - OTHER_LDLIBS += -lnsl $(LIBSOCKET) + OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) endif ifeq ($(PLATFORM), windows)
--- a/jdk/make/mkdemo/jvmti/hprof/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/mkdemo/jvmti/hprof/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -39,10 +39,10 @@ EXTRA_LIBS += wsock32.lib winmm.lib endif ifeq ($(PLATFORM), solaris) - OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl + OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl endif ifeq ($(PLATFORM), linux) - OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread + OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl -lpthread endif #
--- a/jdk/make/netbeans/README Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/netbeans/README Thu Jul 08 11:28:01 2010 -0700 @@ -204,8 +204,8 @@ note that pretty much regardless of your hardware, this *will* take a long time, and use *lots* of disk space (more than 3GB). The results of the build are in - *install-dir*/control/build/*platform*-*arch* and - *install-dir*/control/build/*platform*-*arch*-fastdebug. + *install-dir*/build/*platform*-*arch* and + *install-dir*/build/*platform*-*arch*-fastdebug. Consult the project's README file for details.
--- a/jdk/make/netbeans/world/README Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/netbeans/world/README Thu Jul 08 11:28:01 2010 -0700 @@ -10,6 +10,6 @@ Please note: the results of building this project are *not* put in the place used by other projects. In this case, the results are place in - <install-dir>/control/build/<platform>-<arch> + <install-dir>/build/<platform>-<arch> and - <install-dir>/control/build/<platform>-<arch>-fastdebug + <install-dir>/build/<platform>-<arch>-fastdebug
--- a/jdk/make/netbeans/world/build.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/netbeans/world/build.xml Thu Jul 08 11:28:01 2010 -0700 @@ -34,11 +34,11 @@ <import file="../common/shared.xml"/> <target name="-build-make" depends="-make.init" if="use.make"> - <make-run target="dev" dir="${root}/../control/make" opts="SKIP_COMPARE_IMAGES=true"/> + <make-run target="dev" dir="${root}/.." opts="SKIP_COMPARE_IMAGES=true"/> </target> <target name="-clean-make" depends="-make.init" if="use.make"> - <make-run target="clean" dir="${root}/../control/make"/> + <make-run target="clean" dir="${root}/.."/> </target> </project>
--- a/jdk/make/sun/nio/cs/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/sun/nio/cs/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -37,7 +37,7 @@ # This re-directs all the class files to a separate location CLASSDESTDIR = $(TEMPDIR)/classes -OTHER_JAVACFLAGS += -Xlint:serial -Werror +OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Werror include $(BUILDDIR)/common/Defs.gmk #
--- a/jdk/make/sun/pisces/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/sun/pisces/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -52,5 +52,11 @@ copy-files: $(FILES_copy) -$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/java2d/pisces/META-INF/services/% +ifneq ($(PLATFORM), windows) + SERVICE_SRC = $(PLATFORM_SRC) +else + SERVICE_SRC = $(SHARE_SRC) +endif + +$(SERVICEDIR)/%: $(SERVICE_SRC)/classes/sun/java2d/pisces/META-INF/services/% $(install-file)
--- a/jdk/make/sun/security/mscapi/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/sun/security/mscapi/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -150,6 +150,7 @@ # Rules # CLASSDESTDIR = $(TEMPDIR)/classes +JAVAHFLAGS += -classpath $(CLASSDESTDIR) include $(BUILDDIR)/common/Mapfile-vers.gmk
--- a/jdk/make/sun/security/pkcs11/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/sun/security/pkcs11/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -148,6 +148,7 @@ # Rules # CLASSDESTDIR = $(TEMPDIR)/classes +JAVAHFLAGS += -classpath $(CLASSDESTDIR) include $(BUILDDIR)/common/Mapfile-vers.gmk
--- a/jdk/make/sun/tools/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/sun/tools/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -49,7 +49,8 @@ # Extra jstat files FILES_copy += \ - $(CLASSDESTDIR)/sun/tools/jstat/resources/jstat_options + $(CLASSDESTDIR)/sun/tools/jstat/resources/jstat_options \ + $(CLASSDESTDIR)/sun/tools/jstat/resources/jstat_unsupported_options # Extra jhat files JHAT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/hat/resources
--- a/jdk/make/tools/freetypecheck/freetypecheck.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/make/tools/freetypecheck/freetypecheck.c Thu Jul 08 11:28:01 2010 -0700 @@ -33,7 +33,7 @@ #include FT_FREETYPE_H #ifdef _MSC_VER -#if _MSC_VER > 1400 +#if _MSC_VER > 1400 && _MSC_VER < 1600 /* * When building for Microsoft Windows, your program has a dependency @@ -68,7 +68,7 @@ "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"") #endif /* _M_AMD64 */ -#endif /* _MSC_VER > 1400 */ +#endif /* _MSC_VER > 1400 && _MSC_VER < 1600 */ #endif /* _MSC_VER */ #define QUOTEMACRO(x) QUOTEME(x)
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java Thu Jul 08 11:28:01 2010 -0700 @@ -424,7 +424,7 @@ State rv; rv = super.getState(); if (rv != State.DISABLED - && ! comboBox.isEditable() + && comboBox != null && ! comboBox.isEditable() && XPStyle.getXP().isSkinDefined(comboBox, Part.CP_DROPDOWNBUTTONRIGHT)) { /*
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -47,10 +47,13 @@ public final static short JAVA5_MAX_CLASS_MAJOR_VERSION = 49; public final static short JAVA5_MAX_CLASS_MINOR_VERSION = 0; - // NOTE: ASSUMED for now + public final static short JAVA6_MAX_CLASS_MAJOR_VERSION = 50; public final static short JAVA6_MAX_CLASS_MINOR_VERSION = 0; + public final static short JAVA7_MAX_CLASS_MAJOR_VERSION = 51; + public final static short JAVA7_MAX_CLASS_MINOR_VERSION = 0; + public final static int JAVA_PACKAGE_MAGIC = 0xCAFED00D; public final static int JAVA5_PACKAGE_MAJOR_VERSION = 150; public final static int JAVA5_PACKAGE_MINOR_VERSION = 7;
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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 @@ -57,8 +57,8 @@ // These fields can be adjusted by driver properties. short min_class_majver = JAVA_MIN_CLASS_MAJOR_VERSION; short min_class_minver = JAVA_MIN_CLASS_MINOR_VERSION; - short max_class_majver = JAVA6_MAX_CLASS_MAJOR_VERSION; - short max_class_minver = JAVA6_MAX_CLASS_MINOR_VERSION; + short max_class_majver = JAVA7_MAX_CLASS_MAJOR_VERSION; + short max_class_minver = JAVA7_MAX_CLASS_MINOR_VERSION; short observed_max_class_majver = min_class_majver; short observed_max_class_minver = min_class_minver; @@ -122,13 +122,16 @@ void choosePackageVersion() { assert(package_majver <= 0); // do not call this twice int classver = getHighestClassVersion(); - if (classver != 0 && - (classver >>> 16) < JAVA6_MAX_CLASS_MAJOR_VERSION) { - // There are only old classfiles in this segment. + if (classver == 0 || (classver >>> 16) < JAVA6_MAX_CLASS_MAJOR_VERSION) { + // There are only old classfiles in this segment or resources package_majver = JAVA5_PACKAGE_MAJOR_VERSION; package_minver = JAVA5_PACKAGE_MINOR_VERSION; + } else if ((classver >>> 16) == JAVA6_MAX_CLASS_MAJOR_VERSION) { + package_majver = JAVA6_PACKAGE_MAJOR_VERSION; + package_minver = JAVA6_PACKAGE_MINOR_VERSION; } else { - // Normal case. Use the newest archive format. + // Normal case. Use the newest archive format, when available + // TODO: replace the following with JAVA7* when the need arises package_majver = JAVA6_PACKAGE_MAJOR_VERSION; package_minver = JAVA6_PACKAGE_MINOR_VERSION; }
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003,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 @@ -90,8 +90,8 @@ props.put(Utils.PACK_DEFAULT_TIMEZONE, String.valueOf(Boolean.getBoolean(Utils.PACK_DEFAULT_TIMEZONE))); - // Limit segment size to less than a megabyte. - props.put(Pack200.Packer.SEGMENT_LIMIT, ""+(1*1000*1000)); + // The segment size is unlimited + props.put(Pack200.Packer.SEGMENT_LIMIT, ""); // Preserve file ordering by default. props.put(Pack200.Packer.KEEP_FILE_ORDER, Pack200.Packer.TRUE);
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,7 +41,7 @@ * @author Raul Benito(Of the xerces copy, and little adaptations). * @author Anli Shundi * @author Christian Geuer-Pollmann - * @see <A HREF="ftp://ftp.isi.edu/in-notes/rfc2045.txt">RFC 2045</A> + * @see <A HREF="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</A> * @see com.sun.org.apache.xml.internal.security.transforms.implementations.TransformBase64Decode */ public class Base64 {
--- a/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/security/auth/LdapPrincipal.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ /** * A principal identified by a distinguished name as specified by - * <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a>. + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>. * * <p> * After successful authentication, a user {@link java.security.Principal} @@ -122,7 +122,7 @@ /** * Creates a string representation of this principal's name in the format - * defined by <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>. + * defined by <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>. * If the name has zero components an empty string is returned. * * @return The principal's string name.
--- a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/security/sasl/CramMD5Client.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,7 +33,7 @@ /** * Implements the CRAM-MD5 SASL client-side mechanism. - * (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2195.txt">RFC 2195</A>). + * (<A HREF="http://www.ietf.org/rfc/rfc2195.txt">RFC 2195</A>). * CRAM-MD5 has no initial response. It receives bytes from * the server as a challenge, which it hashes by using MD5 and the password. * It concatenates the authentication ID with this result and returns it
--- a/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/security/sasl/CramMD5Server.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,7 +38,7 @@ /** * Implements the CRAM-MD5 SASL server-side mechanism. - * (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2195.txt">RFC 2195</A>). + * (<A HREF="http://www.ietf.org/rfc/rfc2195.txt">RFC 2195</A>). * CRAM-MD5 has no initial response. * * client <---- M={random, timestamp, server-fqdn} ------- server
--- a/jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/security/sasl/ExternalClient.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,7 @@ /** * Implements the EXTERNAL SASL client mechanism. - * (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2222.txt">RFC 2222</A>). + * (<A HREF="http://www.ietf.org/rfc/rfc2222.txt">RFC 2222</A>). * The EXTERNAL mechanism returns the optional authorization ID as * the initial response. It processes no challenges. *
--- a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,10 +39,10 @@ /** * Implements the GSSAPI SASL client mechanism for Kerberos V5. - * (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2222.txt">RFC 2222</A>, + * (<A HREF="http://www.ietf.org/rfc/rfc2222.txt">RFC 2222</A>, * <a HREF="http://www.ietf.org/internet-drafts/draft-ietf-cat-sasl-gssapi-04.txt">draft-ietf-cat-sasl-gssapi-04.txt</a>). * It uses the Java Bindings for GSSAPI - * (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2853.txt">RFC 2853</A>) + * (<A HREF="http://www.ietf.org/rfc/rfc2853.txt">RFC 2853</A>) * for getting GSSAPI/Kerberos V5 support. * * The client/server interactions are:
--- a/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,7 +39,7 @@ /** * Implements the GSSAPI SASL server mechanism for Kerberos V5. - * (<A HREF="ftp://ftp.isi.edu/in-notes/rfc2222.txt">RFC 2222</A>, + * (<A HREF="http://www.ietf.org/rfc/rfc2222.txt">RFC 2222</A>, * <a HREF="http://www.ietf.org/internet-drafts/draft-ietf-cat-sasl-gssapi-00.txt">draft-ietf-cat-sasl-gssapi-00.txt</a>). * * Expects thread's Subject to contain server's Kerberos credentials
--- a/jdk/src/share/classes/com/sun/servicetag/Registry.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/servicetag/Registry.java Thu Jul 08 11:28:01 2010 -0700 @@ -67,7 +67,6 @@ // The stclient output has to be an exported interface private static final String INSTANCE_URN_DESC = "Product instance URN="; private static boolean initialized = false; - private static boolean supportsHelperClass = true; // default private static File stclient = null; private static String stclientPath = null; private static Registry registry = new Registry(); @@ -81,17 +80,6 @@ private synchronized static String getSTclient() { if (!initialized) { - // the system property always overrides the default setting - if (System.getProperty(SVCTAG_STHELPER_SUPPORTED) != null) { - supportsHelperClass = Boolean.getBoolean(SVCTAG_STHELPER_SUPPORTED); - } - - // This is only used for testing - stclientPath = System.getProperty(SVCTAG_STCLIENT_CMD); - if (stclientPath != null) { - return stclientPath; - } - // Initialization to determine the platform's stclient pathname String os = System.getProperty("os.name"); if (os.equals("SunOS")) { @@ -108,10 +96,26 @@ initialized = true; } + boolean supportsHelperClass = true; // default + if (System.getProperty(SVCTAG_STHELPER_SUPPORTED) != null) { + // the system property always overrides the default setting + supportsHelperClass = Boolean.getBoolean(SVCTAG_STHELPER_SUPPORTED); + } + + if (!supportsHelperClass) { + // disable system registry + return null; + } + + // This is only used for testing + String path = System.getProperty(SVCTAG_STCLIENT_CMD); + if (path != null) { + return path; + } + // com.sun.servicetag package has to be compiled with JDK 5 as well // JDK 5 doesn't support the File.canExecute() method. // Risk not checking isExecute() for the stclient command is very low. - if (stclientPath == null && stclient != null && stclient.exists()) { stclientPath = stclient.getAbsolutePath(); } @@ -142,8 +146,8 @@ * @return {@code true} if the {@code Registry} class is supported; * otherwise, return {@code false}. */ - public static boolean isSupported() { - return (getSTclient() != null && supportsHelperClass); + public static synchronized boolean isSupported() { + return getSTclient() != null; } private static List<String> getCommandList() {
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register.html Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/servicetag/resources/register.html Thu Jul 08 11:28:01 2010 -0700 @@ -53,13 +53,13 @@ </tr> <tr> <td> </td> - <td><p class="style1">Thank you for installing the + <td><p class="style1">Thank you for installing the <strong> Java Development Kit @@JDK_VERSION@@ </strong> - from Sun Microsystems. </p> + from Oracle Corporation. </p> <p class="style1">Registering your product will give you the following benefits:</p> <ul class="style1"> <li> Notification of new versions, patches, and updates</li> - <li> Special offers on Sun developer products, services and training </li> + <li> Special offers on Oracle developer products, services and training </li> <li> Access to early releases and documentation </li> </ul> <p class="style1">Product registration is FREE, quick and easy!</p> @@ -68,11 +68,11 @@ <table width="708" border="0" cellspacing="0" cellpadding="3"> <tr valign="top"> <td width="126" height="35"> - <form name="form1" method="post" action="@@REGISTRATION_URL@@"> + <form name="form1" method="post" action="@@REGISTRATION_URL@@" enctype="text/xml"> <input type="hidden" name="servicetag_payload" value="@@REGISTRATION_PAYLOAD@@"> <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="Register My JDK"> </form></td> - <td width="570"><span class="style3">You need to be connected to the Internet to register this Sun product. </span></td> + <td width="570"><span class="style3">You need to be connected to the Internet to register this Oracle product. </span></td> </tr> </table> </blockquote> @@ -81,16 +81,16 @@ <tr> <td> </td> <td bgcolor="#f1f7df"> - <p class="style3">Sun Microsystems, Inc. respects your privacy. - We will use your personal information for communications - and management of your Sun Online Account, the services - and applications you access using your Sun Online Account, + <p class="style3">Oracle Corporation respects your privacy. + We will use your personal information for communications + and management of your Sun Online Account, the services + and applications you access using your Sun Online Account, and the products and systems you register with your Sun Online Account.</p> - <p class="style3">For more information on the data that will be collected as + <p class="style3">For more information on the data that will be collected as part of the registration process and how it will be managed <br> - see <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>. <br> + see <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>. <br> <br> - For more information on Sun's Privacy Policy see <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com.</a></p></td> + For more information on Oracle's Privacy Policy see <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com.</a></p></td> </tr> <tr> <td> </td>
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html Thu Jul 08 11:28:01 2010 -0700 @@ -50,11 +50,11 @@ <tr> <td> </td> - <td><p class="style1">Sun Microsystems の<strong> Java Development Kit @@JDK_VERSION@@ </strong>をインストールしていただき、ありがとうございます。 </p> + <td><p class="style1">Oracle Corporation の<strong> Java Development Kit @@JDK_VERSION@@ </strong>をインストールしていただき、ありがとうございます。 </p> <p class="style1">製品登録をすると、次のような特典を受けることができます。</p> <ul class="style1"> <li> 最新のバージョン、パッチ、および更新についての通知</li> - <li> Sun の開発者向け製品、サービス、およびトレーニングの特別販売 </li> + <li> Oracle の開発者向け製品、サービス、およびトレーニングの特別販売 </li> <li> アーリーリリースおよびドキュメントへのアクセス </li> </ul> <p class="style1">製品登録は無料であり、迅速で簡単です。</p> @@ -62,11 +62,11 @@ <p class="style1">必要になるのは、Sun 開発者向けネットワークアカウントまたはその他の Sun オンラインアカウントだけです。 まだアカウントがない場合は、アカウントの作成が求められます。 </p> <table width="708" border="0" cellspacing="0" cellpadding="3"> <tr valign="top"> - <td width="126" height="35"><form name="form1" method="post" action="@@REGISTRATION_URL@@"> + <td width="126" height="35"><form name="form1" method="post" action="@@REGISTRATION_URL@@" enctype="text/xml"> <input type="hidden" name="servicetag_payload" value="@@REGISTRATION_PAYLOAD@@"> <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="JDK 製品登録"> </form></td> - <td width="570"><span class="style3">この Sun 製品を登録するには、インターネットに接続している必要があります。 </span></td> + <td width="570"><span class="style3">この Oracle 製品を登録するには、インターネットに接続している必要があります。 </span></td> </tr> </table> </blockquote> @@ -75,8 +75,8 @@ <tr> <td> </td> <td bgcolor="#f1f7df"> - <p class="style3">Sun Microsystems, Inc. は、お客様のプライバシーを尊重します。 お客様の個人情報は、お客様の Sun オンラインアカウント、お客様が Sun オンラインアカウントを使用してアクセスするサービスとアプリケーション、およびお客様が Sun オンラインアカウントで登録する製品とシステムの通信と管理に使用します。</p> - <p class="style3">登録の際に収集されるデータや、それらがどのように管理されるかについての詳細は、<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> を参照してください。 <br> <br> Sun のプライバシーポリシーについての詳細は、<a href="http://jp.sun.com/privacy/">http://jp.sun.com/privacy/</a> を参照するか、<a class="moz-txt-link-rfc2396E" href="http://jp.sun.com/cgi-bin/contact/comment.cgi?url=http://jp.sun.com/privacy/">お問い合わせフォーム</a>からお問い合わせください。</p></td> + <p class="style3">Oracle Corporation は、お客様のプライバシーを尊重します。 お客様の個人情報は、お客様の Sun オンラインアカウント、お客様が Sun オンラインアカウントを使用してアクセスするサービスとアプリケーション、およびお客様が Sun オンラインアカウントで登録する製品とシステムの通信と管理に使用します。</p> + <p class="style3">登録の際に収集されるデータや、それらがどのように管理されるかについての詳細は、<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> を参照してください。 <br> <br> Oracle のプライバシーポリシーについての詳細は、<a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> を参照するか、<a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">お問い合わせフォーム</a>からお問い合わせください。</p></td> </tr> <tr> <td> </td>
--- a/jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html Thu Jul 08 11:28:01 2010 -0700 @@ -51,11 +51,11 @@ <tr> <td> </td> -<td><p class="style1">感谢您安装 Sun Microsystems 的 <strong>Java Development Kit @@JDK_VERSION@@</strong>。 </p> +<td><p class="style1">感谢您安装 Oracle Corporation 的 <strong>Java Development Kit @@JDK_VERSION@@</strong>。 </p> <p class="style1">注册产品后您将获得如下增值服务：</p> <ul class="style1"> <li> 获得新版本、修补程序和更新的通知服务</li> -<li> 获得有关 Sun 开发者产品、服务和培训的优惠 </li> +<li> 获得有关 Oracle 开发者产品、服务和培训的优惠 </li> <li> 获得对早期版本和文档的访问权限 </li> </ul> <p class="style1">产品注册是免费的，即快速又轻松！</p> @@ -63,11 +63,11 @@ <p class="style1">您需要具有 Sun 开发者网络或其他 Sun 联机帐户。如果您没有，系统将提示您创建一个。 </p> <table width="708" border="0" cellspacing="0" cellpadding="3"> <tr valign="top"> - <td width="126" height="35"><form name="form1" method="post" action="@@REGISTRATION_URL@@"> + <td width="126" height="35"><form name="form1" method="post" action="@@REGISTRATION_URL@@" enctype="text/xml"> <input type="hidden" name="servicetag_payload" value="@@REGISTRATION_PAYLOAD@@"> <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="注册我的 JDK"> </form></td> -<td width="570"><span class="style3">您需要连接到 Internet 来注册此 Sun 产品。 </span></td> +<td width="570"><span class="style3">您需要连接到 Internet 来注册此 Oracle 产品。 </span></td> </tr> </table> </blockquote> @@ -76,8 +76,8 @@ <tr> <td> </td> <td bgcolor="#f1f7df"> - <p class="style3">Sun Microsystems, Inc. 尊重您的隐私。我们会将您的个人信息用于通信和 Sun 联机帐户的管理、Sun 联机帐户访问的服务和应用程序以及用于使用 Sun 联机帐户注册的产品和系统。</p> -<p class="style3">有关注册过程中收集的数据以及这些数据的管理方式的更多信息，<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Sun 隐私政策的更多信息，请访问 <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com</a> 联系。</p></td> + <p class="style3">Oracle 尊重您的隐私。我们会将您的个人信息用于通信和 Sun 联机帐户的管理、Sun 联机帐户访问的服务和应用程序以及用于使用 Sun 联机帐户注册的产品和系统。</p> +<p class="style3">有关注册过程中收集的数据以及这些数据的管理方式的更多信息，<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Oracle 隐私政策的更多信息，请访问 <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com</a> 联系。</p></td> </tr> <tr> <td> </td>
--- a/jdk/src/share/classes/java/dyn/CallSite.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/CallSite.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -25,25 +25,32 @@ package java.dyn; -import sun.dyn.util.BytecodeName; import sun.dyn.Access; +import sun.dyn.MemberName; import sun.dyn.CallSiteImpl; -import sun.dyn.MethodHandleImpl; /** - * An {@code invokedynamic} call site, as reified by the - * containing class's bootstrap method. - * Every call site object corresponds to a distinct instance - * of the <code>invokedynamic</code> instruction, and vice versa. - * Every call site has one state variable, called the {@code target}. - * It is typed as a {@link MethodHandle}. This state is never null, and - * it is the responsibility of the bootstrap method to produce call sites - * which have been pre-linked to an initial target method. + * A {@code CallSite} reifies an {@code invokedynamic} instruction from bytecode, + * and controls its linkage. + * Every linked {@code CallSite} object corresponds to a distinct instance + * of the {@code invokedynamic} instruction, and vice versa. * <p> - * (Note: The bootstrap method may elect to produce call sites of a + * Every linked {@code CallSite} object has one state variable, + * a {@link MethodHandle} reference called the {@code target}. + * This reference is never null. Though it can change its value + * successive values must always have exactly the {@link MethodType method type} + * called for by the bytecodes of the associated {@code invokedynamic} instruction + * <p> + * It is the responsibility of each class's + * {@link Linkage#registerBootstrapMethod(Class, MethodHandle) bootstrap method} + * to produce call sites which have been pre-linked to an initial target method. + * The required {@link MethodType type} for the target method is a parameter + * to each bootstrap method call. + * <p> + * The bootstrap method may elect to produce call sites of a * language-specific subclass of {@code CallSite}. In such a case, * the subclass may claim responsibility for initializing its target to - * a non-null value, by overriding {@link #initialTarget}.) + * a non-null value, by overriding {@link #initialTarget}. * <p> * An {@code invokedynamic} instruction which has not yet been executed * is said to be <em>unlinked</em>. When an unlinked call site is executed, @@ -52,54 +59,139 @@ * value to the new call site's target variable, the method {@link #initialTarget} * is called to produce the new call site's first target method. * <p> + * A freshly-created {@code CallSite} object is not yet in a linked state. + * An unlinked {@code CallSite} object reports null for its {@code callerClass}. + * When the JVM receives a {@code CallSite} object from a bootstrap method, + * it first ensures that its target is non-null and of the correct type. + * The JVM then links the {@code CallSite} object to the call site instruction, + * enabling the {@code callerClass} to return the class in which the instruction occurs. + * <p> + * Next, the JVM links the instruction to the {@code CallSite}, at which point + * any further execution of the {@code invokedynamic} instruction implicitly + * invokes the current target of the {@code CallSite} object. + * After this two-way linkage, both the instruction and the {@code CallSite} + * object are said to be linked. + * <p> + * This state of linkage continues until the method containing the + * dynamic call site is garbage collected, or the dynamic call site + * is invalidated by an explicit request. + * <p> + * Linkage happens once in the lifetime of any given {@code CallSite} object. + * Because of call site invalidation, this linkage can be repeated for + * a single {@code invokedynamic} instruction, with multiple {@code CallSite} objects. + * When a {@code CallSite} is unlinked from an {@code invokedynamic} instruction, + * the instruction is reset so that it is no longer associated with + * the {@code CallSite} object, but the {@code CallSite} does not change + * state. + * <p> + * Here is a sample use of call sites and bootstrap methods which links every + * dynamic call site to print its arguments: +<blockquote><pre><!-- see indy-demo/src/PrintArgsDemo.java --> +private static void printArgs(Object... args) { + System.out.println(java.util.Arrays.deepToString(args)); +} +private static final MethodHandle printArgs; +static { + MethodHandles.Lookup lookup = MethodHandles.lookup(); + Class thisClass = lookup.lookupClass(); // (who am I?) + printArgs = lookup.findStatic(thisClass, + "printArgs", MethodType.methodType(void.class, Object[].class)); + Linkage.registerBootstrapMethod("bootstrapDynamic"); +} +private static CallSite bootstrapDynamic(Class caller, String name, MethodType type) { + // ignore caller and name, but match the type: + return new CallSite(MethodHandles.collectArguments(printArgs, type)); +} +</pre></blockquote> * @see Linkage#registerBootstrapMethod(java.lang.Class, java.dyn.MethodHandle) * @author John Rose, JSR 292 EG */ public class CallSite - // Note: This is an implementation inheritance hack, and will be removed - // with a JVM change which moves the required hidden state onto this class. - extends CallSiteImpl { private static final Access IMPL_TOKEN = Access.getToken(); - /* + // Fields used only by the JVM. Do not use or change. + private MemberName vmmethod; // supplied by the JVM (ref. to calling method) + private int vmindex; // supplied by the JVM (BCI within calling method) - // Fields used only by the JVM. Do not use or change. - private Object vmmethod; - int callerMID, callerBCI; // supplied by the JVM - + // The actual payload of this call site: private MethodHandle target; - final Object caller; // usually a class - final String name; - final MethodType type; - */ + // Remove this field for PFD and delete deprecated methods: + private MemberName calleeNameRemoveForPFD; + + /** + * Make a blank call site object. + * Before it is returned from a bootstrap method, this {@code CallSite} object + * must be provided with + * a target method via a call to {@link CallSite#setTarget(MethodHandle) setTarget}, + * or by a subclass override of {@link CallSite#initialTarget(Class,String,MethodType) initialTarget}. + */ + public CallSite() { + } /** - * Make a call site given the parameters from a call to the bootstrap method. - * The resulting call site is in an unlinked state, which means that before - * it is returned from a bootstrap method call it must be provided with - * a target method via a call to {@link CallSite#setTarget}. - * @param caller the class in which the relevant {@code invokedynamic} instruction occurs - * @param name the name specified by the {@code invokedynamic} instruction - * @param type the method handle type derived from descriptor of the {@code invokedynamic} instruction + * Make a blank call site object, possibly equipped with an initial target method handle. + * The initial target reference may be null, in which case the {@code CallSite} object + * must be provided with a target method via a call to {@link CallSite#setTarget}, + * or by a subclass override of {@link CallSite#initialTarget}. + * @param target the method handle which will be the initial target of the call site, or null if there is none yet */ - public CallSite(Object caller, String name, MethodType type) { - super(IMPL_TOKEN, caller, name, type); + public CallSite(MethodHandle target) { + this.target = target; } - private static void privateInitializeCallSite(CallSite site, int callerMID, int callerBCI) { - site.callerMID = callerMID; - site.callerBCI = callerBCI; - site.ensureTarget(); + /** @deprecated transitional form defined in EDR but removed in PFD */ + public CallSite(Class<?> caller, String name, MethodType type) { + this.calleeNameRemoveForPFD = new MemberName(caller, name, type); + } + /** @deprecated transitional form defined in EDR but removed in PFD */ + public Class<?> callerClass() { + MemberName callee = this.calleeNameRemoveForPFD; + return callee == null ? null : callee.getDeclaringClass(); + } + /** @deprecated transitional form defined in EDR but removed in PFD */ + public String name() { + MemberName callee = this.calleeNameRemoveForPFD; + return callee == null ? null : callee.getName(); + } + /** @deprecated transitional form defined in EDR but removed in PFD */ + public MethodType type() { + MemberName callee = this.calleeNameRemoveForPFD; + return callee == null ? (target == null ? null : target.type()) : callee.getMethodType(); + } + /** @deprecated transitional form defined in EDR but removed in PFD */ + protected MethodHandle initialTarget() { + return initialTarget(callerClass(), name(), type()); } - private void ensureTarget() { - // Note use of super, which accesses the field directly, - // without deferring to possible subclass overrides. - if (super.getTarget() == null) { - super.setTarget(this.initialTarget()); - super.getTarget().type(); // provoke NPE if still null + + /** Report if the JVM has linked this {@code CallSite} object to a dynamic call site instruction. + * Once it is linked, it is never unlinked. + */ + private boolean isLinked() { + return vmmethod != null; + } + + /** Called from JVM (or low-level Java code) after the BSM returns the newly created CallSite. + * The parameters are JVM-specific. + */ + void initializeFromJVM(String name, + MethodType type, + MemberName callerMethod, + int callerBCI) { + if (this.isLinked()) { + throw new InvokeDynamicBootstrapError("call site has already been linked to an invokedynamic instruction"); } + MethodHandle target = this.target; + if (target == null) { + this.target = target = this.initialTarget(callerMethod.getDeclaringClass(), name, type); + } + if (!target.type().equals(type)) { + throw wrongTargetType(target, type); + } + this.vmindex = callerBCI; + this.vmmethod = callerMethod; + assert(this.isLinked()); } /** @@ -108,14 +200,18 @@ * the method {@code initialTarget} is called to produce an initial * non-null target. (Live call sites must never have null targets.) * <p> + * The arguments are the same as those passed to the bootstrap method. + * Thus, a bootstrap method is free to ignore the arguments and simply + * create a "blank" {@code CallSite} object of an appropriate subclass. + * <p> * If the bootstrap method itself does not initialize the call site, * this method must be overridden, because it just raises an * {@code InvokeDynamicBootstrapError}, which in turn causes the * linkage of the {@code invokedynamic} instruction to terminate * abnormally. */ - protected MethodHandle initialTarget() { - throw new InvokeDynamicBootstrapError("target must be initialized before call site is linked: "+this); + protected MethodHandle initialTarget(Class<?> callerClass, String name, MethodType type) { + throw new InvokeDynamicBootstrapError("target must be initialized before call site is linked: "+name+type); } /** @@ -137,11 +233,11 @@ * @see #setTarget */ public MethodHandle getTarget() { - return super.getTarget(); + return target; } /** - * Link or relink the call site, by setting its target method. + * Set the target method of this call site. * <p> * The interactions of {@code setTarget} with memory are the same * as of a write to an ordinary variable, such as an array element or a @@ -152,96 +248,46 @@ * Stronger guarantees can be created by putting appropriate operations * into the bootstrap method and/or the target methods used * at any given call site. - * @param target the new target, or null if it is to be unlinked + * @param newTarget the new target * @throws NullPointerException if the proposed new target is null - * @throws WrongMethodTypeException if the proposed new target - * has a method type that differs from the call site's {@link #type()} + * @throws WrongMethodTypeException if the call site is linked and the proposed new target + * has a method type that differs from the previous target */ - public void setTarget(MethodHandle target) { - checkTarget(target); - super.setTarget(target); - } - - protected void checkTarget(MethodHandle target) { - target.type(); // provoke NPE - if (!canSetTarget(target)) - throw new WrongMethodTypeException(String.valueOf(target)+target.type()+" should be of type "+type()); - } - - protected boolean canSetTarget(MethodHandle target) { - return (target != null && target.type() == type()); - } - - /** - * Report the class containing the call site. - * This is an immutable property of the call site, set from the first argument to the constructor. - * @return class containing the call site - */ - public Class<?> callerClass() { - return (Class) caller; + public void setTarget(MethodHandle newTarget) { + MethodType newType = newTarget.type(); // null check! + MethodHandle oldTarget = this.target; + if (oldTarget == null) { + // CallSite is not yet linked. + assert(!isLinked()); + this.target = newTarget; // might be null! + return; + } + MethodType oldType = oldTarget.type(); + if (!newTarget.type().equals(oldType)) + throw wrongTargetType(newTarget, oldType); + if (oldTarget != newTarget) + CallSiteImpl.setCallSiteTarget(IMPL_TOKEN, this, newTarget); } - /** - * Report the method name specified in the {@code invokedynamic} instruction. - * This is an immutable property of the call site, set from the second argument to the constructor. - * <p> - * Note that the name is a JVM bytecode name, and as such can be any - * non-empty string, as long as it does not contain certain "dangerous" - * characters such as slash {@code '/'} and dot {@code '.'}. - * See the Java Virtual Machine specification for more details. - * <p> - * Application such as a language runtimes may need to encode - * arbitrary program element names and other configuration information - * into the name. A standard convention for doing this is - * <a href="http://blogs.sun.com/jrose/entry/symbolic_freedom_in_the_vm">specified here</a>. - * @return method name specified by the call site - */ - public String name() { - return name; + private static WrongMethodTypeException wrongTargetType(MethodHandle target, MethodType type) { + return new WrongMethodTypeException(String.valueOf(target)+target.type()+" should be of type "+type); } - /** - * Report the method name specified in the {@code invokedynamic} instruction, - * as a series of components, individually demangled according to - * the standard convention - * <a href="http://blogs.sun.com/jrose/entry/symbolic_freedom_in_the_vm">specified here</a>. - * <p> - * Non-empty runs of characters between dangerous characters are demangled. - * Each component is either a completely arbitrary demangled string, - * or else a character constant for a punctuation character, typically ':'. - * (In principle, the character can be any dangerous character that the - * JVM lets through in a method name, such as '$' or ']'. - * Runtime implementors are encouraged to use colon ':' for building - * structured names.) - * <p> - * In the common case where the name contains no dangerous characters, - * the result is an array whose only element array is the demangled - * name at the call site. Such a demangled name can be any sequence - * of any number of any unicode characters. - * @return method name components specified by the call site + /** Produce a printed representation that displays information about this call site + * that may be useful to the human reader. */ - public Object[] nameComponents() { - return BytecodeName.parseBytecodeName(name); - } - - /** - * Report the resolved result and parameter types of this call site, - * which are derived from its bytecode-level invocation descriptor. - * The types are packaged into a {@link MethodType}. - * Any linked target of this call site must be exactly this method type. - * This is an immutable property of the call site, set from the third argument to the constructor. - * @return method type specified by the call site - */ - public MethodType type() { - return type; - } - @Override public String toString() { - return "CallSite#"+hashCode()+"["+name+type+" => "+getTarget()+"]"; + StringBuilder buf = new StringBuilder("CallSite#"); + buf.append(hashCode()); + if (!isLinked()) + buf.append("[unlinked]"); + else + buf.append("[") + .append("from ").append(vmmethod.getDeclaringClass().getName()) + .append(" : ").append(getTarget().type()) + .append(" => ").append(getTarget()) + .append("]"); + return buf.toString(); } - - // Package-local constant: - static final MethodHandle GET_TARGET = MethodHandleImpl.getLookup(IMPL_TOKEN). - findVirtual(CallSite.class, "getTarget", MethodType.methodType(MethodHandle.class)); }
--- a/jdk/src/share/classes/java/dyn/InvokeDynamic.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/InvokeDynamic.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,27 +26,25 @@ package java.dyn; /** - * Syntactic marker to request javac to emit an {@code invokedynamic} instruction. - * An {@code invokedynamic} instruction is a 5-byte bytecoded instruction - * which begins with an opcode byte of value 186 ({@code 0xBA}), - * and is followed by a two-byte index of a {@code NameAndType} constant - * pool entry, then by two zero bytes. The constant pool reference gives - * the method name and argument and return types of the call site; there - * is no other information provided at the call site. + * {@code InvokeDynamic} is a class with neither methods nor instances, + * which serves only as a syntactic marker in Java source code for + * an {@code invokedynamic} instruction. + * (See <a href="package-summary.html#jvm_mods">the package information</a> for specifics on this instruction.) * <p> * The {@code invokedynamic} instruction is incomplete without a target method. - * The target method is a property of the reified call site object - * (of type {@link CallSite}) which is in a one-to-one association with each - * corresponding {@code invokedynamic} instruction. The call site object - * is initially produced by a <em>bootstrap method</em> associated with - * the call site, via the various overloadings of {@link Linkage#registerBootstrapMethod}. + * The target method is a property of the reified {@linkplain CallSite call site object} + * which is linked to each active {@code invokedynamic} instruction. + * The call site object is initially produced by a + * {@linkplain java.dyn.Linkage#registerBootstrapMethod(Class, MethodHandle) bootstrap method} + * associated with the class whose bytecodes include the dynamic call site. * <p> * The type {@code InvokeDynamic} has no particular meaning as a * class or interface supertype, or an object type; it can never be instantiated. * Logically, it denotes a source of all dynamically typed methods. - * It may be viewed as a pure syntactic marker (an importable one) of static calls. + * It may be viewed as a pure syntactic marker of static calls. + * It may be imported for ease of use. * <p> - * Here are some examples of usage: + * Here are some examples: * <p><blockquote><pre> * Object x; String s; int i; * x = InvokeDynamic.greet("world"); // greet(Ljava/lang/String;)Ljava/lang/Object; @@ -65,6 +63,7 @@ * which must be registered by the static initializer of the enclosing class. * @author John Rose, JSR 292 EG */ +@MethodHandle.PolymorphicSignature public final class InvokeDynamic { private InvokeDynamic() { throw new InternalError(); } // do not instantiate
--- a/jdk/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -27,24 +27,29 @@ /** * Thrown to indicate that an {@code invokedynamic} instruction has - * failed to find its bootstrap method, or the bootstrap method has - * failed to provide a call site with a non-null target. + * failed to find its + * {@linkplain Linkage#registerBootstrapMethod(Class, MethodHandle) bootstrap method}, + * or the bootstrap method has + * failed to provide a + * {@linkplain CallSite} call site with a non-null {@linkplain MethodHandle target} + * of the correct {@linkplain MethodType method type}. * <p> - * The boostrap method must have been declared during a class's initialization - * by a call to {@link Linkage#registerBootstrapMethod}. + * The bootstrap method must have been declared during a class's initialization + * by a call to one of the overloadings of + * {@link Linkage#registerBootstrapMethod registerBootstrapMethod}. * * @author John Rose, JSR 292 EG */ public class InvokeDynamicBootstrapError extends LinkageError { /** - * Constructs a {@code InvokeDynamicBootstrapError} with no detail message. + * Constructs an {@code InvokeDynamicBootstrapError} with no detail message. */ public InvokeDynamicBootstrapError() { super(); } /** - * Constructs a {@code InvokeDynamicBootstrapError} with the specified + * Constructs an {@code InvokeDynamicBootstrapError} with the specified * detail message. * * @param s the detail message.
--- a/jdk/src/share/classes/java/dyn/JavaMethodHandle.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/JavaMethodHandle.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,7 +28,8 @@ import sun.dyn.Access; /** - * A Java method handle extends the basic method handle type with additional + * A Java method handle is a deprecated proposal for extending + * the basic method handle type with additional * programmer defined methods and fields. * Its behavior as a method handle is determined at instance creation time, * by providing the new instance with an "entry point" method handle @@ -62,11 +63,11 @@ * greeter.run(); // prints "hello, world" * // Statically typed method handle invocation (most direct): * MethodHandle mh = greeter; - * mh.<void>invoke(); // also prints "hello, world" + * mh.<void>invokeExact(); // also prints "hello, world" * // Dynamically typed method handle invocation: - * MethodHandles.invoke(greeter); // also prints "hello, world" + * MethodHandles.invokeExact(greeter); // also prints "hello, world" * greeter.setGreeting("howdy"); - * mh.invoke(); // prints "howdy, world" (object-like mutable behavior) + * mh.invokeExact(); // prints "howdy, world" (object-like mutable behavior) * </pre></blockquote> * <p> * In the example of {@code Greeter}, the method {@code run} provides the entry point. @@ -81,7 +82,7 @@ * inner class: * <p><blockquote><pre> * // We can also do this with symbolic names and/or inner classes: - * MethodHandles.invoke(new JavaMethodHandle("yow") { + * MethodHandles.invokeExact(new JavaMethodHandle("yow") { * void yow() { System.out.println("yow, world"); } * }); * </pre></blockquote> @@ -101,7 +102,7 @@ * Greeter greeter = new Greeter("world"); * greeter.run(); // prints "hello, world" * MethodHandle mh = MethodHanndles.insertArgument(Greeter.RUN, 0, greeter); - * mh.invoke(); // also prints "hello, world" + * mh.invokeExact(); // also prints "hello, world" * </pre></blockquote> * Note that the method handle must be separately created as a view on the base object. * This increases footprint, complexity, and dynamic indirections. @@ -113,7 +114,7 @@ * MethodHandle greeter = new JavaMethodHandle("run") { * private void run() { System.out.println("hello, "+greetee); } * } - * greeter.invoke(); // prints "hello, world" + * greeter.invokeExact(); // prints "hello, world" * </pre></blockquote> * <p> * Here is an abstract parameterized lvalue, efficiently expressed as a subtype of MethodHandle, @@ -137,10 +138,12 @@ * public Number get(long i) { return stuff[(int)i]; } * public void set(long i, Object x) { stuff[(int)i] = x; } * } - * int x = (Integer) stuffPtr.<Number>invoke(1L); // 456 - * stuffPtr.setter().<void>invoke(0L, (Number) 789); // replaces 123 with 789 + * int x = (Integer) stuffPtr.<Number>invokeExact(1L); // 456 + * stuffPtr.setter().<void>invokeExact(0L, (Number) 789); // replaces 123 with 789 * </pre></blockquote> * @see MethodHandle + * @deprecated The JSR 292 EG intends to replace {@code JavaMethodHandle} with + * an interface-based API for mixing method handle behavior with other classes. * @author John Rose, JSR 292 EG */ public abstract class JavaMethodHandle
--- a/jdk/src/share/classes/java/dyn/Linkage.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/Linkage.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,14 +25,19 @@ package java.dyn; +import java.lang.annotation.Annotation; import java.dyn.MethodHandles.Lookup; import java.util.WeakHashMap; import sun.dyn.Access; +import sun.dyn.MethodHandleImpl; import sun.reflect.Reflection; import static sun.dyn.util.VerifyAccess.checkBootstrapPrivilege; +import static sun.dyn.MemberName.newIllegalArgumentException; /** - * Static methods which control the linkage of invokedynamic call sites. + * This class consists exclusively of static methods that control + * the linkage of {@code invokedynamic} instructions, and specifically + * their reification as {@link CallSite} objects. * @author John Rose, JSR 292 EG */ public class Linkage { @@ -42,102 +47,137 @@ /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> - * Register a <em>bootstrap method</em> to use when linking a given caller class. - * It must be a method handle of a type equivalent to {@link CallSite#CallSite}. - * In other words, it must act as a factory method which accepts the arguments - * to {@code CallSite}'s constructor (a class, a string, and a method type), + * Register a <em>bootstrap method</em> to use when linking dynamic call sites within + * a given caller class. + * <p> + * A bootstrap method must be a method handle with a return type of {@link CallSite} + * and the following arguments: + * <ul> + * <li>the class containing the {@code invokedynamic} instruction, for which the bootstrap method was registered + * <li>the name of the method being invoked (a {@link String}) + * <li>the type of the method being invoked (a {@link MethodType}) + * <li><em>TBD</em> optionally, an unordered array of {@link Annotation}s attached to the call site + * <em>(Until this feature is implemented, this will always receive an empty array.)</em> + * </ul> + * <em>(TBD: The final argument type may be missing from the method handle's type. + * Additional arguments may be added in the future.)</em> + * The bootstrap method acts as a factory method which accepts the given arguments * and returns a {@code CallSite} object (possibly of a subclass of {@code CallSite}). * <p> - * The registration will fail with an {@code IllegalStateException} if any of the following conditions hold: + * The registration must take place exactly once, either before the class has begun + * being initialized, or from within the class's static initializer. + * Registration will fail with an exception if any of the following conditions hold: * <ul> - * <li>The caller of this method is in a different package than the {@code callerClass}, + * <li>The immediate caller of this method is in a different package than the given caller class, * and there is a security manager, and its {@code checkPermission} call throws * when passed {@link LinkagePermission}("registerBootstrapMethod",callerClass). - * <li>The given class already has a bootstrap method from a previous - * call to this method. - * <li>The given class is already fully initialized. - * <li>The given class is in the process of initialization, in another thread. - * <li>The same {@code CallSite} object has already been returned from - * a bootstrap method call to another {@code invokedynamic} call site. + * <li>The given caller class already has a bootstrap method registered. + * <li>The given caller class is already fully initialized. + * <li>The given caller class is in the process of initialization, in another thread. * </ul> * Because of these rules, a class may install its own bootstrap method in * a static initializer. * @param callerClass a class that may have {@code invokedynamic} sites * @param bootstrapMethod the method to use to bootstrap all such sites + * @exception IllegalArgumentException if the class argument is null or + * a primitive class, or if the bootstrap method is the wrong type + * @exception IllegalStateException if the class already has a bootstrap + * method, or if the its static initializer has already run + * or is already running in another thread + * @exception SecurityException if there is a security manager installed, + * and a {@link LinkagePermission} check fails for "registerBootstrapMethod" */ public static void registerBootstrapMethod(Class callerClass, MethodHandle bootstrapMethod) { Class callc = Reflection.getCallerClass(2); checkBootstrapPrivilege(callc, callerClass, "registerBootstrapMethod"); checkBSM(bootstrapMethod); - synchronized (bootstrapMethods) { - if (bootstrapMethods.containsKey(callerClass)) - throw new IllegalStateException("bootstrap method already declared in "+callerClass); - bootstrapMethods.put(callerClass, bootstrapMethod); - } + MethodHandleImpl.registerBootstrap(IMPL_TOKEN, callerClass, bootstrapMethod); } - static void checkBSM(MethodHandle mh) { - if (mh == null) throw new IllegalArgumentException("null bootstrap method"); - if (mh.type() == OLD_BOOTSTRAP_METHOD_TYPE) // FIXME: delete at EDR/PFD - throw new WrongMethodTypeException("bootstrap method must be a CallSite factory"); - if (mh.type() != BOOTSTRAP_METHOD_TYPE) - throw new WrongMethodTypeException(mh.toString()); + static private void checkBSM(MethodHandle mh) { + if (mh == null) throw newIllegalArgumentException("null bootstrap method"); + if (mh.type() == BOOTSTRAP_METHOD_TYPE_2) + // For now, always pass an empty array for the Annotations argument + mh = MethodHandles.insertArguments(mh, BOOTSTRAP_METHOD_TYPE_2.parameterCount()-1, + (Object)NO_ANNOTATIONS); + if (mh.type() == BOOTSTRAP_METHOD_TYPE) return; + throw new WrongMethodTypeException(mh.toString()); + } + static private final Annotation[] NO_ANNOTATIONS = { }; + + /** + * <em>PROVISIONAL API, WORK IN PROGRESS:</em> + * Simplified version of {@code registerBootstrapMethod} for self-registration, + * to be called from a static initializer. + * Finds a static method of the required type in the + * given runtime class, and installs it on the caller class. + * @throws NoSuchMethodException if there is no such method + * @throws IllegalStateException if the caller class's static initializer + * has already run, or is already running in another thread + */ + public static + void registerBootstrapMethod(Class<?> runtime, String name) { + Class callerClass = Reflection.getCallerClass(2); + registerBootstrapMethodLookup(callerClass, runtime, name); } /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> - * Simplified version of registerBootstrapMethod for self-registration, + * Simplified version of {@code registerBootstrapMethod} for self-registration, * to be called from a static initializer. * Finds a static method of the required type in the - * given class, and installs it on the caller. + * caller class itself, and installs it on the caller class. * @throws IllegalArgumentException if there is no such method + * @throws IllegalStateException if the caller class's static initializer + * has already run, or is already running in another thread */ public static - void registerBootstrapMethod(Class<?> runtime, String name) { - Class callc = Reflection.getCallerClass(2); - Lookup lookup = new Lookup(IMPL_TOKEN, callc); - MethodHandle bootstrapMethod = - lookup.findStatic(runtime, name, BOOTSTRAP_METHOD_TYPE); - // FIXME: exception processing wrong here + 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 both types. TBD + try { + bootstrapMethod = lookup.findStatic(runtime, name, BOOTSTRAP_METHOD_TYPE_2); + } catch (NoAccessException ex) { + bootstrapMethod = null; + } + if (bootstrapMethod == null) { + try { + bootstrapMethod = lookup.findStatic(runtime, name, BOOTSTRAP_METHOD_TYPE); + } catch (NoAccessException ex) { + throw new IllegalArgumentException("no such bootstrap method in "+runtime+": "+name, ex); + } + } checkBSM(bootstrapMethod); - Linkage.registerBootstrapMethod(callc, bootstrapMethod); + MethodHandleImpl.registerBootstrap(IMPL_TOKEN, callerClass, bootstrapMethod); } /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> - * Simplified version of registerBootstrapMethod for self-registration, - * to be called from a static initializer. - * Finds a static method of the required type in the - * caller's class, and installs it on the caller. - * @throws IllegalArgumentException if there is no such method - */ - public static - void registerBootstrapMethod(String name) { - Class callc = Reflection.getCallerClass(2); - Lookup lookup = new Lookup(IMPL_TOKEN, callc); - MethodHandle bootstrapMethod = - lookup.findStatic(callc, name, BOOTSTRAP_METHOD_TYPE); - // FIXME: exception processing wrong here - checkBSM(bootstrapMethod); - Linkage.registerBootstrapMethod(callc, bootstrapMethod); - } - - /** - * <em>PROVISIONAL API, WORK IN PROGRESS:</em> - * Report the bootstrap method registered for a given class. + * Report the bootstrap method registered for a given caller class. * Returns null if the class has never yet registered a bootstrap method. * Only callers privileged to set the bootstrap method may inquire * about it, because a bootstrap method is potentially a back-door entry * point into its class. + * @exception IllegalArgumentException if the argument is null or + * a primitive class + * @exception SecurityException if there is a security manager installed, + * and the immediate caller of this method is not in the same + * package as the caller class + * and a {@link LinkagePermission} check fails for "getBootstrapMethod" */ public static MethodHandle getBootstrapMethod(Class callerClass) { Class callc = Reflection.getCallerClass(2); - checkBootstrapPrivilege(callc, callerClass, "registerBootstrapMethod"); - synchronized (bootstrapMethods) { - return bootstrapMethods.get(callerClass); - } + checkBootstrapPrivilege(callc, callerClass, "getBootstrapMethod"); + return MethodHandleImpl.getBootstrap(IMPL_TOKEN, callerClass); } /** @@ -148,13 +188,10 @@ public static final MethodType BOOTSTRAP_METHOD_TYPE = MethodType.methodType(CallSite.class, Class.class, String.class, MethodType.class); - - private static final MethodType OLD_BOOTSTRAP_METHOD_TYPE - = MethodType.methodType(Object.class, - CallSite.class, Object[].class); - - private static final WeakHashMap<Class, MethodHandle> bootstrapMethods = - new WeakHashMap<Class, MethodHandle>(); + static final MethodType BOOTSTRAP_METHOD_TYPE_2 + = MethodType.methodType(CallSite.class, + Class.class, String.class, MethodType.class, + Annotation[].class); /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> @@ -182,10 +219,8 @@ /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> - * Invalidate all <code>invokedynamic</code> call sites in the bytecodes + * Invalidate all {@code invokedynamic} call sites in the bytecodes * of any methods of the given class. - * (These are exactly those sites which report the given class - * via the {@link CallSite#callerClass()} method.) * <p> * When this method returns, every matching <code>invokedynamic</code> * instruction will invoke its bootstrap method on next call. @@ -201,18 +236,4 @@ } throw new UnsupportedOperationException("NYI"); } - - private static Object doNotBootstrap(CallSite site, Object... arguments) { - throw new UnsupportedOperationException("call site must not have null target: "+site); - } - - private static final MethodHandle DO_NOT_BOOTSTRAP = - MethodHandles.Lookup.IMPL_LOOKUP.findStatic(Linkage.class, "doNotBootstrap", - OLD_BOOTSTRAP_METHOD_TYPE); - - // Up-call from the JVM. Obsolete. FIXME: Delete from VM then from here. - static - MethodHandle findBootstrapMethod(Class callerClass, Class searchBootstrapClass) { - return DO_NOT_BOOTSTRAP; - } }
--- a/jdk/src/share/classes/java/dyn/LinkagePermission.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/LinkagePermission.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,23 +31,17 @@ import java.util.StringTokenizer; /** - * This class is for runtime permissions. A RuntimePermission - * contains a name (also referred to as a "target name") but + * This class is for managing runtime permission checking for + * operations performed by methods in the {@link Linkage} class. + * Like a {@link RuntimePermission}, on which it is modeled, + * a {@code LinkagePermission} contains a target name but * no actions list; you either have the named permission * or you don't. - * - * <P> - * The target name is the name of the runtime permission (see below). The - * naming convention follows the hierarchical property naming convention. - * Also, an asterisk - * may appear at the end of the name, following a ".", or by itself, to - * signify a wildcard match. For example: "loadLibrary.*" or "*" is valid, - * "*loadLibrary" or "a*b" is not valid. - * <P> - * The following table lists all the possible RuntimePermission target names, + * <p> + * The following table lists all the possible {@code LinkagePermission} target names, * and for each provides a description of what the permission allows * and a discussion of the risks of granting code the permission. - * <P> + * <p> * * <table border=1 cellpadding=5 summary="permission target name, * what the target allows,and associated risks"> @@ -59,15 +53,17 @@ * * <tr> * <td>registerBootstrapMethod.{class name}</td> - * <td>Specifying a bootstrap method for invokedynamic, within a class of the given name</td> + * <td>Specifying a bootstrap method for {@code invokedynamic} instructions within a class of the given name</td> * <td>An attacker could attempt to attach a bootstrap method to a class which - * has just been loaded, thus gaining control of its invokedynamic calls.</td> + * has just been loaded, thus gaining control of its {@code invokedynamic} calls.</td> * </tr> * * <tr> * <td>invalidateAll</td> * <td>Force the relinking of invokedynamic call sites everywhere.</td> - * <td>This could allow an attacker to slow down the system, or perhaps surface timing bugs in a dynamic language implementations, by forcing redundant relinking operations.</td> + * <td>This could allow an attacker to slow down the system, + * or perhaps expose timing bugs in a dynamic language implementations, + * by forcing redundant relinking operations.</td> * </tr> * * @@ -78,7 +74,7 @@ * </tr> * </table> * - * @see java.security.BasicPermission + * @see java.security.RuntimePermission * @see java.lang.SecurityManager * * @author John Rose, JSR 292 EG
--- a/jdk/src/share/classes/java/dyn/MethodHandle.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/MethodHandle.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,32 +34,34 @@ import static sun.dyn.MemberName.newIllegalArgumentException; // utility /** - * A method handle is a typed reference to the entry point of a method. + * A method handle is a typed, directly executable reference to a method, + * constructor, field, or similar low-level operation, with optional + * conversion or substitution of arguments or return values. * <p> * Method handles are strongly typed according to signature. * They are not distinguished by method name or enclosing class. * A method handle must be invoked under a signature which exactly matches - * the method handle's own type. + * the method handle's own {@link MethodType method type}. * <p> - * Every method handle confesses its type via the <code>type</code> accessor. + * Every method handle confesses its type via the {@code type} accessor. * The structure of this type is a series of classes, one of which is - * the return type of the method (or <code>void.class</code> if none). + * the return type of the method (or {@code void.class} if none). * <p> * Every method handle appears as an object containing a method named - * <code>invoke</code>, whose signature exactly matches + * {@code invoke}, whose signature exactly matches * the method handle's type. * A Java method call expression, which compiles to an - * <code>invokevirtual</code> instruction, + * {@code invokevirtual} instruction, * can invoke this method from Java source code. * <p> * Every call to a method handle specifies an intended method type, * which must exactly match the type of the method handle. - * (The type is specified in the <code>invokevirtual</code> instruction, + * (The type is specified in the {@code invokevirtual} instruction, * via a {@code CONSTANT_NameAndType} constant pool entry.) * The call looks within the receiver object for a method - * named <code>invoke</code> of the intended method type. + * named {@code invoke} of the intended method type. * The call fails with a {@link WrongMethodTypeException} - * if the method does not exist, even if there is an <code>invoke</code> + * if the method does not exist, even if there is an {@code invoke} * method of a closely similar signature. * As with other kinds * of methods in the JVM, signature matching during method linkage @@ -76,13 +78,13 @@ * They should not be passed to untrusted code. * <p> * Bytecode in an extended JVM can directly call a method handle's - * <code>invoke</code> from an <code>invokevirtual</code> instruction. - * The receiver class type must be <code>MethodHandle</code> and the method name - * must be <code>invoke</code>. The signature of the invocation + * {@code invoke} from an {@code invokevirtual} instruction. + * The receiver class type must be {@code MethodHandle} and the method name + * must be {@code invoke}. The signature of the invocation * (after resolving symbolic type names) must exactly match the method type * of the target method. * <p> - * Every <code>invoke</code> method always throws {@link Exception}, + * Every {@code invoke} method always throws {@link Exception}, * which is to say that there is no static restriction on what a method handle * can throw. Since the JVM does not distinguish between checked * and unchecked exceptions (other than by their class, of course), @@ -92,11 +94,11 @@ * throw {@code Exception}, or else must catch all checked exceptions locally. * <p> * Bytecode in an extended JVM can directly obtain a method handle - * for any accessible method from a <code>ldc</code> instruction - * which refers to a <code>CONSTANT_Methodref</code> or - * <code>CONSTANT_InterfaceMethodref</code> constant pool entry. + * for any accessible method from a {@code ldc} instruction + * which refers to a {@code CONSTANT_Methodref} or + * {@code CONSTANT_InterfaceMethodref} constant pool entry. * <p> - * All JVMs can also use a reflective API called <code>MethodHandles</code> + * All JVMs can also use a reflective API called {@code MethodHandles} * for creating and calling method handles. * <p> * A method reference may refer either to a static or non-static method. @@ -104,7 +106,7 @@ * receiver argument, prepended before any other arguments. * In the method handle's type, the initial receiver argument is typed * according to the class under which the method was initially requested. - * (E.g., if a non-static method handle is obtained via <code>ldc</code>, + * (E.g., if a non-static method handle is obtained via {@code ldc}, * the type of the receiver is the class named in the constant pool entry.) * <p> * When a method handle to a virtual method is invoked, the method is @@ -113,38 +115,38 @@ * A non-virtual method handles to a specific virtual method implementation * can also be created. These do not perform virtual lookup based on * receiver type. Such a method handle simulates the effect of - * an <code>invokespecial</code> instruction to the same method. + * an {@code invokespecial} instruction to the same method. * <p> * Here are some examples of usage: * <p><blockquote><pre> - * Object x, y; String s; int i; - * MethodType mt; MethodHandle mh; - * MethodHandles.Lookup lookup = MethodHandles.lookup(); - * // mt is {(char,char) => String} - * mt = MethodType.make(String.class, char.class, char.class); - * mh = lookup.findVirtual(String.class, "replace", mt); - * // (Ljava/lang/String;CC)Ljava/lang/String; - * s = mh.<String>invoke("daddy",'d','n'); - * assert(s.equals("nanny")); - * // weakly typed invocation (using MHs.invoke) - * s = (String) MethodHandles.invoke(mh, "sappy", 'p', 'v'); - * assert(s.equals("savvy")); - * // mt is {Object[] => List} - * mt = MethodType.make(java.util.List.class, Object[].class); - * mh = lookup.findStatic(java.util.Arrays.class, "asList", mt); - * // mt is {(Object,Object,Object) => Object} - * mt = MethodType.makeGeneric(3); - * mh = MethodHandles.collectArguments(mh, mt); - * // mt is {(Object,Object,Object) => Object} - * // (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - * x = mh.invoke((Object)1, (Object)2, (Object)3); - * assert(x.equals(java.util.Arrays.asList(1,2,3))); - * // mt is { => int} - * mt = MethodType.make(int.class); - * mh = lookup.findVirtual(java.util.List.class, "size", mt); - * // (Ljava/util/List;)I - * i = mh.<int>invoke(java.util.Arrays.asList(1,2,3)); - * assert(i == 3); +Object x, y; String s; int i; +MethodType mt; MethodHandle mh; +MethodHandles.Lookup lookup = MethodHandles.lookup(); +// mt is {(char,char) => String} +mt = MethodType.methodType(String.class, char.class, char.class); +mh = lookup.findVirtual(String.class, "replace", mt); +// (Ljava/lang/String;CC)Ljava/lang/String; +s = mh.<String>invokeExact("daddy",'d','n'); +assert(s.equals("nanny")); +// weakly typed invocation (using MHs.invoke) +s = (String) mh.invokeVarargs("sappy", 'p', 'v'); +assert(s.equals("savvy")); +// mt is {Object[] => List} +mt = MethodType.methodType(java.util.List.class, Object[].class); +mh = lookup.findStatic(java.util.Arrays.class, "asList", mt); +// mt is {(Object,Object,Object) => Object} +mt = MethodType.genericMethodType(3); +mh = MethodHandles.collectArguments(mh, mt); +// mt is {(Object,Object,Object) => Object} +// (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +x = mh.invokeExact((Object)1, (Object)2, (Object)3); +assert(x.equals(java.util.Arrays.asList(1,2,3))); +// mt is { => int} +mt = MethodType.methodType(int.class); +mh = lookup.findVirtual(java.util.List.class, "size", mt); +// (Ljava/util/List;)I +i = mh.<int>invokeExact(java.util.Arrays.asList(1,2,3)); +assert(i == 3); * </pre></blockquote> * Each of the above calls generates a single invokevirtual instruction * with the name {@code invoke} and the type descriptors indicated in the comments. @@ -167,6 +169,14 @@ * those of multiple arities. It is impossible to represent such * genericity with a Java type parameter.</li> * </ol> + * Signature polymorphic methods in this class appear to be documented + * as having type parameters for return types and a parameter, but that is + * merely a documentation convention. These type parameters do + * not play a role in type-checking method handle invocations. + * <p> + * Note: Like classes and strings, method handles that correspond directly + * to fields and methods can be represented directly as constants to be + * loaded by {@code ldc} bytecodes. * * @see MethodType * @see MethodHandles @@ -180,7 +190,15 @@ private static Access IMPL_TOKEN = Access.getToken(); // interface MethodHandle<R throws X extends Exception,A...> - // { MethodType<R throws X,A...> type(); public R invoke(A...) throws X; } + // { MethodType<R throws X,A...> type(); public R invokeExact(A...) throws X; } + + /** + * Internal marker interface which distinguishes (to the Java compiler) + * those methods which are signature polymorphic. + */ + @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD,java.lang.annotation.ElementType.TYPE}) + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) + @interface PolymorphicSignature { } private MethodType type; @@ -232,85 +250,38 @@ return MethodHandleImpl.getNameString(IMPL_TOKEN, this); } - //// First draft of the "Method Handle Kernel API" discussed at the JVM Language Summit, 9/2009. + //// This is the "Method Handle Kernel API" discussed at the JVM Language Summit, 9/2009. //// Implementations here currently delegate to statics in MethodHandles. Some of those statics //// will be deprecated. Others will be kept as "algorithms" to supply degrees of freedom //// not present in the Kernel API. /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> - * Perform an exact invocation. The signature at the call site of {@code invokeExact} must + * Invoke the method handle, allowing any caller signature, but requiring an exact signature match. + * The signature at the call site of {@code invokeExact} must * exactly match this method handle's {@code type}. * No conversions are allowed on arguments or return values. - * <em>This is not yet implemented, pending required compiler and JVM support.</em> */ - public final <T> T invokeExact(Object... arguments) throws Throwable { - // This is an approximate implementation, which discards the caller's signature and refuses the call. - throw new InternalError("not yet implemented"); - } + public final native @PolymorphicSignature <R,A> R invokeExact(A... args) throws Throwable; + + // FIXME: remove this transitional form + /** @deprecated transitional form defined in EDR but removed in PFD */ + public final native @PolymorphicSignature <R,A> R invoke(A... args) throws Throwable; /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> - * Perform a generic invocation. The signature at the call site of {@code invokeExact} must + * Invoke the method handle, allowing any caller signature, + * and performing simple conversions for arguments and return types. + * The signature at the call site of {@code invokeGeneric} must * have the same arity as this method handle's {@code type}. * The same conversions are allowed on arguments or return values as are supported by * by {@link MethodHandles#convertArguments}. * If the call site signature exactly matches this method handle's {@code type}, * the call proceeds as if by {@link #invokeExact}. - * <em>This is not fully implemented, pending required compiler and JVM support.</em> */ - // This is an approximate implementation, which discards the caller's signature. - // When it is made signature polymorphic, the overloadings will disappear. - public final <T> T invokeGeneric() throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this); - } - public final <T> T invokeGeneric(Object a0) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0); - } - public final <T> T invokeGeneric(Object a0, Object a1) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2, Object a3) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2, a3); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2, Object a3, - Object a4) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2, a3, a4); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2, Object a3, - Object a4, Object a5) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2, a3, a4, a5); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2, Object a3, - Object a4, Object a5, Object a6) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2, a3, a4, a5, a6); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2, Object a3, - Object a4, Object a5, Object a6, Object a7) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2, a3, a4, a5, a6, a7); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2, Object a3, - Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2, a3, a4, a5, a6, a7, a8); - } - public final <T> T invokeGeneric(Object a0, Object a1, Object a2, Object a3, - Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - MethodHandle invoker = invokers(this.type()).genericInvoker(); - return invoker.<T>invoke(this, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); - } + public final native @PolymorphicSignature <R,A> R invokeGeneric(A... args) throws Throwable; + + // ?? public final native @PolymorphicSignature <R,A,V> R invokeVarargs(A args, V[] varargs) throws Throwable; /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> @@ -341,47 +312,47 @@ * This call is equivalent to the following code: * <p><blockquote><pre> * MethodHandle invoker = MethodHandles.genericInvoker(this.type(), 0, true); - * Object result = invoker.invoke(this, arguments); + * Object result = invoker.invokeExact(this, arguments); * </pre></blockquote> * @param arguments the arguments to pass to the target * @return the result returned by the target * @see MethodHandles#genericInvoker */ - public final Object invokeVarargs(Object[] arguments) throws Throwable { + public final Object invokeVarargs(Object... arguments) throws Throwable { int argc = arguments == null ? 0 : arguments.length; MethodType type = type(); if (argc <= 10) { MethodHandle invoker = MethodHandles.invokers(type).genericInvoker(); switch (argc) { - case 0: return invoker.invoke(this); - case 1: return invoker.invoke(this, + case 0: return invoker.invokeExact(this); + case 1: return invoker.invokeExact(this, arguments[0]); - case 2: return invoker.invoke(this, + case 2: return invoker.invokeExact(this, arguments[0], arguments[1]); - case 3: return invoker.invoke(this, + case 3: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2]); - case 4: return invoker.invoke(this, + case 4: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2], arguments[3]); - case 5: return invoker.invoke(this, + case 5: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2], arguments[3], arguments[4]); - case 6: return invoker.invoke(this, + case 6: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5]); - case 7: return invoker.invoke(this, + case 7: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6]); - case 8: return invoker.invoke(this, + case 8: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7]); - case 9: return invoker.invoke(this, + case 9: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7], arguments[8]); - case 10: return invoker.invoke(this, + case 10: return invoker.invokeExact(this, arguments[0], arguments[1], arguments[2], arguments[3], arguments[4], arguments[5], arguments[6], arguments[7], arguments[8], @@ -391,7 +362,7 @@ // more than ten arguments get boxed in a varargs list: MethodHandle invoker = MethodHandles.invokers(type).varargsInvoker(0); - return invoker.invoke(this, arguments); + return invoker.invokeExact(this, arguments); } /** Equivalent to {@code invokeVarargs(arguments.toArray())}. */ public final Object invokeVarargs(java.util.List<?> arguments) throws Throwable {
--- a/jdk/src/share/classes/java/dyn/MethodHandles.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/MethodHandles.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -44,13 +44,13 @@ import static sun.dyn.MemberName.newNoAccessException; /** - * Fundamental operations and utilities for MethodHandle. - * They fall into several categories: + * This class consists exclusively of static methods that operate on or return + * method handles. They fall into several categories: * <ul> - * <li>Reifying methods and fields. This is subject to access checks. - * <li>Invoking method handles on dynamically typed arguments and/or varargs arrays. - * <li>Combining or transforming pre-existing method handles into new ones. - * <li>Miscellaneous emulation of common JVM operations or control flow patterns. + * <li>Factory methods which create method handles for methods and fields. + * <li>Invoker methods which can invoke method handles on dynamically typed arguments and/or varargs arrays. + * <li>Combinator methods, which combine or transforming pre-existing method handles into new ones. + * <li>Factory methods which create method handles that emulate other common JVM operations or control flow patterns. * </ul> * <p> * @author John Rose, JSR 292 EG @@ -66,36 +66,44 @@ //// Method handle creation from ordinary methods. - /** Create a {@link Lookup} lookup object on the caller. - * + /** + * Return a {@link Lookup lookup object} on the caller, + * which has the capability to access any method handle that the caller has access to, + * including direct method handles to private fields and methods. + * This lookup object is a <em>capability</em> which may be delegated to trusted agents. + * Do not store it in place where untrusted code can access it. */ public static Lookup lookup() { return new Lookup(); } - /** Version of lookup which is trusted minimally. - * It can only be used to create method handles to - * publicly accessible members. + /** + * Return a {@link Lookup lookup object} which is trusted minimally. + * It can only be used to create method handles to + * publicly accessible fields and methods. */ public static Lookup publicLookup() { return Lookup.PUBLIC_LOOKUP; } /** - * A factory object for creating method handles, when the creation - * requires access checking. Method handles do not perform + * A <em>lookup object</em> is a factory for creating method handles, + * when the creation requires access checking. + * Method handles do not perform * access checks when they are called; this is a major difference * from reflective {@link Method}, which performs access checking - * against every caller, on every call. Method handle access - * restrictions are enforced when a method handle is created. + * against every caller, on every call. + * Therefore, method handle access + * restrictions must be enforced when a method handle is created. * The caller class against which those restrictions are enforced - * is known as the "lookup class". {@link Lookup} embodies an + * is known as the {@linkplain #lookupClass lookup class}. + * A lookup object embodies an * authenticated lookup class, and can be used to create any number * of access-checked method handles, all checked against a single * lookup class. * <p> * A class which needs to create method handles will call - * {@code MethodHandles.lookup()} to create a factory for itself. + * {@link MethodHandles#lookup MethodHandles.lookup} to create a factory for itself. * It may then use this factory to create method handles on * all of its methods, including private ones. * It may also delegate the lookup (e.g., to a metaobject protocol) @@ -104,12 +112,13 @@ * checked against the original lookup class, and not with any higher * privileges. * <p> - * Note that access checks only apply to named and reflected methods. - * Other method handle creation methods, such as {@link #convertArguments}, + * Access checks only apply to named and reflected methods. + * Other method handle creation methods, such as + * {@link #convertArguments MethodHandles.convertArguments}, * do not require any access checks, and can be done independently * of any lookup class. - * <p> - * <em>A note about error conditions:<em> A lookup can fail, because + * <h3>How access errors are handled</h3> + * A lookup can fail, because * the containing class is not accessible to the lookup class, or * because the desired class member is missing, or because the * desired class member is not accessible to the lookup class. @@ -124,8 +133,25 @@ */ public static final class Lookup { + /** The class on behalf of whom the lookup is being performed. */ private final Class<?> lookupClass; + /** The allowed sorts of members which may be looked up (public, etc.), with STRICT for package. */ + private final int allowedModes; + + private static final int + PUBLIC = Modifier.PUBLIC, + PACKAGE = Modifier.STRICT, + PROTECTED = Modifier.PROTECTED, + PRIVATE = Modifier.PRIVATE, + ALL_MODES = (PUBLIC | PACKAGE | PROTECTED | PRIVATE), + TRUSTED = -1; + + private static int fixmods(int mods) { + mods &= (ALL_MODES - PACKAGE); + return (mods != 0) ? mods : PACKAGE; + } + /** Which class is performing the lookup? It is this class against * which checks are performed for visibility and access permissions. * <p> @@ -136,57 +162,90 @@ return lookupClass; } + // This is just for calling out to MethodHandleImpl. + private Class<?> lookupClassOrNull() { + return (allowedModes == TRUSTED) ? null : lookupClass; + } + + /** Which types of members can this lookup object produce? + * The result is a bit-mask of the modifier bits PUBLIC, PROTECTED, PRIVATE, and STRICT. + * The modifier bit STRICT stands in for the (non-existent) package protection mode. + */ + int lookupModes() { + return allowedModes & ALL_MODES; + } + /** Embody the current class (the lookupClass) as a lookup class * for method handle creation. * Must be called by from a method in this package, * which in turn is called by a method not in this package. + * <p> * Also, don't make it private, lest javac interpose * an access$N method. */ Lookup() { - this(IMPL_TOKEN, getCallerClassAtEntryPoint()); + this(getCallerClassAtEntryPoint(), ALL_MODES); + // make sure we haven't accidentally picked up a privileged class: + checkUnprivilegedlookupClass(lookupClass); } Lookup(Access token, Class<?> lookupClass) { - // make sure we haven't accidentally picked up a privileged class: - checkUnprivilegedlookupClass(lookupClass); + this(lookupClass, ALL_MODES); + Access.check(token); + } + + private Lookup(Class<?> lookupClass, int allowedModes) { this.lookupClass = lookupClass; + this.allowedModes = allowedModes; } /** - * Create a lookup on the specified class. - * The result is guaranteed to have no more access privileges - * than the original. + * Create a lookup on the specified new lookup class. + * The resulting object will report the specified + * class as its own {@link #lookupClass}. + * <p> + * However, the resulting {@code Lookup} object is guaranteed + * to have no more access capabilities than the original. + * In particular:<ul> + * <li>If the new lookup class differs from the old one, + * protected members will not be accessible by virtue of inheritance. + * <li>If the new lookup class is in a different package + * than the old one, protected and default (package) members will not be accessible. + * <li>If the new lookup class is not within the same package member + * as the old one, private members will not be accessible. + * <li>In all cases, public members will continue to be accessible. + * </ul> */ - public Lookup in(Class<?> newLookupClass) { - if (this == PUBLIC_LOOKUP) return PUBLIC_LOOKUP; - if (newLookupClass == null) return PUBLIC_LOOKUP; - if (newLookupClass == lookupClass) return this; - if (this != IMPL_LOOKUP) { - if (!VerifyAccess.isSamePackage(lookupClass, newLookupClass)) - throw newNoAccessException(new MemberName(newLookupClass), this); - checkUnprivilegedlookupClass(newLookupClass); + public Lookup in(Class<?> requestedLookupClass) { + requestedLookupClass.getClass(); // null check + if (allowedModes == TRUSTED) // IMPL_LOOKUP can make any lookup at all + return new Lookup(requestedLookupClass, ALL_MODES); + if (requestedLookupClass == this.lookupClass) + return this; // keep same capabilities + int newModes = (allowedModes & (ALL_MODES & ~PROTECTED)); + if ((newModes & PACKAGE) != 0 + && !VerifyAccess.isSamePackage(this.lookupClass, requestedLookupClass)) { + newModes &= ~(PACKAGE|PRIVATE); } - return new Lookup(newLookupClass); - } - - private Lookup(Class<?> lookupClass) { - this.lookupClass = lookupClass; + if ((newModes & PRIVATE) != 0 + && !VerifyAccess.isSamePackageMember(this.lookupClass, requestedLookupClass)) { + newModes &= ~PRIVATE; + } + checkUnprivilegedlookupClass(requestedLookupClass); + return new Lookup(requestedLookupClass, newModes); } // Make sure outer class is initialized first. static { IMPL_TOKEN.getClass(); } - private static final Class<?> PUBLIC_ONLY = sun.dyn.empty.Empty.class; - /** Version of lookup which is trusted minimally. * It can only be used to create method handles to * publicly accessible members. */ - static final Lookup PUBLIC_LOOKUP = new Lookup(PUBLIC_ONLY); + static final Lookup PUBLIC_LOOKUP = new Lookup(Object.class, PUBLIC); /** Package-private version of lookup which is trusted. */ - static final Lookup IMPL_LOOKUP = new Lookup(null); + static final Lookup IMPL_LOOKUP = new Lookup(Object.class, TRUSTED); static { MethodHandleImpl.initLookup(IMPL_TOKEN, IMPL_LOOKUP); } private static void checkUnprivilegedlookupClass(Class<?> lookupClass) { @@ -195,13 +254,35 @@ throw newIllegalArgumentException("illegal lookupClass: "+lookupClass); } + /** Display the name of the class. + * If there are restrictions on the access permitted to this lookup, + * display those also. + */ @Override public String toString() { - if (lookupClass == PUBLIC_ONLY) - return "public"; - if (lookupClass == null) - return "privileged"; - return lookupClass.getName(); + String modestr; + String cname = lookupClass.getName(); + switch (allowedModes) { + case TRUSTED: + return "/trusted"; + case PUBLIC: + modestr = "/public"; + if (lookupClass == Object.class) + return modestr; + break; + case PUBLIC|PACKAGE: + return cname + "/package"; + case 0: // should not happen + return cname + "/empty"; + case ALL_MODES: + return cname; + } + StringBuilder buf = new StringBuilder(cname); + if ((allowedModes & PUBLIC) != 0) buf.append("/public"); + if ((allowedModes & PACKAGE) != 0) buf.append("/package"); + if ((allowedModes & PROTECTED) != 0) buf.append("/protected"); + if ((allowedModes & PRIVATE) != 0) buf.append("/private"); + return buf.toString(); } // call this from an entry point method in Lookup with extraFrames=0. @@ -219,11 +300,11 @@ * The type of the method handle will be that of the method. * (Since static methods do not take receivers, there is no * additional receiver argument inserted into the method handle type, - * as there would be with {@linkplain #findVirtual} or {@linkplain #findSpecial}.) + * as there would be with {@link #findVirtual} or {@link #findSpecial}.) * The method and all its argument types must be accessible to the lookup class. * If the method's class has not yet been initialized, that is done * immediately, before the method handle is returned. - * @param defc the class from which the method is accessed + * @param refc the class from which the method is accessed * @param name the name of the method * @param type the type of the method * @return the desired method handle @@ -231,18 +312,16 @@ * @exception NoAccessException if the method does not exist or access checking fails */ public - MethodHandle findStatic(Class<?> defc, String name, MethodType type) throws NoAccessException { - MemberName method = IMPL_NAMES.resolveOrFail(new MemberName(defc, name, type, Modifier.STATIC), true, lookupClass()); - VerifyAccess.checkName(method, this); - checkStatic(true, method, this); - //throw NoSuchMethodException - return MethodHandleImpl.findMethod(IMPL_TOKEN, method, false, lookupClass()); + MethodHandle findStatic(Class<?> refc, String name, MethodType type) throws NoAccessException { + MemberName method = resolveOrFail(refc, name, type, true); + checkMethod(refc, method, true); + return MethodHandleImpl.findMethod(IMPL_TOKEN, method, false, lookupClassOrNull()); } /** * Produce a method handle for a virtual method. * The type of the method handle will be that of the method, - * with the receiver type ({@code defc}) prepended. + * with the receiver type (usually {@code refc}) prepended. * The method and all its argument types must be accessible to the lookup class. * <p> * (<em>BUG NOTE:</em> The type {@code Object} may be prepended instead @@ -257,18 +336,44 @@ * implementation to enter. * (The dispatching action is identical with that performed by an * {@code invokevirtual} or {@code invokeinterface} instruction.) - * @param defc the class or interface from which the method is accessed + * @param refc the class or interface from which the method is accessed * @param name the name of the method * @param type the type of the method, with the receiver argument omitted * @return the desired method handle * @exception SecurityException <em>TBD</em> * @exception NoAccessException if the method does not exist or access checking fails */ - public MethodHandle findVirtual(Class<?> defc, String name, MethodType type) throws NoAccessException { - MemberName method = IMPL_NAMES.resolveOrFail(new MemberName(defc, name, type), true, lookupClass()); - VerifyAccess.checkName(method, this); - checkStatic(false, method, this); - return MethodHandleImpl.findMethod(IMPL_TOKEN, method, true, lookupClass()); + public MethodHandle findVirtual(Class<?> refc, String name, MethodType type) throws NoAccessException { + MemberName method = resolveOrFail(refc, name, type, false); + checkMethod(refc, method, false); + MethodHandle mh = MethodHandleImpl.findMethod(IMPL_TOKEN, method, true, lookupClassOrNull()); + return restrictProtectedReceiver(method, mh); + } + + /** + * Produce a method handle which creates an object and initializes it, using + * the constructor of the specified type. + * The parameter types of the method handle will be those of the constructor, + * while the return type will be a reference to the constructor's class. + * The constructor and all its argument types must be accessible to the lookup class. + * If the constructor's class has not yet been initialized, that is done + * immediately, before the method handle is returned. + * <p> + * Note: The requested type must have a return type of {@code void}. + * This is consistent with the JVM's treatment of constructor signatures. + * @param refc the class or interface from which the method is accessed + * @param type the type of the method, with the receiver argument omitted, and a void return type + * @return the desired method handle + * @exception SecurityException <em>TBD</em> + * @exception NoAccessException if the method does not exist or access checking fails + */ + public MethodHandle findConstructor(Class<?> refc, MethodType type) throws NoAccessException { + String name = "<init>"; + MemberName ctor = resolveOrFail(refc, name, type, false, false, lookupClassOrNull()); + assert(ctor.isConstructor()); + checkAccess(refc, ctor); + MethodHandle rawMH = MethodHandleImpl.findMethod(IMPL_TOKEN, ctor, false, lookupClassOrNull()); + return MethodHandleImpl.makeAllocator(IMPL_TOKEN, rawMH); } /** @@ -287,27 +392,87 @@ * <p> * If the explicitly specified caller class is not identical with the * lookup class, a security check TBD is performed. - * @param defc the class or interface from which the method is accessed - * @param name the name of the method, or "<init>" for a constructor + * @param refc the class or interface from which the method is accessed + * @param name the name of the method (which must not be "<init>") * @param type the type of the method, with the receiver argument omitted * @param specialCaller the proposed calling class to perform the {@code invokespecial} * @return the desired method handle * @exception SecurityException <em>TBD</em> * @exception NoAccessException if the method does not exist or access checking fails */ - public MethodHandle findSpecial(Class<?> defc, String name, MethodType type, + public MethodHandle findSpecial(Class<?> refc, String name, MethodType type, Class<?> specialCaller) throws NoAccessException { - checkSpecialCaller(specialCaller, this); - Lookup slookup = this.in(specialCaller); - MemberName method = IMPL_NAMES.resolveOrFail(new MemberName(defc, name, type), false, slookup.lookupClass()); - VerifyAccess.checkName(method, this); - checkStatic(false, method, this); - if (name.equals("<init>")) { - throw newNoAccessException("cannot directly invoke a constructor", method, null); - } else if (defc.isInterface() || !defc.isAssignableFrom(specialCaller)) { - throw newNoAccessException("method must be in a superclass of lookup class", method, slookup.lookupClass()); - } - return MethodHandleImpl.findMethod(IMPL_TOKEN, method, false, slookup.lookupClass()); + checkSpecialCaller(specialCaller); + MemberName method = resolveOrFail(refc, name, type, false, false, specialCaller); + checkMethod(refc, method, false); + MethodHandle mh = MethodHandleImpl.findMethod(IMPL_TOKEN, method, false, specialCaller); + return restrictReceiver(method, mh, specialCaller); + } + + /** + * <em>PROVISIONAL API, WORK IN PROGRESS:</em> + * Produce a method handle giving read access to a non-static field. + * The type of the method handle will have a return type of the field's + * value type. + * The method handle's single argument will be the instance containing + * the field. + * Access checking is performed immediately on behalf of the lookup class. + * @param name the field's name + * @param type the field's type + * @return a method handle which can load values from the field + * @exception NoAccessException if access checking fails + */ + public MethodHandle findGetter(Class<?> refc, String name, Class<?> type) throws NoAccessException { + return makeAccessor(refc, name, type, false, false); + } + + /** + * <em>PROVISIONAL API, WORK IN PROGRESS:</em> + * Produce a method handle giving write access to a non-static field. + * The type of the method handle will have a void return type. + * The method handle will take two arguments, the instance containing + * the field, and the value to be stored. + * The second argument will be of the field's value type. + * Access checking is performed immediately on behalf of the lookup class. + * @param name the field's name + * @param type the field's type + * @return a method handle which can store values into the field + * @exception NoAccessException if access checking fails + */ + public MethodHandle findSetter(Class<?> refc, String name, Class<?> type) throws NoAccessException { + return makeAccessor(refc, name, type, false, true); + } + + /** + * <em>PROVISIONAL API, WORK IN PROGRESS:</em> + * Produce a method handle giving read access to a static field. + * The type of the method handle will have a return type of the field's + * value type. + * The method handle will take no arguments. + * Access checking is performed immediately on behalf of the lookup class. + * @param name the field's name + * @param type the field's type + * @return a method handle which can load values from the field + * @exception NoAccessException if access checking fails + */ + public MethodHandle findStaticGetter(Class<?> refc, String name, Class<?> type) throws NoAccessException { + return makeAccessor(refc, name, type, true, false); + } + + /** + * <em>PROVISIONAL API, WORK IN PROGRESS:</em> + * Produce a method handle giving write access to a static field. + * The type of the method handle will have a void return type. + * The method handle will take a single + * argument, of the field's value type, the value to be stored. + * Access checking is performed immediately on behalf of the lookup class. + * @param name the field's name + * @param type the field's type + * @return a method handle which can store values into the field + * @exception NoAccessException if access checking fails + */ + public MethodHandle findStaticSetter(Class<?> refc, String name, Class<?> type) throws NoAccessException { + return makeAccessor(refc, name, type, true, true); } /** @@ -323,7 +488,7 @@ * <p> * This is equivalent to the following expression: * <code> - * {@link #insertArguments}({@link #findVirtual}(defc, name, type), receiver) + * {@link #insertArguments insertArguments}({@link #findVirtual findVirtual}(defc, name, type), receiver) * </code> * where {@code defc} is either {@code receiver.getClass()} or a super * type of that class, in which the requested method is accessible @@ -336,15 +501,13 @@ * @exception NoAccessException if the method does not exist or access checking fails */ public MethodHandle bind(Object receiver, String name, MethodType type) throws NoAccessException { - Class<? extends Object> rcvc = receiver.getClass(); // may get NPE - MemberName reference = new MemberName(rcvc, name, type); - MemberName method = IMPL_NAMES.resolveOrFail(reference, true, lookupClass()); - VerifyAccess.checkName(method, this); - checkStatic(false, method, this); - MethodHandle dmh = MethodHandleImpl.findMethod(IMPL_TOKEN, method, true, lookupClass()); + Class<? extends Object> refc = receiver.getClass(); // may get NPE + MemberName method = resolveOrFail(refc, name, type, false); + checkMethod(refc, method, false); + MethodHandle dmh = MethodHandleImpl.findMethod(IMPL_TOKEN, method, true, lookupClassOrNull()); MethodHandle bmh = MethodHandleImpl.bindReceiver(IMPL_TOKEN, dmh, receiver); if (bmh == null) - throw newNoAccessException(method, this); + throw newNoAccessException(method, lookupClass()); return bmh; } @@ -364,29 +527,37 @@ * @exception NoAccessException if access checking fails */ public MethodHandle unreflect(Method m) throws NoAccessException { - return unreflectImpl(new MemberName(m), m.isAccessible(), true, false, this); + MemberName method = new MemberName(m); + assert(method.isMethod()); + if (!m.isAccessible()) checkMethod(method.getDeclaringClass(), method, method.isStatic()); + MethodHandle mh = MethodHandleImpl.findMethod(IMPL_TOKEN, method, true, lookupClassOrNull()); + if (!m.isAccessible()) mh = restrictProtectedReceiver(method, mh); + return mh; } /** * <em>PROVISIONAL API, WORK IN PROGRESS:</em> * Produce a method handle for a reflected method. * It will bypass checks for overriding methods on the receiver, - * as if by the {@code invokespecial} instruction. + * as if by a {@code invokespecial} instruction from within the {@code specialCaller}. * The type of the method handle will be that of the method, - * with the receiver type prepended. + * with the special caller type prepended (and <em>not</em> the receiver of the method). * If the method's {@code accessible} flag is not set, * access checking is performed immediately on behalf of the lookup class, * as if {@code invokespecial} instruction were being linked. * @param m the reflected method + * @param specialCaller the class nominally calling the method * @return a method handle which can invoke the reflected method * @exception NoAccessException if access checking fails */ public MethodHandle unreflectSpecial(Method m, Class<?> specialCaller) throws NoAccessException { - checkSpecialCaller(specialCaller, this); - Lookup slookup = this.in(specialCaller); - MemberName mname = new MemberName(m); - checkStatic(false, mname, this); - return unreflectImpl(mname, m.isAccessible(), false, false, slookup); + checkSpecialCaller(specialCaller); + MemberName method = new MemberName(m); + assert(method.isMethod()); + // ignore m.isAccessible: this is a new kind of access + checkMethod(m.getDeclaringClass(), method, false); + MethodHandle mh = MethodHandleImpl.findMethod(IMPL_TOKEN, method, false, lookupClassOrNull()); + return restrictReceiver(method, mh, specialCaller); } /** @@ -400,13 +571,16 @@ * <p> * If the constructor's {@code accessible} flag is not set, * access checking is performed immediately on behalf of the lookup class. - * @param ctor the reflected constructor + * @param c the reflected constructor * @return a method handle which can invoke the reflected constructor * @exception NoAccessException if access checking fails */ - public MethodHandle unreflectConstructor(Constructor ctor) throws NoAccessException { - MemberName m = new MemberName(ctor); - return unreflectImpl(m, ctor.isAccessible(), false, false, this); + public MethodHandle unreflectConstructor(Constructor c) throws NoAccessException { + MemberName ctor = new MemberName(c); + assert(ctor.isConstructor()); + if (!c.isAccessible()) checkAccess(c.getDeclaringClass(), ctor); + MethodHandle rawCtor = MethodHandleImpl.findMethod(IMPL_TOKEN, ctor, false, lookupClassOrNull()); + return MethodHandleImpl.makeAllocator(IMPL_TOKEN, rawCtor); } /** @@ -424,8 +598,7 @@ * @exception NoAccessException if access checking fails */ public MethodHandle unreflectGetter(Field f) throws NoAccessException { - MemberName m = new MemberName(f); - return unreflectImpl(m, f.isAccessible(), false, false, this); + return makeAccessor(f.getDeclaringClass(), new MemberName(f), f.isAccessible(), false); } /** @@ -443,75 +616,134 @@ * @exception NoAccessException if access checking fails */ public MethodHandle unreflectSetter(Field f) throws NoAccessException { - MemberName m = new MemberName(f); - return unreflectImpl(m, f.isAccessible(), false, true, this); + return makeAccessor(f.getDeclaringClass(), new MemberName(f), f.isAccessible(), true); + } + + /// Helper methods, all package-private. + + MemberName resolveOrFail(Class<?> refc, String name, Class<?> type, boolean isStatic) { + checkSymbolicClass(refc); // do this before attempting to resolve + int mods = (isStatic ? Modifier.STATIC : 0); + return IMPL_NAMES.resolveOrFail(new MemberName(refc, name, type, mods), true, lookupClassOrNull()); + } + + MemberName resolveOrFail(Class<?> refc, String name, MethodType type, boolean isStatic) { + checkSymbolicClass(refc); // do this before attempting to resolve + int mods = (isStatic ? Modifier.STATIC : 0); + return IMPL_NAMES.resolveOrFail(new MemberName(refc, name, type, mods), true, lookupClassOrNull()); + } + + MemberName resolveOrFail(Class<?> refc, String name, MethodType type, boolean isStatic, + boolean searchSupers, Class<?> specialCaller) { + checkSymbolicClass(refc); // do this before attempting to resolve + int mods = (isStatic ? Modifier.STATIC : 0); + return IMPL_NAMES.resolveOrFail(new MemberName(refc, name, type, mods), searchSupers, specialCaller); + } + + void checkSymbolicClass(Class<?> refc) { + Class<?> caller = lookupClassOrNull(); + if (caller != null && !VerifyAccess.isClassAccessible(refc, caller)) + throw newNoAccessException("symbolic reference class is not public", new MemberName(refc), caller); + } + + void checkMethod(Class<?> refc, MemberName m, boolean wantStatic) { + String message; + if (m.isConstructor()) + message = "expected a method, not a constructor"; + else if (!m.isMethod()) + message = "expected a method"; + else if (wantStatic != m.isStatic()) + message = wantStatic ? "expected a static method" : "expected a non-static method"; + else + { checkAccess(refc, m); return; } + throw newNoAccessException(message, m, lookupClass()); + } + + void checkAccess(Class<?> refc, MemberName m) { + int allowedModes = this.allowedModes; + if (allowedModes == TRUSTED) return; + int mods = m.getModifiers(); + if (Modifier.isPublic(mods) && Modifier.isPublic(refc.getModifiers())) + return; // common case + int requestedModes = fixmods(mods); // adjust 0 => PACKAGE + if ((requestedModes & allowedModes) != 0 + && VerifyAccess.isMemberAccessible(refc, m.getDeclaringClass(), + mods, lookupClass())) + return; + if (((requestedModes & ~allowedModes) & PROTECTED) != 0 + && VerifyAccess.isSamePackage(m.getDeclaringClass(), lookupClass())) + // Protected members can also be checked as if they were package-private. + return; + throw newNoAccessException(accessFailedMessage(refc, m), m, lookupClass()); } - } - - static /*must not be public*/ - MethodHandle findStaticFrom(Lookup lookup, - Class<?> defc, String name, MethodType type) throws NoAccessException { - MemberName method = IMPL_NAMES.resolveOrFail(new MemberName(defc, name, type, Modifier.STATIC), true, lookup.lookupClass()); - VerifyAccess.checkName(method, lookup); - checkStatic(true, method, lookup); - return MethodHandleImpl.findMethod(IMPL_TOKEN, method, false, lookup.lookupClass()); - } + String accessFailedMessage(Class<?> refc, MemberName m) { + Class<?> defc = m.getDeclaringClass(); + int mods = m.getModifiers(); + if (!VerifyAccess.isClassAccessible(defc, lookupClass())) + return "class is not public"; + if (refc != defc && !VerifyAccess.isClassAccessible(refc, lookupClass())) + return "symbolic reference "+refc.getName()+" is not public"; + if (Modifier.isPublic(mods)) + return "access to public member failed"; // (how?) + else if (allowedModes == PUBLIC) + return "member is not public"; + if (Modifier.isPrivate(mods)) + return "member is private"; + if (Modifier.isProtected(mods)) + return "member is protected"; + return "member is private to package"; + } - static void checkStatic(boolean wantStatic, MemberName m, Lookup lookup) { - if (wantStatic != m.isStatic()) { - String message = wantStatic ? "expected a static method" : "expected a non-static method"; - throw newNoAccessException(message, m, lookup.lookupClass()); + void checkSpecialCaller(Class<?> specialCaller) { + if (allowedModes == TRUSTED) return; + if (!VerifyAccess.isSamePackageMember(specialCaller, lookupClass())) + throw newNoAccessException("no private access for invokespecial", + new MemberName(specialCaller), lookupClass()); } - } - - static void checkSpecialCaller(Class<?> specialCaller, Lookup lookup) { - if (lookup == Lookup.IMPL_LOOKUP) - return; // privileged action - assert(lookup.lookupClass() != null); - if (!VerifyAccess.isSamePackageMember(specialCaller, lookup.lookupClass())) - throw newNoAccessException("no private access", new MemberName(specialCaller), lookup.lookupClass()); - } - // Helper for creating handles on reflected methods and constructors. - static MethodHandle unreflectImpl(MemberName m, boolean isAccessible, - boolean doDispatch, boolean isSetter, Lookup lookup) { - MethodType narrowMethodType = null; - Class<?> defc = m.getDeclaringClass(); - boolean isSpecialInvoke = m.isInvocable() && !doDispatch; - int mods = m.getModifiers(); - if (m.isStatic()) { - if (!isAccessible && - VerifyAccess.isAccessible(defc, mods, lookup.lookupClass(), false) == null) - throw newNoAccessException(m, lookup); - } else { - Class<?> constraint; - if (isAccessible) { - // abbreviated access check for "unlocked" method - constraint = doDispatch ? defc : lookup.lookupClass(); - } else { - constraint = VerifyAccess.isAccessible(defc, mods, lookup.lookupClass(), isSpecialInvoke); + MethodHandle restrictProtectedReceiver(MemberName method, MethodHandle mh) { + // The accessing class only has the right to use a protected member + // on itself or a subclass. Enforce that restriction, from JVMS 5.4.4, etc. + if (!method.isProtected() || method.isStatic() + || allowedModes == TRUSTED + || VerifyAccess.isSamePackageMember(method.getDeclaringClass(), lookupClass())) + return mh; + else + return restrictReceiver(method, mh, lookupClass()); + } + MethodHandle restrictReceiver(MemberName method, MethodHandle mh, Class<?> caller) { + assert(!method.isStatic()); + Class<?> defc = method.getDeclaringClass(); // receiver type of mh is too wide + if (defc.isInterface() || !defc.isAssignableFrom(caller)) { + throw newNoAccessException("caller class must be a subclass below the method", method, caller); } - if (constraint == null) { - throw newNoAccessException(m, lookup); - } - if (constraint != defc && !constraint.isAssignableFrom(defc)) { - if (!defc.isAssignableFrom(constraint)) - throw newNoAccessException("receiver must be in caller class", m, lookup.lookupClass()); - if (m.isInvocable()) - narrowMethodType = m.getInvocationType().changeParameterType(0, constraint); - else if (m.isField()) - narrowMethodType = (!isSetter - ? MethodType.methodType(m.getFieldType(), constraint) - : MethodType.methodType(void.class, constraint, m.getFieldType())); - } + MethodType rawType = mh.type(); + if (rawType.parameterType(0) == caller) return mh; + MethodType narrowType = rawType.changeParameterType(0, caller); + return MethodHandleImpl.convertArguments(IMPL_TOKEN, mh, narrowType, rawType, null); } - if (m.isInvocable()) - return MethodHandleImpl.findMethod(IMPL_TOKEN, m, doDispatch, lookup.lookupClass()); - else if (m.isField()) - return MethodHandleImpl.accessField(IMPL_TOKEN, m, isSetter, lookup.lookupClass()); - else - throw new InternalError(); + + MethodHandle makeAccessor(Class<?> refc, String name, Class<?> type, + boolean isStatic, boolean isSetter) throws NoAccessException { + MemberName field = resolveOrFail(refc, name, type, isStatic); + if (isStatic != field.isStatic()) + throw newNoAccessException(isStatic + ? "expected a static field" + : "expected a non-static field", + field, lookupClass()); + return makeAccessor(refc, field, false, isSetter); + } + + MethodHandle makeAccessor(Class<?> refc, MemberName field, + boolean trusted, boolean isSetter) throws NoAccessException { + assert(field.isField()); + if (trusted) + return MethodHandleImpl.accessField(IMPL_TOKEN, field, isSetter, lookupClassOrNull()); + checkAccess(refc, field); + MethodHandle mh = MethodHandleImpl.accessField(IMPL_TOKEN, field, isSetter, lookupClassOrNull()); + return restrictProtectedReceiver(field, mh); + } } /** @@ -667,10 +899,15 @@ */ public static MethodHandle dynamicInvoker(CallSite site) { - MethodHandle getTarget = MethodHandleImpl.bindReceiver(IMPL_TOKEN, CallSite.GET_TARGET, site); + MethodHandle getCSTarget = GET_TARGET; + if (getCSTarget == null) + GET_TARGET = getCSTarget = Lookup.IMPL_LOOKUP. + findVirtual(CallSite.class, "getTarget", MethodType.methodType(MethodHandle.class)); + MethodHandle getTarget = MethodHandleImpl.bindReceiver(IMPL_TOKEN, getCSTarget, site); MethodHandle invoker = exactInvoker(site.type()); return foldArguments(invoker, getTarget); } + private static MethodHandle GET_TARGET = null; // link this lazily, not eagerly static Invokers invokers(MethodType type) { return MethodTypeImpl.invokers(IMPL_TOKEN, type); @@ -1025,15 +1262,15 @@ * <p><blockquote><pre> * MethodHandle cat = MethodHandles.lookup(). * findVirtual(String.class, "concat", String.class, String.class); - * System.out.println(cat.<String>invoke("x", "y")); // xy + * System.out.println(cat.<String>invokeExact("x", "y")); // xy * MethodHandle d0 = dropArguments(cat, 0, String.class); - * System.out.println(d0.<String>invoke("x", "y", "z")); // xy + * System.out.println(d0.<String>invokeExact("x", "y", "z")); // xy * MethodHandle d1 = dropArguments(cat, 1, String.class); - * System.out.println(d1.<String>invoke("x", "y", "z")); // xz + * System.out.println(d1.<String>invokeExact("x", "y", "z")); // xz * MethodHandle d2 = dropArguments(cat, 2, String.class); - * System.out.println(d2.<String>invoke("x", "y", "z")); // yz + * System.out.println(d2.<String>invokeExact("x", "y", "z")); // yz * MethodHandle d12 = dropArguments(cat, 1, String.class, String.class); - * System.out.println(d12.<String>invoke("w", "x", "y", "z")); // wz + * System.out.println(d12.<String>invokeExact("w", "x", "y", "z")); // wz * </pre></blockquote> * @param target the method handle to invoke after the argument is dropped * @param valueTypes the type(s) of the argument to drop @@ -1254,7 +1491,7 @@ MethodHandle dispatch = compose(choose, test); // dispatch = \(a...).(test(a...) ? target : fallback) return combineArguments(invoke, dispatch, 0); - // return \(a...).((test(a...) ? target : fallback).invoke(a...)) + // return \(a...).((test(a...) ? target : fallback).invokeExact(a...)) } */ return MethodHandleImpl.makeGuardWithTest(IMPL_TOKEN, test, target, fallback); } @@ -1325,22 +1562,4 @@ MethodHandle throwException(Class<?> returnType, Class<? extends Throwable> exType) { return MethodHandleImpl.throwException(IMPL_TOKEN, MethodType.methodType(returnType, exType)); } - - /** Alias for {@link MethodType#methodType}. */ - @Deprecated // "use MethodType.methodType instead" - public static MethodType methodType(Class<?> rtype) { - return MethodType.methodType(rtype); - } - - /** Alias for {@link MethodType#methodType}. */ - @Deprecated // "use MethodType.methodType instead" - public static MethodType methodType(Class<?> rtype, Class<?> ptype) { - return MethodType.methodType(rtype, ptype); - } - - /** Alias for {@link MethodType#methodType}. */ - @Deprecated // "use MethodType.methodType instead" - public static MethodType methodType(Class<?> rtype, Class<?> ptype0, Class<?>... ptypes) { - return MethodType.methodType(rtype, ptype0, ptypes); - } }
--- a/jdk/src/share/classes/java/dyn/MethodType.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/MethodType.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,15 +36,24 @@ import static sun.dyn.MemberName.newIllegalArgumentException; /** - * Run-time token used to match call sites with method handles. + * A method type represents the arguments and return type accepted and + * returned by a method handle, or the arguments and return type passed + * and expected by a method handle caller. Method types must be properly + * matched between a method handle and all its callers, + * and the JVM's operations enforce this matching at all times. + * <p> * The structure is a return type accompanied by any number of parameter types. * The types (primitive, void, and reference) are represented by Class objects. + * <p> * All instances of <code>MethodType</code> are immutable. * Two instances are completely interchangeable if they compare equal. - * Equality depends exactly on the return and parameter types. + * Equality depends on pairwise correspondence of the return and parameter types and on nothing else. * <p> - * This type can be created only by factory methods, which manage interning. - * + * This type can be created only by factory methods. + * All factory methods may cache values, though caching is not guaranteed. + * <p> + * Note: Like classes and strings, method types can be represented directly + * as constants to be loaded by {@code ldc} bytecodes. * @author John Rose, JSR 292 EG */ public final @@ -109,7 +118,7 @@ /** Find or create an instance of the given method type. * @param rtype the return type * @param ptypes the parameter types - * @return the interned method type with the given parts + * @return a method type with the given parts * @throws NullPointerException if rtype or any ptype is null * @throws IllegalArgumentException if any of the ptypes is void */ @@ -626,7 +635,7 @@ } /** Convenience method for {@link #methodType(java.lang.Class, java.lang.Class[])}. - * Find or create an instance (interned) of the given method type. + * Find or create an instance of the given method type. * Any class or interface name embedded in the signature string * will be resolved by calling {@link ClassLoader#loadClass(java.lang.String)} * on the given loader (or if it is null, on the system class loader).
--- a/jdk/src/share/classes/java/dyn/NoAccessException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/NoAccessException.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,11 +27,12 @@ /** * Thrown to indicate that a caller has attempted to create a method handle - * which calls a method to which the caller does not have access. + * which accesses a field, method, or class to which the caller does not have access. * This unchecked exception is analogous to {@link IllegalAccessException}, * which is a checked exception thrown when reflective invocation fails * because of an access check. With method handles, this same access - * checking is performed on behalf of the method handle creator, + * checking is performed by the {@link MethodHandles.Lookup lookup object} + * on behalf of the method handle creator, * at the time of creation. * @author John Rose, JSR 292 EG */
--- a/jdk/src/share/classes/java/dyn/package-info.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/dyn/package-info.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,6 +27,105 @@ * <em>PROVISIONAL API, WORK IN PROGRESS:</em> * This package contains dynamic language support provided directly by * the Java core class libraries and virtual machine. + * <p> + * Certain types in this package have special relations to dynamic + * language support in the virtual machine: + * <ul> + * <li>In source code, a call to + * {@link java.dyn.MethodHandle#invokeExact MethodHandle.invokeExact} or + * {@link java.dyn.MethodHandle#invokeGeneric MethodHandle.invokeGeneric} + * will compile and link, regardless of the requested type signature. + * As usual, the Java compiler emits an {@code invokevirtual} + * instruction with the given signature against the named method. + * The JVM links any such call (regardless of signature) to a dynamically + * typed method handle invocation. In the case of {@code invokeGeneric}, + * argument and return value conversions are applied. + * + * <li>In source code, the class {@link java.dyn.InvokeDynamic} appears to accept + * any static method invocation, of any name and any signature. + * But instead of emitting + * an {@code invokestatic} instruction for such a call, the Java compiler emits + * an {@code invokedynamic} instruction with the given name and signature. + * + * <li>When the JVM links an {@code invokedynamic} instruction, it calls the + * {@linkplain java.dyn.Linkage#registerBootstrapMethod(Class, MethodHandle) bootstrap method} + * of the containing class to obtain a {@linkplain java.dyn.CallSite call site} object through which + * the call site will link its target {@linkplain java.dyn.MethodHandle method handle}. + * + * <li>The JVM bytecode format supports immediate constants of + * the classes {@link java.dyn.MethodHandle} and {@link java.dyn.MethodType}. + * </ul> + * + * <h2><a name="jvm_mods"></a>Corresponding JVM bytecode format changes</h2> + * <em>The following low-level information is presented here as a preview of + * changes being made to the Java Virtual Machine specification for JSR 292.</em> + * + * <h3>{@code invokedynamic} instruction format</h3> + * In bytecode, an {@code invokedynamic} instruction is formatted as five bytes. + * The first byte is the opcode 186 (hexadecimal {@code BA}). + * The next two bytes are a constant pool index (in the same format as for the other {@code invoke} instructions). + * The final two bytes are reserved for future use and required to be zero. + * The constant pool reference is to a entry with tag {@code CONSTANT_NameAndType} + * (decimal 12). It is thus not a method reference of any sort, but merely + * the method name, argument types, and return type of the dynamic call site. + * <em>(TBD: The EG is discussing the possibility of a special constant pool entry type, + * so that other information may be added, such as a per-instruction bootstrap + * method and/or annotations.)</em> + * + * <h3>constant pool entries for {@code MethodType}s</h3> + * If a constant pool entry has the tag {@code CONSTANT_MethodType} (decimal 16), + * it must contain exactly two more bytes, which are an index to a {@code CONSTANT_Utf8} + * entry which represents a method type signature. The JVM will ensure that on first + * execution of an {@code ldc} instruction for this entry, a {@link java.dyn.MethodType} + * will be created which represents the signature. + * Any classes mentioned in the {@code MethodType} will be loaded if necessary, + * but not initialized. + * Access checking and error reporting is performed exactly as it is for + * references by {@code ldc} instructions to {@code CONSTANT_Class} constants. + * + * <h3>constant pool entries for {@code MethodHandle}s</h3> + * 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 + * value in the range 1 through 9, and the last two are an index to a + * {@code CONSTANT_Fieldref}, {@code CONSTANT_Methodref}, or + * {@code CONSTANT_InterfaceMethodref} entry which represents a field or method + * for which a method handle is to be created. + * The JVM will ensure that on first execution of an {@code ldc} instruction + * for this entry, a {@link java.dyn.MethodHandle} will be created which represents + * the field or method reference, according to the specific mode implied by the subtag. + * <p> + * As with {@code CONSTANT_Class} and {@code CONSTANT_MethodType} constants, + * the {@code Class} or {@code MethodType} object which reifies the field or method's + * type is created. Any classes mentioned in this reificaiton will be loaded if necessary, + * but not initialized, and access checking and error reporting performed as usual. + * <p> + * The method handle itself will have a type and behavior determined by the subtag as follows: + * <code> + * <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>MH behavior</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> + * <tr><td>2</td><td>REF_getStatic</td><td>C.f:T</td><td>( )T</td><td>getstatic C.f:T</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> + * <tr><td>4</td><td>REF_putStatic</td><td>C.f:T</td><td>(T)void</td><td>putstatic C.f:T</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> + * <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> + * <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> + * <tr><td>8</td><td>REF_newInvokeSpecial</td><td>C.<init>(A*)void</td><td>(A*)C</td><td>new C; dup; invokespecial C.<init>(A*)void</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> + * </table> + * </code> + * <p> + * The special names {@code <init>} and {@code <clinit>} are not allowed except for subtag 8 as shown. + * <p> + * The verifier applies the same access checks and restrictions for these references as for the hypothetical + * bytecode instructions specified in the last column of the table. In particular, method handles to + * private and protected members can be created in exactly those classes for which the corresponding + * normal accesses are legal. + * <p> + * None of these constant types force class initialization. + * Method handles for subtags {@code REF_getStatic}, {@code REF_putStatic}, and {@code REF_invokeStatic} + * may force class initialization on their first invocation, just like the corresponding bytecodes. + * * @author John Rose, JSR 292 EG */
--- a/jdk/src/share/classes/java/lang/AssertionError.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/lang/AssertionError.java Thu Jul 08 11:28:01 2010 -0700 @@ -66,7 +66,7 @@ * defined in <i>The Java Language Specification, Second * Edition</i>, Section 15.18.1.1. *<p> - * If the specified object is an instance of <tt>Throwable</tt>, it + * If the specified object is an instance of {@code Throwable}, it * becomes the <i>cause</i> of the newly constructed assertion error. * * @param detailMessage value to be used in constructing detail message @@ -149,4 +149,21 @@ public AssertionError(double detailMessage) { this("" + detailMessage); } + + /** + * Constructs a new {@code AssertionError} with the specified + * detail message and cause. + * + * <p>Note that the detail message associated with + * {@code cause} is <i>not</i> automatically incorporated in + * this error's detail message. + * + * @param message the detail message, may be {@code null} + * @param cause the cause, may be {@code null} + * + * @since 1.7 + */ + public AssertionError(String message, Throwable cause) { + super(message, cause); + } }
--- a/jdk/src/share/classes/java/lang/Math.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/lang/Math.java Thu Jul 08 11:28:01 2010 -0700 @@ -681,9 +681,9 @@ private static Random randomNumberGenerator; - private static synchronized void initRNG() { - if (randomNumberGenerator == null) - randomNumberGenerator = new Random(); + private static synchronized Random initRNG() { + Random rnd = randomNumberGenerator; + return (rnd == null) ? (randomNumberGenerator = new Random()) : rnd; } /** @@ -694,9 +694,11 @@ * * <p>When this method is first called, it creates a single new * pseudorandom-number generator, exactly as if by the expression - * <blockquote>{@code new java.util.Random}</blockquote> This - * new pseudorandom-number generator is used thereafter for all - * calls to this method and is used nowhere else. + * + * <blockquote>{@code new java.util.Random()}</blockquote> + * + * This new pseudorandom-number generator is used thereafter for + * all calls to this method and is used nowhere else. * * <p>This method is properly synchronized to allow correct use by * more than one thread. However, if many threads need to generate @@ -705,11 +707,12 @@ * * @return a pseudorandom {@code double} greater than or equal * to {@code 0.0} and less than {@code 1.0}. - * @see java.util.Random#nextDouble() + * @see Random#nextDouble() */ public static double random() { - if (randomNumberGenerator == null) initRNG(); - return randomNumberGenerator.nextDouble(); + Random rnd = randomNumberGenerator; + if (rnd == null) rnd = initRNG(); + return rnd.nextDouble(); } /**
--- a/jdk/src/share/classes/java/lang/ProcessBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/lang/ProcessBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -418,6 +418,8 @@ * Implements a <a href="#redirect-output">null input stream</a>. */ static class NullInputStream extends InputStream { + static final NullInputStream INSTANCE = new NullInputStream(); + private NullInputStream() {} public int read() { return -1; } public int available() { return 0; } } @@ -426,6 +428,8 @@ * Implements a <a href="#redirect-input">null output stream</a>. */ static class NullOutputStream extends OutputStream { + static final NullOutputStream INSTANCE = new NullOutputStream(); + private NullOutputStream() {} public void write(int b) throws IOException { throw new IOException("Stream closed"); }
--- a/jdk/src/share/classes/java/lang/StrictMath.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/lang/StrictMath.java Thu Jul 08 11:28:01 2010 -0700 @@ -667,9 +667,9 @@ private static Random randomNumberGenerator; - private static synchronized void initRNG() { - if (randomNumberGenerator == null) - randomNumberGenerator = new Random(); + private static synchronized Random initRNG() { + Random rnd = randomNumberGenerator; + return (rnd == null) ? (randomNumberGenerator = new Random()) : rnd; } /** @@ -680,9 +680,11 @@ * * <p>When this method is first called, it creates a single new * pseudorandom-number generator, exactly as if by the expression - * <blockquote>{@code new java.util.Random}</blockquote> This - * new pseudorandom-number generator is used thereafter for all - * calls to this method and is used nowhere else. + * + * <blockquote>{@code new java.util.Random()}</blockquote> + * + * This new pseudorandom-number generator is used thereafter for + * all calls to this method and is used nowhere else. * * <p>This method is properly synchronized to allow correct use by * more than one thread. However, if many threads need to generate @@ -691,11 +693,12 @@ * * @return a pseudorandom {@code double} greater than or equal * to {@code 0.0} and less than {@code 1.0}. - * @see java.util.Random#nextDouble() + * @see Random#nextDouble() */ public static double random() { - if (randomNumberGenerator == null) initRNG(); - return randomNumberGenerator.nextDouble(); + Random rnd = randomNumberGenerator; + if (rnd == null) rnd = initRNG(); + return rnd.nextDouble(); } /**
--- a/jdk/src/share/classes/java/net/URI.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/net/URI.java Thu Jul 08 11:28:01 2010 -0700 @@ -457,7 +457,7 @@ * @author Mark Reinhold * @since 1.4 * - * @see <a href="http://ietf.org/rfc/rfc2279.txt"><i>RFC 2279: UTF-8, a + * @see <a href="http://www.ietf.org/rfc/rfc2279.txt"><i>RFC 2279: UTF-8, a * transformation format of ISO 10646</i></a>, <br><a * href="http://www.ietf.org/rfc/rfc2373.txt"><i>RFC 2373: IPv6 Addressing * Architecture</i></a>, <br><a
--- a/jdk/src/share/classes/java/nio/charset/package.html Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/nio/charset/package.html Thu Jul 08 11:28:01 2010 -0700 @@ -48,7 +48,7 @@ <p> A <i>charset</i> is named mapping between sequences of sixteen-bit Unicode characters and sequences of bytes, in the sense defined in <a -href="http://ietf.org/rfc/rfc2278.txt"><i>RFC 2278</i></a>. A +href="http://www.ietf.org/rfc/rfc2278.txt"><i>RFC 2278</i></a>. A <i>decoder</i> is an engine which transforms bytes in a specific charset into characters, and an <i>encoder</i> is an engine which transforms characters into bytes. Encoders and decoders operate on byte and character buffers. They are
--- a/jdk/src/share/classes/java/security/Security.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/security/Security.java Thu Jul 08 11:28:01 2010 -0700 @@ -678,7 +678,7 @@ spiMap.put(type, clazz); return clazz; } catch (ClassNotFoundException e) { - throw (Error)new AssertionError("Spi class not found").initCause(e); + throw new AssertionError("Spi class not found", e); } }
--- a/jdk/src/share/classes/java/util/Collections.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/util/Collections.java Thu Jul 08 11:28:01 2010 -0700 @@ -463,10 +463,10 @@ * its list-iterator does not support the <tt>set</tt> operation. */ public static void shuffle(List<?> list) { - if (r == null) { - r = new Random(); - } - shuffle(list, r); + Random rnd = r; + if (rnd == null) + r = rnd = new Random(); + shuffle(list, rnd); } private static Random r;
--- a/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java Thu Jul 08 11:28:01 2010 -0700 @@ -73,10 +73,10 @@ private long rnd; /** - * Initialization flag to permit the first and only allowed call - * to setSeed (inside Random constructor) to succeed. We can't - * allow others since it would cause setting seed in one part of a - * program to unintentionally impact other usages by the thread. + * Initialization flag to permit calls to setSeed to succeed only + * while executing the Random constructor. We can't allow others + * since it would cause setting seed in one part of a program to + * unintentionally impact other usages by the thread. */ boolean initialized; @@ -98,11 +98,10 @@ /** * Constructor called only by localRandom.initialValue. - * We rely on the fact that the superclass no-arg constructor - * invokes setSeed exactly once to initialize. */ ThreadLocalRandom() { super(); + initialized = true; } /** @@ -123,7 +122,6 @@ public void setSeed(long seed) { if (initialized) throw new UnsupportedOperationException(); - initialized = true; rnd = (seed ^ multiplier) & mask; }
--- a/jdk/src/share/classes/java/util/jar/Pack200.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/java/util/jar/Pack200.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003,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 @@ -212,10 +212,18 @@ * to produce a specific bytewise image for any given transmission * ordering of archive elements.) * <p> - * In order to maintain backward compatibility, if the input JAR-files are - * solely comprised of 1.5 (or lesser) classfiles, a 1.5 compatible - * pack file is produced. Otherwise a 1.6 compatible pack200 file is - * produced. + * In order to maintain backward compatibility, the pack file's version is + * set to accommodate the class files present in the input JAR file. In + * other words, the pack file version will be the latest, if the class files + * are the latest and conversely the pack file version will be the oldest + * if the class file versions are also the oldest. For intermediate class + * file versions the corresponding pack file version will be used. + * For example: + * If the input JAR-files are solely comprised of 1.5 (or lesser) + * class files, a 1.5 compatible pack file is produced. This will also be + * the case for archives that have no class files. + * If the input JAR-files contains a 1.6 class file, then the pack file + * version will be set to 1.6. * <p> * @since 1.5 */ @@ -236,9 +244,10 @@ * input file to be transmitted in the segment, along with the size * of its name and other transmitted properties. * <p> - * The default is 1000000 (a million bytes). This allows input JAR files - * of moderate size to be transmitted in one segment. It also puts - * a limit on memory requirements for packers and unpackers. + * The default is -1, which means the packer will always create a single + * segment output file. In cases where extremely large output files are + * generated, users are strongly encouraged to use segmenting or break + * up the input file into smaller JARs. * <p> * A 10Mb JAR packed without this limit will * typically pack about 10% smaller, but the packer may require
--- a/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/management/remote/JMXServiceURL.java Thu Jul 08 11:28:01 2010 -0700 @@ -107,10 +107,10 @@ * significant in the <code><em>url-path</em></code>.</p> * * @see <a - * href="ftp://ftp.rfc-editor.org/in-notes/rfc2609.txt">RFC 2609, + * href="http://www.ietf.org/rfc/rfc2609.txt">RFC 2609, * "Service Templates and <code>Service:</code> Schemes"</a> * @see <a - * href="ftp://ftp.rfc-editor.org/in-notes/rfc3111.txt">RFC 3111, + * href="http://www.ietf.org/rfc/rfc3111.txt">RFC 3111, * "Service Location Protocol Modifications for IPv6"</a> * * @since 1.5
--- a/jdk/src/share/classes/javax/naming/ldap/LdapName.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/naming/ldap/LdapName.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,7 @@ /** * This class represents a distinguished name as specified by - * <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a>. + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>. * A distinguished name, or DN, is composed of an ordered list of * components called <em>relative distinguished name</em>s, or RDNs. * Details of a DN's syntax are described in RFC 2253. @@ -115,7 +115,7 @@ * * @param name This is a non-null distinguished name formatted * according to the rules defined in - * <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>. + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>. * * @throws InvalidNameException if a syntax violation is detected. * @see Rdn#escapeValue(Object value) @@ -614,7 +614,7 @@ /** * Returns a string representation of this LDAP name in a format - * defined by <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a> + * defined by <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a> * and described in the class description. If the name has zero * components an empty string is returned. *
--- a/jdk/src/share/classes/javax/naming/ldap/Rdn.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/naming/ldap/Rdn.java Thu Jul 08 11:28:01 2010 -0700 @@ -45,7 +45,7 @@ /** * This class represents a relative distinguished name, or RDN, which is a * component of a distinguished name as specified by - * <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>. + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>. * An example of an RDN is "OU=Sales+CN=J.Smith". In this example, * the RDN consist of multiple attribute type/value pairs. The * RDN is parsed as described in the class description for @@ -117,7 +117,7 @@ * {@link javax.naming.directory.Attributes Attributes}. * <p> * The string attribute values are not interpretted as - * <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a> + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a> * formatted RDN strings. That is, the values are used * literally (not parsed) and assumed to be unescaped. * @@ -152,7 +152,7 @@ /** * Constructs an Rdn from the given string. * This constructor takes a string formatted according to the rules - * defined in <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a> + * defined in <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a> * and described in the class description for * {@link javax.naming.ldap.LdapName}. * @@ -180,7 +180,7 @@ * Constructs an Rdn from the given attribute type and * value. * The string attribute values are not interpretted as - * <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a> + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a> * formatted RDN strings. That is, the values are used * literally (not parsed) and assumed to be unescaped. * @@ -216,7 +216,7 @@ /* * Adds the given attribute type and value to this Rdn. * The string attribute values are not interpretted as - * <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a> + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a> * formatted RDN strings. That is the values are used * literally (not parsed) and assumed to be unescaped. * @@ -280,7 +280,7 @@ /** * Returns this Rdn as a string represented in a format defined by - * <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a> and described + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a> and described * in the class description for {@link javax.naming.ldap.LdapName LdapName}. * * @return The string representation of the Rdn. @@ -503,7 +503,7 @@ /** * Given the value of an attribute, returns a string escaped according * to the rules specified in - * <a href="http://ietf.org/rfc/rfc2253.txt">RFC 2253</a>. + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>. * <p> * For example, if the val is "Sue, Grabbit and Runn", the escaped * value returned by this method is "Sue\, Grabbit and Runn". @@ -582,7 +582,7 @@ /** * Given an attribute value string formated according to the rules * specified in - * <a href="http://ietf.org//rfc/rfc2253.txt">RFC 2253</a>, + * <a href="http://www.ietf.org/rfc/rfc2253.txt">RFC 2253</a>, * returns the unformated value. Escapes and quotes are * stripped away, and hex-encoded UTF-8 is converted to equivalent * UTF-16 characters. Returns a string value as a String, and a
--- a/jdk/src/share/classes/javax/net/ssl/SSLContext.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/net/ssl/SSLContext.java Thu Jul 08 11:28:01 2010 -0700 @@ -160,7 +160,7 @@ * * @param protocol the standard name of the requested protocol. * See Appendix A in the <a href= - * "{@docRoot}/../technotes/guides//security/jsse/JSSERefGuide.html#AppA"> + * "{@docRoot}/../technotes/guides/security/jsse/JSSERefGuide.html#AppA"> * Java Secure Socket Extension Reference Guide </a> * for information about standard protocol names. *
--- a/jdk/src/share/classes/javax/print/DocFlavor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/print/DocFlavor.java Thu Jul 08 11:28:01 2010 -0700 @@ -450,7 +450,7 @@ /** * A String representing the host operating system encoding. * This will follow the conventions documented in - * <a href="http://ietf.org/rfc/rfc2278.txt"> + * <a href="http://www.ietf.org/rfc/rfc2278.txt"> * <i>RFC 2278: IANA Charset Registration Procedures</i></a> * except where historical names are returned for compatibility with * previous versions of the Java platform.
--- a/jdk/src/share/classes/javax/swing/BorderFactory.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/BorderFactory.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -26,7 +26,6 @@ import java.awt.Color; import java.awt.Font; -import javax.swing.JComponent; import javax.swing.border.*; /** @@ -74,10 +73,20 @@ return new LineBorder(color, thickness); } -// public static Border createLineBorder(Color color, int thickness, -// boolean drawRounded) { -// return new JLineBorder(color, thickness, drawRounded); -// } + /** + * Creates a line border with the specified color, thickness, and corner shape. + * + * @param color the color of the border + * @param thickness the thickness of the border + * @param rounded whether or not border corners should be round + * @return the {@code Border} object + * + * @see LineBorder#LineBorder(Color, int, boolean) + * @since 1.7 + */ + public static Border createLineBorder(Color color, int thickness, boolean rounded) { + return new LineBorder(color, thickness, rounded); + } //// BevelBorder ///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// @@ -180,7 +189,115 @@ } return null; } + +//// SoftBevelBorder /////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// + + private static Border sharedSoftRaisedBevel; + private static Border sharedSoftLoweredBevel; + + /** + * Creates a beveled border with a raised edge and softened corners, + * using brighter shades of the component's current background color + * for highlighting, and darker shading for shadows. + * In a raised border, highlights are on top and shadows are underneath. + * + * @return the {@code Border} object + * + * @since 1.7 + */ + public static Border createRaisedSoftBevelBorder() { + if (sharedSoftRaisedBevel == null) { + sharedSoftRaisedBevel = new SoftBevelBorder(BevelBorder.RAISED); + } + return sharedSoftRaisedBevel; + } + + /** + * Creates a beveled border with a lowered edge and softened corners, + * using brighter shades of the component's current background color + * for highlighting, and darker shading for shadows. + * In a lowered border, shadows are on top and highlights are underneath. + * + * @return the {@code Border} object + * + * @since 1.7 + */ + public static Border createLoweredSoftBevelBorder() { + if (sharedSoftLoweredBevel == null) { + sharedSoftLoweredBevel = new SoftBevelBorder(BevelBorder.LOWERED); + } + return sharedSoftLoweredBevel; + } + + /** + * Creates a beveled border of the specified type with softened corners, + * using brighter shades of the component's current background color + * for highlighting, and darker shading for shadows. + * The type is either {@link BevelBorder#RAISED} or {@link BevelBorder#LOWERED}. + * + * @param type a type of a bevel + * @return the {@code Border} object or {@code null} + * if the specified type is not valid + * + * @see BevelBorder#BevelBorder(int) + * @since 1.7 + */ + public static Border createSoftBevelBorder(int type) { + if (type == BevelBorder.RAISED) { + return createRaisedSoftBevelBorder(); + } + if (type == BevelBorder.LOWERED) { + return createLoweredSoftBevelBorder(); + } + return null; + } + + /** + * Creates a beveled border of the specified type with softened corners, + * using the specified highlighting and shadowing. + * The type is either {@link BevelBorder#RAISED} or {@link BevelBorder#LOWERED}. + * The outer edge of the highlight area uses + * a brighter shade of the {@code highlight} color. + * The inner edge of the shadow area uses + * a brighter shade of the {@code shadow} color. + * + * @param type a type of a bevel + * @param highlight a basic color of the highlight area + * @param shadow a basic color of the shadow area + * @return the {@code Border} object + * + * @see BevelBorder#BevelBorder(int, Color, Color) + * @since 1.7 + */ + public static Border createSoftBevelBorder(int type, Color highlight, Color shadow) { + return new BevelBorder(type, highlight, shadow); + } + + /** + * Creates a beveled border of the specified type with softened corners, + * using the specified colors for the inner and outer edges + * of the highlight and the shadow areas. + * The type is either {@link BevelBorder#RAISED} or {@link BevelBorder#LOWERED}. + * Note: The shadow inner and outer colors are switched + * for a lowered bevel border. + * + * @param type a type of a bevel + * @param highlightOuter a color of the outer edge of the highlight area + * @param highlightInner a color of the inner edge of the highlight area + * @param shadowOuter a color of the outer edge of the shadow area + * @param shadowInner a color of the inner edge of the shadow area + * @return the {@code Border} object + * + * @see BevelBorder#BevelBorder(int, Color, Color, Color, Color) + * @since 1.7 + */ + public static Border createSoftBevelBorder(int type, Color highlightOuter, Color highlightInner, Color shadowOuter, Color shadowInner) { + return new BevelBorder(type, highlightOuter, highlightInner, shadowOuter, shadowInner); + } + //// EtchedBorder /////////////////////////////////////////////////////////// + static final Border sharedEtchedBorder = new EtchedBorder(); private static Border sharedRaisedEtchedBorder;
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java Thu Jul 08 11:28:01 2010 -0700 @@ -658,8 +658,7 @@ } try { _colorTypes.add((ColorType)checkCast(typeClass. - getField(typeName.substring(classIndex, - typeName.length() - classIndex)). + getField(typeName.substring(classIndex)). get(typeClass), ColorType.class)); } catch (NoSuchFieldException nsfe) { throw new SAXException("Unable to find color type: " +
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java Thu Jul 08 11:28:01 2010 -0700 @@ -363,18 +363,24 @@ SynthIcon.getIconWidth(handleIcon, context) : 0; Dimension compDim; for (int i = 0; i < tb.getComponentCount(); i++) { - compDim = tb.getComponent(i).getMinimumSize(); - dim.width += compDim.width; - dim.height = Math.max(dim.height, compDim.height); + Component component = tb.getComponent(i); + if (component.isVisible()) { + compDim = component.getMinimumSize(); + dim.width += compDim.width; + dim.height = Math.max(dim.height, compDim.height); + } } } else { dim.height = tb.isFloatable() ? SynthIcon.getIconHeight(handleIcon, context) : 0; Dimension compDim; for (int i = 0; i < tb.getComponentCount(); i++) { - compDim = tb.getComponent(i).getMinimumSize(); - dim.width = Math.max(dim.width, compDim.width); - dim.height += compDim.height; + Component component = tb.getComponent(i); + if (component.isVisible()) { + compDim = component.getMinimumSize(); + dim.width = Math.max(dim.width, compDim.width); + dim.height += compDim.height; + } } } dim.width += insets.left + insets.right; @@ -395,18 +401,24 @@ SynthIcon.getIconWidth(handleIcon, context) : 0; Dimension compDim; for (int i = 0; i < tb.getComponentCount(); i++) { - compDim = tb.getComponent(i).getPreferredSize(); - dim.width += compDim.width; - dim.height = Math.max(dim.height, compDim.height); + Component component = tb.getComponent(i); + if (component.isVisible()) { + compDim = component.getPreferredSize(); + dim.width += compDim.width; + dim.height = Math.max(dim.height, compDim.height); + } } } else { dim.height = tb.isFloatable() ? SynthIcon.getIconHeight(handleIcon, context) : 0; Dimension compDim; for (int i = 0; i < tb.getComponentCount(); i++) { - compDim = tb.getComponent(i).getPreferredSize(); - dim.width = Math.max(dim.width, compDim.width); - dim.height += compDim.height; + Component component = tb.getComponent(i); + if (component.isVisible()) { + compDim = component.getPreferredSize(); + dim.width = Math.max(dim.width, compDim.width); + dim.height += compDim.height; + } } } dim.width += insets.left + insets.right; @@ -469,22 +481,24 @@ for (int i = 0; i < tb.getComponentCount(); i++) { c = tb.getComponent(i); - d = c.getPreferredSize(); - int y, h; - if (d.height >= baseH || c instanceof JSeparator) { - // Fill available height - y = baseY; - h = baseH; - } else { - // Center component vertically in the available space - y = baseY + (baseH / 2) - (d.height / 2); - h = d.height; + if (c.isVisible()) { + d = c.getPreferredSize(); + int y, h; + if (d.height >= baseH || c instanceof JSeparator) { + // Fill available height + y = baseY; + h = baseH; + } else { + // Center component vertically in the available space + y = baseY + (baseH / 2) - (d.height / 2); + h = d.height; + } + //if the component is a "glue" component then add to its + //width the extraSpacePerGlue it is due + if (isGlue(c)) d.width += extraSpacePerGlue; + c.setBounds(ltr ? x : x - d.width, y, d.width, h); + x = ltr ? x + d.width : x - d.width; } - //if the component is a "glue" component then add to its - //width the extraSpacePerGlue it is due - if (isGlue(c)) d.width += extraSpacePerGlue; - c.setBounds(ltr ? x : x - d.width, y, d.width, h); - x = ltr ? x + d.width : x - d.width; } } else { int handleHeight = tb.isFloatable() ? @@ -512,29 +526,31 @@ for (int i = 0; i < tb.getComponentCount(); i++) { c = tb.getComponent(i); - d = c.getPreferredSize(); - int x, w; - if (d.width >= baseW || c instanceof JSeparator) { - // Fill available width - x = baseX; - w = baseW; - } else { - // Center component horizontally in the available space - x = baseX + (baseW / 2) - (d.width / 2); - w = d.width; + if (c.isVisible()) { + d = c.getPreferredSize(); + int x, w; + if (d.width >= baseW || c instanceof JSeparator) { + // Fill available width + x = baseX; + w = baseW; + } else { + // Center component horizontally in the available space + x = baseX + (baseW / 2) - (d.width / 2); + w = d.width; + } + //if the component is a "glue" component then add to its + //height the extraSpacePerGlue it is due + if (isGlue(c)) d.height += extraSpacePerGlue; + c.setBounds(x, y, w, d.height); + y += d.height; } - //if the component is a "glue" component then add to its - //height the extraSpacePerGlue it is due - if (isGlue(c)) d.height += extraSpacePerGlue; - c.setBounds(x, y, w, d.height); - y += d.height; } } context.dispose(); } private boolean isGlue(Component c) { - if (c instanceof Box.Filler) { + if (c.isVisible() && c instanceof Box.Filler) { Box.Filler f = (Box.Filler)c; Dimension min = f.getMinimumSize(); Dimension pref = f.getPreferredSize();
--- a/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,15 +25,12 @@ package javax.swing.text; import java.awt.Color; -import java.awt.Component; import java.awt.Font; -import java.awt.FontMetrics; import java.awt.font.TextAttribute; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.Enumeration; import java.util.HashMap; -import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Stack; @@ -41,15 +38,14 @@ import java.util.ArrayList; import java.io.IOException; import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.io.Serializable; -import javax.swing.Icon; import javax.swing.event.*; import javax.swing.undo.AbstractUndoableEdit; import javax.swing.undo.CannotRedoException; import javax.swing.undo.CannotUndoException; import javax.swing.undo.UndoableEdit; import javax.swing.SwingUtilities; +import static sun.swing.SwingUtilities2.IMPLIED_CR; /** * A document that can be marked up with character and paragraph @@ -782,9 +778,18 @@ // Check for the composed text element. If it is, merge the character attributes // into this element as well. if (Utilities.isComposedTextAttributeDefined(attr)) { - ((MutableAttributeSet)attr).addAttributes(cattr); - ((MutableAttributeSet)attr).addAttribute(AbstractDocument.ElementNameAttribute, - AbstractDocument.ContentElementName); + MutableAttributeSet mattr = (MutableAttributeSet) attr; + mattr.addAttributes(cattr); + mattr.addAttribute(AbstractDocument.ElementNameAttribute, + AbstractDocument.ContentElementName); + + // Assure that the composed text element is named properly + // and doesn't have the CR attribute defined. + mattr.addAttribute(StyleConstants.NameAttribute, + AbstractDocument.ContentElementName); + if (mattr.isDefined(IMPLIED_CR)) { + mattr.removeAttribute(IMPLIED_CR); + } } ElementSpec[] spec = new ElementSpec[parseBuffer.size()];
--- a/jdk/src/share/classes/javax/swing/text/GlyphView.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/text/GlyphView.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,6 +32,7 @@ import javax.swing.UIManager; import sun.swing.SwingUtilities2; +import static sun.swing.SwingUtilities2.IMPLIED_CR; /** * A GlyphView is a styled chunk of text that represents a view @@ -1061,7 +1062,6 @@ int length; // if it is an implied newline character boolean impliedCR; - private static final String IMPLIED_CR = "CR"; boolean skipWidth; /**
--- a/jdk/src/share/classes/javax/swing/text/Utilities.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/text/Utilities.java Thu Jul 08 11:28:01 2010 -0700 @@ -404,6 +404,24 @@ } /** + * Adjust text offset so that the length of a resulting string as a whole + * fits into the specified width. + */ + static int adjustOffsetForFractionalMetrics( + Segment s, FontMetrics fm, int offset, int width) { + // Sometimes the offset returned by getTabbedTextOffset is beyond the + // available area, when fractional metrics are enabled. We should + // guard against this. + if (offset < s.count) { + while (offset > 0 && + fm.charsWidth(s.array, s.offset, offset + 1) > width) { + offset--; + } + } + return offset; + } + + /** * Determine where to break the given text to fit * within the given span. This tries to find a word boundary. * @param s the source of the text @@ -425,7 +443,7 @@ int txtCount = s.count; int index = Utilities.getTabbedTextOffset(s, metrics, x0, x, e, startOffset, false); - + index = adjustOffsetForFractionalMetrics(s, metrics, index, x - x0); if (index >= txtCount - 1) { return txtCount;
--- a/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java Thu Jul 08 11:28:01 2010 -0700 @@ -108,7 +108,7 @@ try { if (line.isLeaf()) { - drawText(line, p0, p1, g, x, y); + drawText(line, p0, p1, g, x, y); } else { // this line contains the composed text. int idx = line.getElementIndex(p0); @@ -239,9 +239,11 @@ tabBase, tabBase + currentWidth, this, p0); } else { - p = p0 + Utilities.getTabbedTextOffset(segment, metrics, - tabBase, tabBase + currentWidth, - this, p0, false); + int offset = Utilities.getTabbedTextOffset(segment, metrics, + tabBase, tabBase + currentWidth, this, p0, false); + offset = Utilities.adjustOffsetForFractionalMetrics( + segment, metrics, offset, currentWidth); + p = p0 + offset; } SegmentCache.releaseSharedSegment(segment); return p;
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Thu Jul 08 11:28:01 2010 -0700 @@ -24,20 +24,17 @@ */ package javax.swing.text.html; -import java.awt.Color; -import java.awt.Component; import java.awt.font.TextAttribute; import java.util.*; import java.net.URL; -import java.net.URLEncoder; import java.net.MalformedURLException; import java.io.*; import javax.swing.*; import javax.swing.event.*; import javax.swing.text.*; import javax.swing.undo.*; -import java.text.Bidi; import sun.swing.SwingUtilities2; +import static sun.swing.SwingUtilities2.IMPLIED_CR; /** * A document that models HTML. The purpose of this model is to @@ -1819,7 +1816,6 @@ static String MAP_PROPERTY = "__MAP__"; private static char[] NEWLINE; - private static final String IMPLIED_CR = "CR"; /** * I18N property key.
--- a/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/awt/image/PNGImageDecoder.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,7 +32,7 @@ import java.awt.Color; /** PNG - Portable Network Graphics - image file reader. - See <a href=ftp://ds.internic.net/rfc/rfc2083.txt>RFC2083</a> for details. */ + See <a href=http://www.ietf.org/rfc/rfc2083.txt>RFC2083</a> for details. */ /* this is changed public class PNGImageDecoder extends FilterInputStream implements Runnable
--- a/jdk/src/share/classes/sun/dyn/AdapterMethodHandle.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/AdapterMethodHandle.java Thu Jul 08 11:28:01 2010 -0700 @@ -366,7 +366,7 @@ } private static boolean convOpSupported(int convOp) { assert(convOp >= 0 && convOp <= CONV_OP_LIMIT); - return ((1<<convOp) & CONV_OP_IMPLEMENTED_MASK) != 0; + return ((1<<convOp) & MethodHandleNatives.CONV_OP_IMPLEMENTED_MASK) != 0; } /** One of OP_RETYPE_ONLY, etc. */
--- a/jdk/src/share/classes/sun/dyn/BoundMethodHandle.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/BoundMethodHandle.java Thu Jul 08 11:28:01 2010 -0700 @@ -146,6 +146,8 @@ MethodType foundType = null; MemberName foundMethod = null; for (MemberName method : methods) { + if (method.getDeclaringClass() == MethodHandle.class) + continue; // ignore methods inherited from MH class itself MethodType mtype = method.getMethodType(); if (type != null && type.parameterCount() != mtype.parameterCount()) continue;
--- a/jdk/src/share/classes/sun/dyn/CallSiteImpl.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/CallSiteImpl.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,77 +26,65 @@ package sun.dyn; import java.dyn.*; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Parts of CallSite known to the JVM. - * FIXME: Merge all this into CallSite proper. * @author jrose */ public class CallSiteImpl { - // Field used only by the JVM. Do not use or change. - private Object vmmethod; - - // Values supplied by the JVM: - protected int callerMID, callerBCI; - - private MethodHandle target; - protected final Object caller; // usually a class - protected final String name; - protected final MethodType type; - - /** called only directly from CallSite() */ - protected CallSiteImpl(Access token, Object caller, String name, MethodType type) { - Access.check(token); - this.caller = caller; - this.name = name; - this.type = type; - } - - /** native version of setTarget */ - protected void setTarget(MethodHandle mh) { - //System.out.println("setTarget "+this+" := "+mh); - // XXX I don't know how to fix this properly. -// if (false && MethodHandleNatives.JVM_SUPPORT) // FIXME: enable this -// MethodHandleNatives.linkCallSite(this, mh); -// else - this.target = mh; - } - - protected MethodHandle getTarget() { - return target; - } - - private static final MethodHandle PRIVATE_INITIALIZE_CALL_SITE = - MethodHandleImpl.IMPL_LOOKUP.findStatic(CallSite.class, "privateInitializeCallSite", - MethodType.methodType(void.class, CallSite.class, int.class, int.class)); - - // this is the up-call from the JVM: - static CallSite makeSite(Class<?> caller, String name, MethodType type, - int callerMID, int callerBCI) { - MethodHandle bsm = Linkage.getBootstrapMethod(caller); - if (bsm == null) - throw new InvokeDynamicBootstrapError("class has no bootstrap method: "+caller); + // this implements the upcall from the JVM, MethodHandleNatives.makeDynamicCallSite: + static CallSite makeSite(MethodHandle bootstrapMethod, + // Callee information: + String name, MethodType type, + // Call-site attributes, if any: + Object info, + // Caller information: + MemberName callerMethod, int callerBCI) { + Class<?> caller = callerMethod.getDeclaringClass(); + if (bootstrapMethod == null) { + // 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 "+caller.getName()+" has not declared a bootstrap method for invokedynamic"); + } CallSite site; try { - site = bsm.<CallSite>invoke(caller, name, type); + if (bootstrapMethod.type().parameterCount() == 3) + site = bootstrapMethod.<CallSite>invokeExact(caller, name, type); + else if (bootstrapMethod.type().parameterCount() == 4) + site = bootstrapMethod.<CallSite>invokeExact(caller, name, type, + !(info instanceof java.lang.annotation.Annotation[]) ? null + : (java.lang.annotation.Annotation[]) info); + else + throw new InternalError("bad BSM: "+bootstrapMethod); + if (!(site instanceof CallSite)) + throw new InvokeDynamicBootstrapError("class bootstrap method failed to create a call site: "+caller); + PRIVATE_INITIALIZE_CALL_SITE.<void>invokeExact(site, + name, type, + callerMethod, callerBCI); + assert(site.getTarget() != null); + assert(site.getTarget().type().equals(type)); } catch (Throwable ex) { - throw new InvokeDynamicBootstrapError("exception thrown while linking", ex); - } - if (site == null) - throw new InvokeDynamicBootstrapError("class bootstrap method failed to create a call site: "+caller); - if (site.type() != type) - throw new InvokeDynamicBootstrapError("call site type not initialized correctly: "+site); - if (site.callerClass() != caller) - throw new InvokeDynamicBootstrapError("call site caller not initialized correctly: "+site); - if ((Object)site.name() != name) - throw new InvokeDynamicBootstrapError("call site name not initialized correctly: "+site); - try { - PRIVATE_INITIALIZE_CALL_SITE.<void>invoke(site, callerMID, callerBCI); - } catch (Throwable ex) { - throw new InvokeDynamicBootstrapError("call site initialization exception", ex); + InvokeDynamicBootstrapError bex; + if (ex instanceof InvokeDynamicBootstrapError) + bex = (InvokeDynamicBootstrapError) ex; + else + bex = new InvokeDynamicBootstrapError("call site initialization exception", ex); + throw bex; } return site; } + + // 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 = + MethodHandleImpl.IMPL_LOOKUP.findVirtual(CallSite.class, "initializeFromJVM", + MethodType.methodType(void.class, + String.class, MethodType.class, + MemberName.class, int.class)); + + public static void setCallSiteTarget(Access token, CallSite site, MethodHandle target) { + Access.check(token); + MethodHandleNatives.setCallSiteTarget(site, target); + } }
--- a/jdk/src/share/classes/sun/dyn/FilterGeneric.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/FilterGeneric.java Thu Jul 08 11:28:01 2010 -0700 @@ -301,13 +301,13 @@ { super(e, f, t); } protected F1X makeInstance(MethodHandle e, MethodHandle f, MethodHandle t) { return new F1X(e, f, t); } - protected Object invoke_V0(Object a0) { return target.invoke(filter.invoke(a0)); } - protected Object invoke_F0(Object a0) { return target.invoke(filter.invoke(), a0); } - protected Object invoke_F1(Object a0) { return target.invoke(filter.invoke(a0), a0); } - protected Object invoke_C0(Object a0) { return target.invoke(filter.invoke(a0)); } - protected Object invoke_C1(Object a0) { return target.invoke(a0, filter.invoke()); } + protected Object invoke_V0(Object a0) { return target.invokeExact(filter.invokeExact(a0)); } + protected Object invoke_F0(Object a0) { return target.invokeExact(filter.invokeExact(), a0); } + protected Object invoke_F1(Object a0) { return target.invokeExact(filter.invokeExact(a0), a0); } + protected Object invoke_C0(Object a0) { return target.invokeExact(filter.invokeExact(a0)); } + protected Object invoke_C1(Object a0) { return target.invokeExact(a0, filter.invokeExact()); } protected Object invoke_Y0(Object a0) { Object[] av = { a0 }; - filter.<void>invoke(av); return target.invoke(av[0]); } + filter.<void>invokeExact(av); return target.invokeExact(av[0]); } } static class F2X extends Adapter { protected F2X(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -315,16 +315,16 @@ { super(e, f, t); } protected F2X makeInstance(MethodHandle e, MethodHandle f, MethodHandle t) { return new F2X(e, f, t); } - protected Object invoke_V0(Object a0, Object a1) { return target.invoke(filter.invoke(a0), a1); } - protected Object invoke_V1(Object a0, Object a1) { return target.invoke(a0, filter.invoke(a1)); } - protected Object invoke_F0(Object a0, Object a1) { return target.invoke(filter.invoke(), a0, a1); } - protected Object invoke_F1(Object a0, Object a1) { return target.invoke(filter.invoke(a0), a0, a1); } - protected Object invoke_F2(Object a0, Object a1) { return target.invoke(filter.invoke(a0, a1), a0, a1); } - protected Object invoke_C0(Object a0, Object a1) { return target.invoke(filter.invoke(a0, a1)); } - protected Object invoke_C1(Object a0, Object a1) { return target.invoke(a0, filter.invoke(a1)); } - protected Object invoke_C2(Object a0, Object a1) { return target.invoke(a0, a1, filter.invoke()); } + protected Object invoke_V0(Object a0, Object a1) { return target.invokeExact(filter.invokeExact(a0), a1); } + protected Object invoke_V1(Object a0, Object a1) { return target.invokeExact(a0, filter.invokeExact(a1)); } + protected Object invoke_F0(Object a0, Object a1) { return target.invokeExact(filter.invokeExact(), a0, a1); } + protected Object invoke_F1(Object a0, Object a1) { return target.invokeExact(filter.invokeExact(a0), a0, a1); } + protected Object invoke_F2(Object a0, Object a1) { return target.invokeExact(filter.invokeExact(a0, a1), a0, a1); } + protected Object invoke_C0(Object a0, Object a1) { return target.invokeExact(filter.invokeExact(a0, a1)); } + protected Object invoke_C1(Object a0, Object a1) { return target.invokeExact(a0, filter.invokeExact(a1)); } + protected Object invoke_C2(Object a0, Object a1) { return target.invokeExact(a0, a1, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1) { Object[] av = { a0, a1 }; - filter.<void>invoke(av); return target.invoke(av[0], av[1]); } + filter.<void>invokeExact(av); return target.invokeExact(av[0], av[1]); } } // */ @@ -336,13 +336,13 @@ protected F0 makeInstance(MethodHandle e, MethodHandle f, MethodHandle t) { return new F0(e, f, t); } protected Object invoke_F0() throws Throwable { - return target.invoke(filter.invoke()); } + return target.invokeExact(filter.invokeExact()); } protected Object invoke_C0() throws Throwable { - return target.invoke(filter.invoke()); } + return target.invokeExact(filter.invokeExact()); } static final Object[] NO_ARGS = { }; protected Object invoke_Y0() throws Throwable { - filter.<void>invoke(NO_ARGS); // make the flyby - return target.invoke(); } + filter.<void>invokeExact(NO_ARGS); // make the flyby + return target.invokeExact(); } } /* @@ -361,26 +361,26 @@ " return new @cat@(e, f, t); }", " //@each-P@", " protected Object invoke_V@P@(@Tvav@) throws Throwable {", - " return target.invoke(@a0_@@Psp@filter.invoke(a@P@)@_aN@); }", + " return target.invokeExact(@a0_@@Psp@filter.invokeExact(a@P@)@_aN@); }", " //@end-P@", " //@each-P@", " protected Object invoke_F@P@(@Tvav@) throws Throwable {", - " return target.invoke(filter.invoke(@a0@),", + " return target.invokeExact(filter.invokeExact(@a0@),", " @av@); }", " //@end-P@", " protected Object invoke_F@N@(@Tvav@) throws Throwable {", - " return target.invoke(filter.invoke(@av@),", + " return target.invokeExact(filter.invokeExact(@av@),", " @av@); }", " //@each-P@", " protected Object invoke_C@P@(@Tvav@) throws Throwable {", - " return target.invoke(@a0_@filter.invoke(a@P@@_aN@)); }", + " return target.invokeExact(@a0_@filter.invokeExact(a@P@@_aN@)); }", " //@end-P@", " protected Object invoke_C@N@(@Tvav@) throws Throwable {", - " return target.invoke(@av@, filter.invoke()); }", + " return target.invokeExact(@av@, filter.invokeExact()); }", " protected Object invoke_Y0(@Tvav@) throws Throwable {", " Object[] av = { @av@ };", - " filter.<void>invoke(av); // make the flyby", - " return target.invoke(@av[i]@); }", + " filter.<void>invokeExact(av); // make the flyby", + " return target.invokeExact(@av[i]@); }", " }", } }; static final String NEWLINE_INDENT = " //\n "; @@ -509,21 +509,21 @@ protected F1 makeInstance(MethodHandle e, MethodHandle f, MethodHandle t) { return new F1(e, f, t); } protected Object invoke_V0(Object a0) throws Throwable { - return target.invoke(filter.invoke(a0)); } + return target.invokeExact(filter.invokeExact(a0)); } protected Object invoke_F0(Object a0) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0); } protected Object invoke_F1(Object a0) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0); } protected Object invoke_C0(Object a0) throws Throwable { - return target.invoke(filter.invoke(a0)); } + return target.invokeExact(filter.invokeExact(a0)); } protected Object invoke_C1(Object a0) throws Throwable { - return target.invoke(a0, filter.invoke()); } + return target.invokeExact(a0, filter.invokeExact()); } protected Object invoke_Y0(Object a0) throws Throwable { Object[] av = { a0 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0]); } } static class F2 extends Adapter { protected F2(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -532,28 +532,28 @@ protected F2 makeInstance(MethodHandle e, MethodHandle f, MethodHandle t) { return new F2(e, f, t); } protected Object invoke_V0(Object a0, Object a1) throws Throwable { - return target.invoke(filter.invoke(a0), a1); } + return target.invokeExact(filter.invokeExact(a0), a1); } protected Object invoke_V1(Object a0, Object a1) throws Throwable { - return target.invoke(a0, filter.invoke(a1)); } + return target.invokeExact(a0, filter.invokeExact(a1)); } protected Object invoke_F0(Object a0, Object a1) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1); } protected Object invoke_F1(Object a0, Object a1) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1); } protected Object invoke_F2(Object a0, Object a1) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1); } protected Object invoke_C0(Object a0, Object a1) throws Throwable { - return target.invoke(filter.invoke(a0, a1)); } + return target.invokeExact(filter.invokeExact(a0, a1)); } protected Object invoke_C1(Object a0, Object a1) throws Throwable { - return target.invoke(a0, filter.invoke(a1)); } + return target.invokeExact(a0, filter.invokeExact(a1)); } protected Object invoke_C2(Object a0, Object a1) throws Throwable { - return target.invoke(a0, a1, filter.invoke()); } + return target.invokeExact(a0, a1, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1) throws Throwable { Object[] av = { a0, a1 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1]); } } static class F3 extends Adapter { protected F3(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -562,35 +562,35 @@ protected F3 makeInstance(MethodHandle e, MethodHandle f, MethodHandle t) { return new F3(e, f, t); } protected Object invoke_V0(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2); } + return target.invokeExact(filter.invokeExact(a0), a1, a2); } protected Object invoke_V1(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2); } + return target.invokeExact(a0, filter.invokeExact(a1), a2); } protected Object invoke_V2(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2)); } protected Object invoke_F0(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2); } protected Object invoke_F1(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2); } protected Object invoke_F2(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2); } protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2); } protected Object invoke_C0(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2)); } protected Object invoke_C1(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2)); } protected Object invoke_C2(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2)); } protected Object invoke_C3(Object a0, Object a1, Object a2) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke()); } + return target.invokeExact(a0, a1, a2, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2) throws Throwable { Object[] av = { a0, a1, a2 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2]); } } static class F4 extends Adapter { protected F4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -599,42 +599,42 @@ protected F4 makeInstance(MethodHandle e, MethodHandle f, MethodHandle t) { return new F4(e, f, t); } protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3); } + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3); } + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3); } + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3) throws Throwable { Object[] av = { a0, a1, a2, a3 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3]); } } static class F5 extends Adapter { protected F5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -644,66 +644,66 @@ return new F5(e, f, t); } protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4); } + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4); } + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4); } + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4)); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4)); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { Object[] av = { a0, a1, a2, a3, a4 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4]); } } static class F6 extends Adapter { protected F6(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -713,76 +713,76 @@ return new F6(e, f, t); } protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5); } + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5); } + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5); } + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5)); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5)); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5)); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5]); } } static class F7 extends Adapter { protected F7(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -792,86 +792,86 @@ return new F7(e, f, t); } protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6); } + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6); } + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6); } + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6)); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6)); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6]); } } static class F8 extends Adapter { protected F8(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -881,96 +881,96 @@ return new F8(e, f, t); } protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7); } + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7); } + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7); } + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7)); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7)); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7]); } } static class F9 extends Adapter { protected F9(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -981,135 +981,135 @@ protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8); } + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8); } + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8); } + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8)); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8)); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8]); } } static class F10 extends Adapter { protected F10(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -1120,148 +1120,148 @@ protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9); } + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9); } + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9); } + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9)); } + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9)); } + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9)); } + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9)); } + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9]); } } static class F11 extends Adapter { protected F11(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -1272,182 +1272,182 @@ protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10]); } } static class F12 extends Adapter { protected F12(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -1458,198 +1458,198 @@ protected Object invoke_V0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11]); } } static class F13 extends Adapter { protected F13(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -1661,255 +1661,255 @@ Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12]); } } static class F14 extends Adapter { protected F14(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -1921,274 +1921,274 @@ Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12, a13); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12, a13); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12, a13); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12, a13); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12, a13); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12, a13); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12, a13); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12), a13); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12), a13); } protected Object invoke_V13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_F14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12, a13)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12, a13)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12, a13)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12, a13)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12, a13)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12, a13)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12, a13)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12, a13)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12, a13)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13)); } protected Object invoke_C14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13]); } } static class F15 extends Adapter { protected F15(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -2200,293 +2200,293 @@ Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12, a13, a14); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12, a13, a14); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12, a13, a14); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12, a13, a14); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12, a13, a14); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12, a13, a14); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12), a13, a14); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12), a13, a14); } protected Object invoke_V13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13), a14); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13), a14); } protected Object invoke_V14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_F15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12, a13, a14)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12, a13, a14)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12, a13, a14)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12, a13, a14)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12, a13, a14)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12, a13, a14)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12, a13, a14)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12, a13, a14)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13, a14)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13, a14)); } protected Object invoke_C14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14)); } protected Object invoke_C15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14]); } } static class F16 extends Adapter { protected F16(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -2498,312 +2498,312 @@ Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12, a13, a14, a15); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12, a13, a14, a15); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12, a13, a14, a15); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12, a13, a14, a15); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12, a13, a14, a15); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12), a13, a14, a15); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12), a13, a14, a15); } protected Object invoke_V13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13), a14, a15); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13), a14, a15); } protected Object invoke_V14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14), a15); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14), a15); } protected Object invoke_V15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_F16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12, a13, a14, a15)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12, a13, a14, a15)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12, a13, a14, a15)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12, a13, a14, a15)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12, a13, a14, a15)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12, a13, a14, a15)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12, a13, a14, a15)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13, a14, a15)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13, a14, a15)); } protected Object invoke_C14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14, a15)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14, a15)); } protected Object invoke_C15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15)); } protected Object invoke_C16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15]); } } static class F17 extends Adapter { protected F17(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -2816,203 +2816,203 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12, a13, a14, a15, a16); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12, a13, a14, a15, a16); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12, a13, a14, a15, a16); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12, a13, a14, a15, a16); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12), a13, a14, a15, a16); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12), a13, a14, a15, a16); } protected Object invoke_V13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13), a14, a15, a16); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13), a14, a15, a16); } protected Object invoke_V14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14), a15, a16); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14), a15, a16); } protected Object invoke_V15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15), a16); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15), a16); } protected Object invoke_V16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, @@ -3020,7 +3020,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, @@ -3028,7 +3028,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F14(Object a0, Object a1, Object a2, Object a3, @@ -3036,7 +3036,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F15(Object a0, Object a1, Object a2, Object a3, @@ -3044,7 +3044,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F16(Object a0, Object a1, Object a2, Object a3, @@ -3052,7 +3052,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_F17(Object a0, Object a1, Object a2, Object a3, @@ -3060,140 +3060,140 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12, a13, a14, a15, a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12, a13, a14, a15, a16)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12, a13, a14, a15, a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12, a13, a14, a15, a16)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12, a13, a14, a15, a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12, a13, a14, a15, a16)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13, a14, a15, a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13, a14, a15, a16)); } protected Object invoke_C14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14, a15, a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14, a15, a16)); } protected Object invoke_C15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15, a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15, a16)); } protected Object invoke_C16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16)); } protected Object invoke_C17(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16]); } } static class F18 extends Adapter { protected F18(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -3206,210 +3206,210 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12, a13, a14, a15, a16, a17); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12, a13, a14, a15, a16, a17); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12, a13, a14, a15, a16, a17); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12), a13, a14, a15, a16, a17); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12), a13, a14, a15, a16, a17); } protected Object invoke_V13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13), a14, a15, a16, a17); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13), a14, a15, a16, a17); } protected Object invoke_V14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14), a15, a16, a17); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14), a15, a16, a17); } protected Object invoke_V15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15), a16, a17); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15), a16, a17); } protected Object invoke_V16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16), a17); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16), a17); } protected Object invoke_V17(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, filter.invoke(a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, filter.invokeExact(a17)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, @@ -3417,7 +3417,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, @@ -3425,7 +3425,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F14(Object a0, Object a1, Object a2, Object a3, @@ -3433,7 +3433,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F15(Object a0, Object a1, Object a2, Object a3, @@ -3441,7 +3441,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F16(Object a0, Object a1, Object a2, Object a3, @@ -3449,7 +3449,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F17(Object a0, Object a1, Object a2, Object a3, @@ -3457,7 +3457,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_F18(Object a0, Object a1, Object a2, Object a3, @@ -3465,147 +3465,147 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12, a13, a14, a15, a16, a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12, a13, a14, a15, a16, a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12, a13, a14, a15, a16, a17)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12, a13, a14, a15, a16, a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12, a13, a14, a15, a16, a17)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13, a14, a15, a16, a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13, a14, a15, a16, a17)); } protected Object invoke_C14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14, a15, a16, a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14, a15, a16, a17)); } protected Object invoke_C15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15, a16, a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15, a16, a17)); } protected Object invoke_C16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16, a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16, a17)); } protected Object invoke_C17(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, filter.invoke(a17)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, filter.invokeExact(a17)); } protected Object invoke_C18(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16], av[17]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16], av[17]); } } static class F19 extends Adapter { protected F19(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -3618,217 +3618,217 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12, a13, a14, a15, a16, a17, a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12, a13, a14, a15, a16, a17, a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12), a13, a14, a15, a16, a17, a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12), a13, a14, a15, a16, a17, a18); } protected Object invoke_V13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13), a14, a15, a16, a17, a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13), a14, a15, a16, a17, a18); } protected Object invoke_V14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14), a15, a16, a17, a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14), a15, a16, a17, a18); } protected Object invoke_V15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15), a16, a17, a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15), a16, a17, a18); } protected Object invoke_V16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16), a17, a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16), a17, a18); } protected Object invoke_V17(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, filter.invoke(a17), a18); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, filter.invokeExact(a17), a18); } protected Object invoke_V18(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, a17, filter.invoke(a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, a17, filter.invokeExact(a18)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, @@ -3836,7 +3836,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, @@ -3844,7 +3844,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F14(Object a0, Object a1, Object a2, Object a3, @@ -3852,7 +3852,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F15(Object a0, Object a1, Object a2, Object a3, @@ -3860,7 +3860,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F16(Object a0, Object a1, Object a2, Object a3, @@ -3868,7 +3868,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F17(Object a0, Object a1, Object a2, Object a3, @@ -3876,7 +3876,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F18(Object a0, Object a1, Object a2, Object a3, @@ -3884,7 +3884,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_F19(Object a0, Object a1, Object a2, Object a3, @@ -3892,154 +3892,154 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12, a13, a14, a15, a16, a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12, a13, a14, a15, a16, a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12, a13, a14, a15, a16, a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12, a13, a14, a15, a16, a17, a18)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13, a14, a15, a16, a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13, a14, a15, a16, a17, a18)); } protected Object invoke_C14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14, a15, a16, a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14, a15, a16, a17, a18)); } protected Object invoke_C15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15, a16, a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15, a16, a17, a18)); } protected Object invoke_C16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16, a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16, a17, a18)); } protected Object invoke_C17(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, filter.invoke(a17, a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, filter.invokeExact(a17, a18)); } protected Object invoke_C18(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, a17, filter.invoke(a18)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, a17, filter.invokeExact(a18)); } protected Object invoke_C19(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16], av[17], av[18]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16], av[17], av[18]); } } static class F20 extends Adapter { protected F20(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -4052,224 +4052,224 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0), a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, filter.invoke(a1), a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1), a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2), a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2), a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3), a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3), a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4), a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4), a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5), a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5), a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6), a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6), a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7), a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7), a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8), a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8), a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9), + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9), a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - filter.invoke(a10), a11, a12, a13, a14, a15, a16, a17, a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + filter.invokeExact(a10), a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11), a12, a13, a14, a15, a16, a17, a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11), a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12), a13, a14, a15, a16, a17, a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12), a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_V13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13), a14, a15, a16, a17, a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13), a14, a15, a16, a17, a18, a19); } protected Object invoke_V14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14), a15, a16, a17, a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14), a15, a16, a17, a18, a19); } protected Object invoke_V15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15), a16, a17, a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15), a16, a17, a18, a19); } protected Object invoke_V16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16), a17, a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16), a17, a18, a19); } protected Object invoke_V17(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, filter.invoke(a17), a18, a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, filter.invokeExact(a17), a18, a19); } protected Object invoke_V18(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, a17, filter.invoke(a18), a19); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, a17, filter.invokeExact(a18), a19); } protected Object invoke_V19(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, a17, a18, filter.invoke(a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, a17, a18, filter.invokeExact(a19)); } protected Object invoke_F0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(), + return target.invokeExact(filter.invokeExact(), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0), + return target.invokeExact(filter.invokeExact(a0), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1), + return target.invokeExact(filter.invokeExact(a0, a1), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2), + return target.invokeExact(filter.invokeExact(a0, a1, a2), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F12(Object a0, Object a1, Object a2, Object a3, @@ -4277,7 +4277,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F13(Object a0, Object a1, Object a2, Object a3, @@ -4285,7 +4285,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F14(Object a0, Object a1, Object a2, Object a3, @@ -4293,7 +4293,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F15(Object a0, Object a1, Object a2, Object a3, @@ -4301,7 +4301,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F16(Object a0, Object a1, Object a2, Object a3, @@ -4309,7 +4309,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F17(Object a0, Object a1, Object a2, Object a3, @@ -4317,7 +4317,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F18(Object a0, Object a1, Object a2, Object a3, @@ -4325,7 +4325,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F19(Object a0, Object a1, Object a2, Object a3, @@ -4333,7 +4333,7 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_F20(Object a0, Object a1, Object a2, Object a3, @@ -4341,160 +4341,160 @@ Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19), + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19), a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19); } protected Object invoke_C0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(filter.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(filter.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, filter.invoke(a1, a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, filter.invokeExact(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, filter.invoke(a2, a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, filter.invokeExact(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, filter.invoke(a3, a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, filter.invokeExact(a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, filter.invoke(a4, a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, filter.invokeExact(a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C5(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, filter.invoke(a5, a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, filter.invokeExact(a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, filter.invoke(a6, a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, filter.invokeExact(a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, filter.invoke(a7, a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, filter.invokeExact(a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, filter.invoke(a8, a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, filter.invokeExact(a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invoke(a9, + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, filter.invokeExact(a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invoke(a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, filter.invokeExact(a10, a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C11(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, filter.invoke(a11, a12, a13, a14, a15, a16, a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, filter.invokeExact(a11, a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C12(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, filter.invoke(a12, a13, a14, a15, a16, a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, filter.invokeExact(a12, a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C13(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, filter.invoke(a13, a14, a15, a16, a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, filter.invokeExact(a13, a14, a15, a16, a17, a18, a19)); } protected Object invoke_C14(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, filter.invoke(a14, a15, a16, a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, filter.invokeExact(a14, a15, a16, a17, a18, a19)); } protected Object invoke_C15(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, filter.invoke(a15, a16, a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, filter.invokeExact(a15, a16, a17, a18, a19)); } protected Object invoke_C16(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, filter.invoke(a16, a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, filter.invokeExact(a16, a17, a18, a19)); } protected Object invoke_C17(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, filter.invoke(a17, a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, filter.invokeExact(a17, a18, a19)); } protected Object invoke_C18(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, a17, filter.invoke(a18, a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, a17, filter.invokeExact(a18, a19)); } protected Object invoke_C19(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, - a10, a11, a12, a13, a14, a15, a16, a17, a18, filter.invoke(a19)); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, + a10, a11, a12, a13, a14, a15, a16, a17, a18, filter.invokeExact(a19)); } protected Object invoke_C20(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { - return target.invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, filter.invoke()); } + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, filter.invokeExact()); } protected Object invoke_Y0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object a10, Object a11, Object a12, Object a13, Object a14, Object a15, Object a16, Object a17, Object a18, Object a19) throws Throwable { Object[] av = { a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19 }; - filter.<void>invoke(av); // make the flyby - return target.invoke(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16], av[17], av[18], av[19]); } + filter.<void>invokeExact(av); // make the flyby + return target.invokeExact(av[0], av[1], av[2], av[3], av[4], av[5], av[6], av[7], av[8], av[9], av[10], av[11], av[12], av[13], av[14], av[15], av[16], av[17], av[18], av[19]); } } }
--- a/jdk/src/share/classes/sun/dyn/FilterOneArgument.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/FilterOneArgument.java Thu Jul 08 11:28:01 2010 -0700 @@ -47,8 +47,8 @@ } protected Object invoke(Object argument) throws Throwable { - Object filteredArgument = filter.invoke(argument); - return target.invoke(filteredArgument); + Object filteredArgument = filter.invokeExact(argument); + return target.invokeExact(filteredArgument); } private static final MethodHandle INVOKE =
--- a/jdk/src/share/classes/sun/dyn/FromGeneric.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/FromGeneric.java Thu Jul 08 11:28:01 2010 -0700 @@ -289,11 +289,11 @@ // { return new ThisType(entryPoint, convert, target); } /// Conversions on the value returned from the target. - protected Object convert_L(Object result) throws Throwable { return convert.<Object>invoke(result); } - protected Object convert_I(int result) throws Throwable { return convert.<Object>invoke(result); } - protected Object convert_J(long result) throws Throwable { return convert.<Object>invoke(result); } - protected Object convert_F(float result) throws Throwable { return convert.<Object>invoke(result); } - protected Object convert_D(double result) throws Throwable { return convert.<Object>invoke(result); } + protected Object convert_L(Object result) throws Throwable { return convert.<Object>invokeExact(result); } + protected Object convert_I(int result) throws Throwable { return convert.<Object>invokeExact(result); } + protected Object convert_J(long result) throws Throwable { return convert.<Object>invokeExact(result); } + protected Object convert_F(float result) throws Throwable { return convert.<Object>invokeExact(result); } + protected Object convert_D(double result) throws Throwable { return convert.<Object>invokeExact(result); } static private final String CLASS_PREFIX; // "sun.dyn.FromGeneric$" static { @@ -322,11 +322,11 @@ { super(e, i, c, t); } protected xA2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new xA2(e, i, c, t); } - protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1)); } - protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1)); } - protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1)); } - protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1)); } - protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1)); } + protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1)); } + protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1)); } + protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1)); } + protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1)); } + protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1)); } } // */ @@ -347,7 +347,7 @@ " protected @cat@ makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t)", " { return new @cat@(e, i, c, t); }", " //@each-R@", - " protected Object invoke_@catN@(@Tvav@) throws Throwable { return convert_@Rc@(invoker.<@R@>invoke(target@av@)); }", + " protected Object invoke_@catN@(@Tvav@) throws Throwable { return convert_@Rc@(invoker.<@R@>invokeExact(target@av@)); }", " //@end-R@", " }", } }; @@ -503,11 +503,11 @@ { super(e, i, c, t); } protected A0 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A0(e, i, c, t); } - protected Object invoke_L0() throws Throwable { return convert_L(invoker.<Object>invoke(target)); } - protected Object invoke_I0() throws Throwable { return convert_I(invoker.<int >invoke(target)); } - protected Object invoke_J0() throws Throwable { return convert_J(invoker.<long >invoke(target)); } - protected Object invoke_F0() throws Throwable { return convert_F(invoker.<float >invoke(target)); } - protected Object invoke_D0() throws Throwable { return convert_D(invoker.<double>invoke(target)); } + protected Object invoke_L0() throws Throwable { return convert_L(invoker.<Object>invokeExact(target)); } + protected Object invoke_I0() throws Throwable { return convert_I(invoker.<int >invokeExact(target)); } + protected Object invoke_J0() throws Throwable { return convert_J(invoker.<long >invokeExact(target)); } + protected Object invoke_F0() throws Throwable { return convert_F(invoker.<float >invokeExact(target)); } + protected Object invoke_D0() throws Throwable { return convert_D(invoker.<double>invokeExact(target)); } } static class A1 extends Adapter { protected A1(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -515,11 +515,11 @@ { super(e, i, c, t); } protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A1(e, i, c, t); } - protected Object invoke_L1(Object a0) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0)); } - protected Object invoke_I1(Object a0) throws Throwable { return convert_I(invoker.<int >invoke(target, a0)); } - protected Object invoke_J1(Object a0) throws Throwable { return convert_J(invoker.<long >invoke(target, a0)); } - protected Object invoke_F1(Object a0) throws Throwable { return convert_F(invoker.<float >invoke(target, a0)); } - protected Object invoke_D1(Object a0) throws Throwable { return convert_D(invoker.<double>invoke(target, a0)); } + protected Object invoke_L1(Object a0) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0)); } + protected Object invoke_I1(Object a0) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0)); } + protected Object invoke_J1(Object a0) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0)); } + protected Object invoke_F1(Object a0) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0)); } + protected Object invoke_D1(Object a0) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0)); } } static class A2 extends Adapter { protected A2(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -527,11 +527,11 @@ { super(e, i, c, t); } protected A2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A2(e, i, c, t); } - protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1)); } - protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1)); } - protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1)); } - protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1)); } - protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1)); } + protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1)); } + protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1)); } + protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1)); } + protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1)); } + protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1)); } } static class A3 extends Adapter { protected A3(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -539,11 +539,11 @@ { super(e, i, c, t); } protected A3 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A3(e, i, c, t); } - protected Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2)); } - protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2)); } - protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2)); } - protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2)); } - protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2)); } + protected Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2)); } + protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2)); } + protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2)); } + protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2)); } + protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2)); } } static class A4 extends Adapter { protected A4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -551,11 +551,11 @@ { super(e, i, c, t); } protected A4 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A4(e, i, c, t); } - protected Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2, a3)); } - protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2, a3)); } - protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2, a3)); } - protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2, a3)); } - protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2, a3)); } + protected Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2, a3)); } + protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2, a3)); } + protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2, a3)); } + protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2, a3)); } + protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2, a3)); } } static class A5 extends Adapter { protected A5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -563,11 +563,11 @@ { super(e, i, c, t); } protected A5 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A5(e, i, c, t); } - protected Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2, a3, a4)); } - protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2, a3, a4)); } - protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2, a3, a4)); } - protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2, a3, a4)); } - protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2, a3, a4)); } + protected Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4)); } + protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2, a3, a4)); } + protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2, a3, a4)); } + protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2, a3, a4)); } + protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2, a3, a4)); } } static class A6 extends Adapter { protected A6(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -575,11 +575,11 @@ { super(e, i, c, t); } protected A6 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A6(e, i, c, t); } - protected Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5)); } - protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2, a3, a4, a5)); } - protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2, a3, a4, a5)); } - protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2, a3, a4, a5)); } - protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2, a3, a4, a5)); } + protected Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5)); } + protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2, a3, a4, a5)); } + protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2, a3, a4, a5)); } + protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2, a3, a4, a5)); } + protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2, a3, a4, a5)); } } static class A7 extends Adapter { protected A7(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -587,11 +587,11 @@ { super(e, i, c, t); } protected A7 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A7(e, i, c, t); } - protected Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6)); } - protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2, a3, a4, a5, a6)); } - protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2, a3, a4, a5, a6)); } - protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2, a3, a4, a5, a6)); } - protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2, a3, a4, a5, a6)); } + protected Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } + protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } + protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } + protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } + protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } } static class A8 extends Adapter { protected A8(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -599,11 +599,11 @@ { super(e, i, c, t); } protected A8 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A8(e, i, c, t); } - protected Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7)); } - protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7)); } - protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7)); } - protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7)); } - protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7)); } + protected Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } + protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } + protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } + protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } + protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } } static class A9 extends Adapter { protected A9(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -611,11 +611,11 @@ { super(e, i, c, t); } protected A9 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A9(e, i, c, t); } - protected Object invoke_L9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } - protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } - protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } - protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } - protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } + protected Object invoke_L9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } + protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } + protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } + protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } + protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } } static class A10 extends Adapter { protected A10(MethodHandle entryPoint) { super(entryPoint); } // to build prototype @@ -623,10 +623,10 @@ { super(e, i, c, t); } protected A10 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A10(e, i, c, t); } - protected Object invoke_L10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_L(invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } - protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I(invoker.<int >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } - protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J(invoker.<long >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } - protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F(invoker.<float >invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } - protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D(invoker.<double>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + protected Object invoke_L10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_L(invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I(invoker.<int >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J(invoker.<long >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F(invoker.<float >invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D(invoker.<double>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } } }
--- a/jdk/src/share/classes/sun/dyn/MemberName.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/MemberName.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -40,15 +40,29 @@ import static sun.dyn.MethodHandleNatives.Constants.*; /** - * Compact information which fully characterizes a method or field reference. - * When resolved, it includes a direct pointer to JVM metadata. + * A {@code MemberName} is a compact symbolic datum which fully characterizes + * a method or field reference. + * A member name refers to a field, method, constructor, or member type. + * Every member name has a simple name (a string) and a type (either a Class or MethodType). + * A member name may also have a non-null declaring class, or it may be simply + * a naked name/type pair. + * A member name may also have non-zero modifier flags. + * Finally, a member name may be either resolved or unresolved. + * If it is resolved, the existence of the named + * <p> + * Whether resolved or not, a member name provides no access rights or + * invocation capability to its possessor. It is merely a compact + * representation of all symbolic information necessary to link to + * and properly use the named member. + * <p> + * When resolved, a member name's internal implementation may include references to JVM metadata. * This representation is stateless and only decriptive. * It provides no private information and no capability to use the member. * <p> - * By contrast, a java.lang.reflect.Method contains fuller information + * By contrast, a {@linkplain java.lang.reflect.Method} contains fuller information * about the internals of a method (except its bytecodes) and also - * allows invocation. A MemberName is much lighter than a reflect.Method, - * since it contains about 7 fields to Method's 16 (plus its sub-arrays), + * allows invocation. A MemberName is much lighter than a Method, + * since it contains about 7 fields to the 16 of Method (plus its sub-arrays), * and those seven fields omit much of the information in Method. * @author jrose */ @@ -63,6 +77,9 @@ { vmindex = VM_INDEX_UNINITIALIZED; } + /** Return the declaring class of this member. + * In the case of a bare name and type, the declaring class will be null. + */ public Class<?> getDeclaringClass() { if (clazz == null && isResolved()) { expandFromVM(); @@ -70,10 +87,16 @@ return clazz; } + /** Utility method producing the class loader of the declaring class. */ public ClassLoader getClassLoader() { return clazz.getClassLoader(); } + /** Return the simple name of this member. + * For a type, it is the same as {@link Class#getSimpleName}. + * For a method or field, it is the simple name of the member. + * For a constructor, it is always {@code "<init>"}. + */ public String getName() { if (name == null) { expandFromVM(); @@ -82,6 +105,9 @@ return name; } + /** Return the declared type of this member, which + * must be a method or constructor. + */ public MethodType getMethodType() { if (type == null) { expandFromVM(); @@ -109,6 +135,10 @@ throw new InternalError("bad method type "+type); } + /** Return the actual type under which this method or constructor must be invoked. + * For non-static methods or constructors, this is the type with a leading parameter, + * a reference to declaring class. For static methods, it is the same as the declared type. + */ public MethodType getInvocationType() { MethodType itype = getMethodType(); if (!isStatic()) @@ -116,14 +146,20 @@ return itype; } + /** Utility method producing the parameter types of the method type. */ public Class<?>[] getParameterTypes() { return getMethodType().parameterArray(); } + /** Utility method producing the return type of the method type. */ public Class<?> getReturnType() { return getMethodType().returnType(); } + /** Return the declared type of this member, which + * must be a field or type. + * If it is a type member, that type itself is returned. + */ public Class<?> getFieldType() { if (type == null) { expandFromVM(); @@ -144,10 +180,14 @@ throw new InternalError("bad field type "+type); } + /** Utility method to produce either the method type or field type of this member. */ public Object getType() { return (isInvocable() ? getMethodType() : getFieldType()); } + /** Utility method to produce the signature of this member, + * used within the class file format to describe its type. + */ public String getSignature() { if (type == null) { expandFromVM(); @@ -161,6 +201,9 @@ return BytecodeDescriptor.unparse(getFieldType()); } + /** Return the modifier flags of this member. + * @see java.lang.reflect.Modifier + */ public int getModifiers() { return (flags & RECOGNIZED_MODIFIERS); } @@ -180,21 +223,27 @@ return !testFlags(mask, 0); } + /** Utility method to query the modifier flags of this member. */ public boolean isStatic() { return Modifier.isStatic(flags); } + /** Utility method to query the modifier flags of this member. */ public boolean isPublic() { return Modifier.isPublic(flags); } + /** Utility method to query the modifier flags of this member. */ public boolean isPrivate() { return Modifier.isPrivate(flags); } + /** Utility method to query the modifier flags of this member. */ public boolean isProtected() { return Modifier.isProtected(flags); } + /** Utility method to query the modifier flags of this member. */ public boolean isFinal() { return Modifier.isFinal(flags); } + /** Utility method to query the modifier flags of this member. */ public boolean isAbstract() { return Modifier.isAbstract(flags); } @@ -206,12 +255,15 @@ static final int SYNTHETIC = 0x00001000; static final int ANNOTATION= 0x00002000; static final int ENUM = 0x00004000; + /** Utility method to query the modifier flags of this member; returns false if the member is not a method. */ public boolean isBridge() { return testAllFlags(IS_METHOD | BRIDGE); } + /** Utility method to query the modifier flags of this member; returns false if the member is not a method. */ public boolean isVarargs() { return testAllFlags(VARARGS) && isInvocable(); } + /** Utility method to query the modifier flags of this member; returns false if the member is not a method. */ public boolean isSynthetic() { return testAllFlags(SYNTHETIC); } @@ -237,24 +289,31 @@ static final int IS_FIELD_OR_METHOD = IS_METHOD | IS_FIELD; static final int SEARCH_ALL_SUPERS = SEARCH_SUPERCLASSES | SEARCH_INTERFACES; + /** Utility method to query whether this member is a method or constructor. */ public boolean isInvocable() { return testAnyFlags(IS_INVOCABLE); } + /** Utility method to query whether this member is a method, constructor, or field. */ public boolean isFieldOrMethod() { return testAnyFlags(IS_FIELD_OR_METHOD); } + /** Query whether this member is a method. */ public boolean isMethod() { return testAllFlags(IS_METHOD); } + /** Query whether this member is a constructor. */ public boolean isConstructor() { return testAllFlags(IS_CONSTRUCTOR); } + /** Query whether this member is a field. */ public boolean isField() { return testAllFlags(IS_FIELD); } + /** Query whether this member is a type. */ public boolean isType() { return testAllFlags(IS_TYPE); } + /** Utility method to query whether this member is neither public, private, nor protected. */ public boolean isPackage() { return !testAnyFlags(ALL_ACCESS); } @@ -262,8 +321,8 @@ /** Initialize a query. It is not resolved. */ private void init(Class<?> defClass, String name, Object type, int flags) { // defining class is allowed to be null (for a naked name/type pair) - name.toString(); // null check - type.equals(type); // null check + //name.toString(); // null check + //type.equals(type); // null check // fill in fields: this.clazz = defClass; this.name = name; @@ -285,6 +344,7 @@ assert((mods & ~RECOGNIZED_MODIFIERS) == 0); return flags | mods; } + /** Create a name for the given reflected method. The resulting name will be in a resolved state. */ public MemberName(Method m) { Object[] typeInfo = { m.getReturnType(), m.getParameterTypes() }; init(m.getDeclaringClass(), m.getName(), typeInfo, flagsMods(IS_METHOD, m.getModifiers())); @@ -292,6 +352,7 @@ MethodHandleNatives.init(this, m); assert(isResolved()); } + /** Create a name for the given reflected constructor. The resulting name will be in a resolved state. */ public MemberName(Constructor ctor) { Object[] typeInfo = { void.class, ctor.getParameterTypes() }; init(ctor.getDeclaringClass(), CONSTRUCTOR_NAME, typeInfo, flagsMods(IS_CONSTRUCTOR, ctor.getModifiers())); @@ -299,12 +360,14 @@ MethodHandleNatives.init(this, ctor); assert(isResolved()); } + /** Create a name for the given reflected field. The resulting name will be in a resolved state. */ public MemberName(Field fld) { init(fld.getDeclaringClass(), fld.getName(), fld.getType(), flagsMods(IS_FIELD, fld.getModifiers())); // fill in vmtarget, vmindex while we have fld in hand: MethodHandleNatives.init(this, fld); assert(isResolved()); } + /** Create a name for the given class. The resulting name will be in a resolved state. */ public MemberName(Class<?> type) { init(type.getDeclaringClass(), type.getSimpleName(), type, flagsMods(IS_TYPE, type.getModifiers())); vmindex = 0; // isResolved @@ -326,28 +389,62 @@ // %%% define equals/hashcode? // Construction from symbolic parts, for queries: + /** Create a field or type name from the given components: Declaring class, name, type, modifiers. + * The declaring class may be supplied as null if this is to be a bare name and type. + * The resulting name will in an unresolved state. + */ public MemberName(Class<?> defClass, String name, Class<?> type, int modifiers) { init(defClass, name, type, IS_FIELD | (modifiers & RECOGNIZED_MODIFIERS)); } + /** Create a field or type name from the given components: Declaring class, name, type. + * The declaring class may be supplied as null if this is to be a bare name and type. + * The modifier flags default to zero. + * The resulting name will in an unresolved state. + */ public MemberName(Class<?> defClass, String name, Class<?> type) { this(defClass, name, type, 0); } + /** Create a method or constructor name from the given components: Declaring class, name, type, modifiers. + * It will be a constructor if and only if the name is {@code "<init>"}. + * The declaring class may be supplied as null if this is to be a bare name and type. + * The resulting name will in an unresolved state. + */ public MemberName(Class<?> defClass, String name, MethodType type, int modifiers) { int flagBit = (name.equals(CONSTRUCTOR_NAME) ? IS_CONSTRUCTOR : IS_METHOD); init(defClass, name, type, flagBit | (modifiers & RECOGNIZED_MODIFIERS)); } + /** Create a method or constructor name from the given components: Declaring class, name, type, modifiers. + * It will be a constructor if and only if the name is {@code "<init>"}. + * The declaring class may be supplied as null if this is to be a bare name and type. + * The modifier flags default to zero. + * The resulting name will in an unresolved state. + */ public MemberName(Class<?> defClass, String name, MethodType type) { this(defClass, name, type, 0); } - boolean isResolved() { + /** Query whether this member name is resolved. + * A resolved member name is one for which the JVM has found + * a method, constructor, field, or type binding corresponding exactly to the name. + * (Document?) + */ + public boolean isResolved() { return (vmindex != VM_INDEX_UNINITIALIZED); } + /** Query whether this member name is resolved to a non-static, non-final method. + */ public boolean hasReceiverTypeDispatch() { return (isMethod() && getVMIndex(Access.TOKEN) >= 0); } + /** Produce a string form of this member name. + * For types, it is simply the type's own string (as reported by {@code toString}). + * For fields, it is {@code "DeclaringClass.name/type"}. + * For methods and constructors, it is {@code "DeclaringClass.name(ptype...)rtype"}. + * If the declaring class is null, the prefix {@code "DeclaringClass."} is omitted. + * If the member is unresolved, a prefix {@code "*."} is prepended. + */ @Override public String toString() { if (isType()) @@ -360,9 +457,15 @@ buf.append(getName(clazz)); buf.append('.'); } - buf.append(getName()); - if (!isInvocable()) buf.append('/'); - buf.append(getName(getType())); + String name = getName(); + buf.append(name == null ? "*" : name); + Object type = getType(); + if (!isInvocable()) { + buf.append('/'); + buf.append(type == null ? "*" : getName(type)); + } else { + buf.append(type == null ? "(*)*" : getName(type)); + } /* buf.append('/'); // key: Public, private, pRotected, sTatic, Final, sYnchronized, @@ -374,7 +477,7 @@ for (int i = 0; i < modChars.length(); i++) { if ((flags & (1 << i)) != 0) { char mc = modChars.charAt(i); - if (mc != '.') + if (mc != '?') buf.append(mc); } } @@ -388,6 +491,7 @@ } // Queries to the JVM: + /** Document? */ public int getVMIndex(Access token) { Access.check(token); if (!isResolved()) @@ -411,9 +515,6 @@ public static NoAccessException newNoAccessException(MemberName name, Class<?> lookupClass) { return newNoAccessException("cannot access", name, lookupClass); } - public static NoAccessException newNoAccessException(MemberName name, MethodHandles.Lookup lookup) { - return newNoAccessException(name, lookup.lookupClass()); - } public static NoAccessException newNoAccessException(String message, MemberName name, Class<?> lookupClass) { message += ": " + name; @@ -429,6 +530,9 @@ public static Factory getFactory() { return getFactory(Access.getToken()); } + /** A factory type for resolving member names with the help of the VM. + * TBD: Define access-safe public constructors for this factory. + */ public static class Factory { private Factory() { } // singleton pattern static Factory INSTANCE = new Factory(); @@ -494,6 +598,21 @@ return result; } boolean resolveInPlace(MemberName m, boolean searchSupers, Class<?> lookupClass) { + if (m.name == null || m.type == null) { // find unique non-overloaded name + Class<?> defc = m.getDeclaringClass(); + List<MemberName> choices = null; + if (m.isMethod()) + choices = getMethods(defc, searchSupers, m.name, (MethodType) m.type, lookupClass); + else if (m.isConstructor()) + choices = getConstructors(defc, lookupClass); + else if (m.isField()) + choices = getFields(defc, searchSupers, m.name, (Class<?>) m.type, lookupClass); + //System.out.println("resolving "+m+" to "+choices); + if (choices == null || choices.size() != 1) + return false; + if (m.name == null) m.name = choices.get(0).name; + if (m.type == null) m.type = choices.get(0).type; + } MethodHandleNatives.resolve(m, lookupClass); if (m.isResolved()) return true; int matchFlags = m.flags | (searchSupers ? SEARCH_ALL_SUPERS : 0); @@ -504,39 +623,82 @@ if (n != 1) return false; return m.isResolved(); } + /** Produce a resolved version of the given member. + * Super types are searched (for inherited members) if {@code searchSupers} is true. + * Access checking is performed on behalf of the given {@code lookupClass}. + * If lookup fails or access is not permitted, null is returned. + * Otherwise a fresh copy of the given member is returned, with modifier bits filled in. + */ public MemberName resolveOrNull(MemberName m, boolean searchSupers, Class<?> lookupClass) { MemberName result = m.clone(); if (resolveInPlace(result, searchSupers, lookupClass)) return result; return null; } + /** Produce a resolved version of the given member. + * Super types are searched (for inherited members) if {@code searchSupers} is true. + * Access checking is performed on behalf of the given {@code lookupClass}. + * If lookup fails or access is not permitted, a {@linkplain NoAccessException} is thrown. + * Otherwise a fresh copy of the given member is returned, with modifier bits filled in. + */ public MemberName resolveOrFail(MemberName m, boolean searchSupers, Class<?> lookupClass) { MemberName result = resolveOrNull(m, searchSupers, lookupClass); if (result != null) return result; throw newNoAccessException(m, lookupClass); } + /** Return a list of all methods defined by the given class. + * Super types are searched (for inherited members) if {@code searchSupers} is true. + * Access checking is performed on behalf of the given {@code lookupClass}. + * Inaccessible members are not added to the last. + */ public List<MemberName> getMethods(Class<?> defc, boolean searchSupers, Class<?> lookupClass) { return getMethods(defc, searchSupers, null, null, lookupClass); } + /** Return a list of matching methods defined by the given class. + * Super types are searched (for inherited members) if {@code searchSupers} is true. + * Returned methods will match the name (if not null) and the type (if not null). + * Access checking is performed on behalf of the given {@code lookupClass}. + * Inaccessible members are not added to the last. + */ public List<MemberName> getMethods(Class<?> defc, boolean searchSupers, String name, MethodType type, Class<?> lookupClass) { int matchFlags = IS_METHOD | (searchSupers ? SEARCH_ALL_SUPERS : 0); return getMembers(defc, name, type, matchFlags, lookupClass); } + /** Return a list of all constructors defined by the given class. + * Access checking is performed on behalf of the given {@code lookupClass}. + * Inaccessible members are not added to the last. + */ public List<MemberName> getConstructors(Class<?> defc, Class<?> lookupClass) { return getMembers(defc, null, null, IS_CONSTRUCTOR, lookupClass); } + /** Return a list of all fields defined by the given class. + * Super types are searched (for inherited members) if {@code searchSupers} is true. + * Access checking is performed on behalf of the given {@code lookupClass}. + * Inaccessible members are not added to the last. + */ public List<MemberName> getFields(Class<?> defc, boolean searchSupers, Class<?> lookupClass) { return getFields(defc, searchSupers, null, null, lookupClass); } + /** Return a list of all fields defined by the given class. + * Super types are searched (for inherited members) if {@code searchSupers} is true. + * Returned fields will match the name (if not null) and the type (if not null). + * Access checking is performed on behalf of the given {@code lookupClass}. + * Inaccessible members are not added to the last. + */ public List<MemberName> getFields(Class<?> defc, boolean searchSupers, String name, Class<?> type, Class<?> lookupClass) { int matchFlags = IS_FIELD | (searchSupers ? SEARCH_ALL_SUPERS : 0); return getMembers(defc, name, type, matchFlags, lookupClass); } + /** Return a list of all nested types defined by the given class. + * Super types are searched (for inherited members) if {@code searchSupers} is true. + * Access checking is performed on behalf of the given {@code lookupClass}. + * Inaccessible members are not added to the last. + */ public List<MemberName> getNestedTypes(Class<?> defc, boolean searchSupers, Class<?> lookupClass) { int matchFlags = IS_TYPE | (searchSupers ? SEARCH_ALL_SUPERS : 0);
--- a/jdk/src/share/classes/sun/dyn/MethodHandleImpl.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/MethodHandleImpl.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -127,7 +127,7 @@ public static void initLookup(Access token, Lookup lookup) { Access.check(token); - if (IMPL_LOOKUP_INIT != null || lookup.lookupClass() != null) + if (IMPL_LOOKUP_INIT != null) throw new InternalError(); IMPL_LOOKUP_INIT = lookup; } @@ -176,28 +176,164 @@ boolean doDispatch, Class<?> lookupClass) { Access.check(token); // only trusted calls MethodType mtype = method.getMethodType(); - MethodType rtype = mtype; - if (method.isStatic()) { - doDispatch = false; - } else { + if (!method.isStatic()) { // adjust the advertised receiver type to be exactly the one requested // (in the case of invokespecial, this will be the calling class) Class<?> recvType = method.getDeclaringClass(); mtype = mtype.insertParameterTypes(0, recvType); - if (method.isConstructor()) - doDispatch = true; - // FIXME: JVM has trouble building MH.invoke sites for - // classes off the boot class path - rtype = mtype; - if (recvType.getClassLoader() != null) - rtype = rtype.changeParameterType(0, Object.class); } DirectMethodHandle mh = new DirectMethodHandle(mtype, method, doDispatch, lookupClass); if (!mh.isValid()) throw newNoAccessException(method, lookupClass); - MethodHandle rmh = AdapterMethodHandle.makePairwiseConvert(token, rtype, mh); - if (rmh == null) throw new InternalError(); - return rmh; + assert(mh.type() == mtype); + return mh; + } + + public static + MethodHandle makeAllocator(Access token, MethodHandle rawConstructor) { + Access.check(token); + MethodType rawConType = rawConstructor.type(); + // Wrap the raw (unsafe) constructor with the allocation of a suitable object. + MethodHandle allocator + = AllocateObject.make(token, rawConType.parameterType(0), rawConstructor); + assert(allocator.type() + .equals(rawConType.dropParameterTypes(0, 1).changeReturnType(rawConType.parameterType(0)))); + return allocator; + } + + static final class AllocateObject<C> extends JavaMethodHandle { + private static final Unsafe unsafe = Unsafe.getUnsafe(); + + private final Class<C> allocateClass; + private final MethodHandle rawConstructor; + + private AllocateObject(MethodHandle invoker, + Class<C> allocateClass, MethodHandle rawConstructor) { + super(invoker); + this.allocateClass = allocateClass; + this.rawConstructor = rawConstructor; + } + static MethodHandle make(Access token, + Class<?> allocateClass, MethodHandle rawConstructor) { + Access.check(token); + MethodType rawConType = rawConstructor.type(); + assert(rawConType.parameterType(0) == allocateClass); + MethodType newType = rawConType.dropParameterTypes(0, 1).changeReturnType(allocateClass); + int nargs = rawConType.parameterCount() - 1; + if (nargs < INVOKES.length) { + MethodHandle invoke = INVOKES[nargs]; + MethodType conType = CON_TYPES[nargs]; + MethodHandle gcon = convertArguments(token, rawConstructor, conType, rawConType, null); + if (gcon == null) return null; + MethodHandle galloc = new AllocateObject(invoke, allocateClass, gcon); + assert(galloc.type() == newType.generic()); + return convertArguments(token, galloc, newType, galloc.type(), null); + } else { + MethodHandle invoke = VARARGS_INVOKE; + MethodType conType = CON_TYPES[nargs]; + MethodHandle gcon = spreadArguments(token, rawConstructor, conType, 1); + if (gcon == null) return null; + MethodHandle galloc = new AllocateObject(invoke, allocateClass, gcon); + return collectArguments(token, galloc, newType, 1, null); + } + } + @Override + public String toString() { + return allocateClass.getSimpleName(); + } + @SuppressWarnings("unchecked") + private C allocate() throws InstantiationException { + return (C) unsafe.allocateInstance(allocateClass); + } + private C invoke_V(Object... av) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, av); + return obj; + } + private C invoke_L0() throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj); + return obj; + } + private C invoke_L1(Object a0) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0); + return obj; + } + private C invoke_L2(Object a0, Object a1) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0, a1); + return obj; + } + private C invoke_L3(Object a0, Object a1, Object a2) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0, a1, a2); + return obj; + } + private C invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0, a1, a2, a3); + return obj; + } + private C invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0, a1, a2, a3, a4); + return obj; + } + private C invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0, a1, a2, a3, a4, a5); + return obj; + } + private C invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0, a1, a2, a3, a4, a5, a6); + return obj; + } + private C invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { + C obj = allocate(); + rawConstructor.<void>invokeExact((Object)obj, a0, a1, a2, a3, a4, a5, a6, a7); + return obj; + } + static MethodHandle[] makeInvokes() { + ArrayList<MethodHandle> invokes = new ArrayList<MethodHandle>(); + MethodHandles.Lookup lookup = IMPL_LOOKUP; + for (;;) { + int nargs = invokes.size(); + String name = "invoke_L"+nargs; + MethodHandle invoke = null; + try { + invoke = lookup.findVirtual(AllocateObject.class, name, MethodType.genericMethodType(nargs)); + } catch (NoAccessException ex) { + } + if (invoke == null) break; + invokes.add(invoke); + } + assert(invokes.size() == 9); // current number of methods + return invokes.toArray(new MethodHandle[0]); + }; + static final MethodHandle[] INVOKES = makeInvokes(); + // For testing use this: + //static final MethodHandle[] INVOKES = Arrays.copyOf(makeInvokes(), 2); + static final MethodHandle VARARGS_INVOKE; + static { + try { + VARARGS_INVOKE = IMPL_LOOKUP.findVirtual(AllocateObject.class, "invoke_V", MethodType.genericMethodType(0, true)); + } catch (NoAccessException ex) { + throw new InternalError(""); + } + } + // Corresponding generic constructor types: + static final MethodType[] CON_TYPES = new MethodType[INVOKES.length]; + static { + for (int i = 0; i < INVOKES.length; i++) + CON_TYPES[i] = makeConType(INVOKES[i]); + } + static final MethodType VARARGS_CON_TYPE = makeConType(VARARGS_INVOKE); + static MethodType makeConType(MethodHandle invoke) { + MethodType invType = invoke.type(); + return invType.changeParameterType(0, Object.class).changeReturnType(void.class); + } } public static @@ -469,6 +605,7 @@ MethodType oldType, int[] permutationOrNull) { Access.check(token); + assert(oldType.parameterCount() == target.type().parameterCount()); if (permutationOrNull != null) { int outargs = oldType.parameterCount(), inargs = newType.parameterCount(); if (permutationOrNull.length != outargs) @@ -781,69 +918,93 @@ private static class GuardWithTest extends JavaMethodHandle { private final MethodHandle test, target, fallback; - public GuardWithTest(MethodHandle test, MethodHandle target, MethodHandle fallback) { - this(INVOKES[target.type().parameterCount()], test, target, fallback); - } - public GuardWithTest(MethodHandle invoker, - MethodHandle test, MethodHandle target, MethodHandle fallback) { + private GuardWithTest(MethodHandle invoker, + MethodHandle test, MethodHandle target, MethodHandle fallback) { super(invoker); this.test = test; this.target = target; this.fallback = fallback; } + static MethodHandle make(Access token, + MethodHandle test, MethodHandle target, MethodHandle fallback) { + Access.check(token); + MethodType type = target.type(); + int nargs = type.parameterCount(); + if (nargs < INVOKES.length) { + MethodHandle invoke = INVOKES[nargs]; + MethodType gtype = type.generic(); + assert(invoke.type().dropParameterTypes(0,1) == gtype); + MethodHandle gtest = convertArguments(token, test, gtype.changeReturnType(boolean.class), test.type(), null); + MethodHandle gtarget = convertArguments(token, target, gtype, type, null); + MethodHandle gfallback = convertArguments(token, fallback, gtype, type, null); + if (gtest == null || gtarget == null || gfallback == null) return null; + MethodHandle gguard = new GuardWithTest(invoke, gtest, gtarget, gfallback); + return convertArguments(token, gguard, type, gtype, null); + } else { + MethodHandle invoke = VARARGS_INVOKE; + MethodType gtype = MethodType.genericMethodType(1); + assert(invoke.type().dropParameterTypes(0,1) == gtype); + MethodHandle gtest = spreadArguments(token, test, gtype.changeReturnType(boolean.class), 0); + MethodHandle gtarget = spreadArguments(token, target, gtype, 0); + MethodHandle gfallback = spreadArguments(token, fallback, gtype, 0); + MethodHandle gguard = new GuardWithTest(invoke, gtest, gtarget, gfallback); + if (gtest == null || gtarget == null || gfallback == null) return null; + return collectArguments(token, gguard, type, 0, null); + } + } @Override public String toString() { return target.toString(); } private Object invoke_V(Object... av) throws Throwable { - if (test.<boolean>invoke(av)) - return target.<Object>invoke(av); - return fallback.<Object>invoke(av); + if (test.<boolean>invokeExact(av)) + return target.<Object>invokeExact(av); + return fallback.<Object>invokeExact(av); } private Object invoke_L0() throws Throwable { - if (test.<boolean>invoke()) - return target.<Object>invoke(); - return fallback.<Object>invoke(); + if (test.<boolean>invokeExact()) + return target.<Object>invokeExact(); + return fallback.<Object>invokeExact(); } private Object invoke_L1(Object a0) throws Throwable { - if (test.<boolean>invoke(a0)) - return target.<Object>invoke(a0); - return fallback.<Object>invoke(a0); + if (test.<boolean>invokeExact(a0)) + return target.<Object>invokeExact(a0); + return fallback.<Object>invokeExact(a0); } private Object invoke_L2(Object a0, Object a1) throws Throwable { - if (test.<boolean>invoke(a0, a1)) - return target.<Object>invoke(a0, a1); - return fallback.<Object>invoke(a0, a1); + if (test.<boolean>invokeExact(a0, a1)) + return target.<Object>invokeExact(a0, a1); + return fallback.<Object>invokeExact(a0, a1); } private Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { - if (test.<boolean>invoke(a0, a1, a2)) - return target.<Object>invoke(a0, a1, a2); - return fallback.<Object>invoke(a0, a1, a2); + if (test.<boolean>invokeExact(a0, a1, a2)) + return target.<Object>invokeExact(a0, a1, a2); + return fallback.<Object>invokeExact(a0, a1, a2); } private Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { - if (test.<boolean>invoke(a0, a1, a2, a3)) - return target.<Object>invoke(a0, a1, a2, a3); - return fallback.<Object>invoke(a0, a1, a2, a3); + if (test.<boolean>invokeExact(a0, a1, a2, a3)) + return target.<Object>invokeExact(a0, a1, a2, a3); + return fallback.<Object>invokeExact(a0, a1, a2, a3); } private Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { - if (test.<boolean>invoke(a0, a1, a2, a3, a4)) - return target.<Object>invoke(a0, a1, a2, a3, a4); - return fallback.<Object>invoke(a0, a1, a2, a3, a4); + if (test.<boolean>invokeExact(a0, a1, a2, a3, a4)) + return target.<Object>invokeExact(a0, a1, a2, a3, a4); + return fallback.<Object>invokeExact(a0, a1, a2, a3, a4); } private Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { - if (test.<boolean>invoke(a0, a1, a2, a3, a4, a5)) - return target.<Object>invoke(a0, a1, a2, a3, a4, a5); - return fallback.<Object>invoke(a0, a1, a2, a3, a4, a5); + if (test.<boolean>invokeExact(a0, a1, a2, a3, a4, a5)) + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5); + return fallback.<Object>invokeExact(a0, a1, a2, a3, a4, a5); } private Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { - if (test.<boolean>invoke(a0, a1, a2, a3, a4, a5, a6)) - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6); - return fallback.<Object>invoke(a0, a1, a2, a3, a4, a5, a6); + if (test.<boolean>invokeExact(a0, a1, a2, a3, a4, a5, a6)) + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6); + return fallback.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6); } private Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { - if (test.<boolean>invoke(a0, a1, a2, a3, a4, a5, a6, a7)) - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7); - return fallback.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7); + if (test.<boolean>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7)) + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); + return fallback.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); } static MethodHandle[] makeInvokes() { ArrayList<MethodHandle> invokes = new ArrayList<MethodHandle>(); @@ -880,26 +1041,7 @@ MethodHandle test, MethodHandle target, MethodHandle fallback) { - Access.check(token); - MethodType type = target.type(); - int nargs = type.parameterCount(); - if (nargs < GuardWithTest.INVOKES.length) { - MethodType gtype = type.generic(); - MethodHandle gtest = convertArguments(token, test, gtype.changeReturnType(boolean.class), test.type(), null); - MethodHandle gtarget = convertArguments(token, target, gtype, type, null); - MethodHandle gfallback = convertArguments(token, fallback, gtype, type, null); - if (gtest == null || gtarget == null || gfallback == null) return null; - MethodHandle gguard = new GuardWithTest(gtest, gtarget, gfallback); - return convertArguments(token, gguard, type, gtype, null); - } else { - MethodType gtype = MethodType.genericMethodType(0, true); - MethodHandle gtest = spreadArguments(token, test, gtype.changeReturnType(boolean.class), 0); - MethodHandle gtarget = spreadArguments(token, target, gtype, 0); - MethodHandle gfallback = spreadArguments(token, fallback, gtype, 0); - MethodHandle gguard = new GuardWithTest(GuardWithTest.VARARGS_INVOKE, gtest, gtarget, gfallback); - if (gtest == null || gtarget == null || gfallback == null) return null; - return collectArguments(token, gguard, type, 0, null); - } + return GuardWithTest.make(token, test, target, fallback); } private static class GuardWithCatch extends JavaMethodHandle { @@ -922,82 +1064,82 @@ } private Object invoke_V(Object... av) throws Throwable { try { - return target.<Object>invoke(av); + return target.<Object>invokeExact(av); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, av); + return catcher.<Object>invokeExact(t, av); } } private Object invoke_L0() throws Throwable { try { - return target.<Object>invoke(); + return target.<Object>invokeExact(); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t); + return catcher.<Object>invokeExact(t); } } private Object invoke_L1(Object a0) throws Throwable { try { - return target.<Object>invoke(a0); + return target.<Object>invokeExact(a0); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0); + return catcher.<Object>invokeExact(t, a0); } } private Object invoke_L2(Object a0, Object a1) throws Throwable { try { - return target.<Object>invoke(a0, a1); + return target.<Object>invokeExact(a0, a1); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0, a1); + return catcher.<Object>invokeExact(t, a0, a1); } } private Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { try { - return target.<Object>invoke(a0, a1, a2); + return target.<Object>invokeExact(a0, a1, a2); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0, a1, a2); + return catcher.<Object>invokeExact(t, a0, a1, a2); } } private Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { try { - return target.<Object>invoke(a0, a1, a2, a3); + return target.<Object>invokeExact(a0, a1, a2, a3); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0, a1, a2, a3); + return catcher.<Object>invokeExact(t, a0, a1, a2, a3); } } private Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { try { - return target.<Object>invoke(a0, a1, a2, a3, a4); + return target.<Object>invokeExact(a0, a1, a2, a3, a4); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0, a1, a2, a3, a4); + return catcher.<Object>invokeExact(t, a0, a1, a2, a3, a4); } } private Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { try { - return target.<Object>invoke(a0, a1, a2, a3, a4, a5); + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0, a1, a2, a3, a4, a5); + return catcher.<Object>invokeExact(t, a0, a1, a2, a3, a4, a5); } } private Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { try { - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6); + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0, a1, a2, a3, a4, a5, a6); + return catcher.<Object>invokeExact(t, a0, a1, a2, a3, a4, a5, a6); } } private Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { try { - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7); + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); } catch (Throwable t) { if (!exType.isInstance(t)) throw t; - return catcher.<Object>invoke(t, a0, a1, a2, a3, a4, a5, a6, a7); + return catcher.<Object>invokeExact(t, a0, a1, a2, a3, a4, a5, a6, a7); } } static MethodHandle[] makeInvokes() { @@ -1106,4 +1248,14 @@ throw new InternalError("unexpected code "+code+": "+message); } } + + // Linkage support: + public static void registerBootstrap(Access token, Class<?> callerClass, MethodHandle bootstrapMethod) { + Access.check(token); + MethodHandleNatives.registerBootstrap(callerClass, bootstrapMethod); + } + public static MethodHandle getBootstrap(Access token, Class<?> callerClass) { + Access.check(token); + return MethodHandleNatives.getBootstrap(callerClass); + } }
--- a/jdk/src/share/classes/sun/dyn/MethodHandleNatives.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/MethodHandleNatives.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -28,12 +28,16 @@ import java.dyn.CallSite; import java.dyn.MethodHandle; import java.dyn.MethodType; +import java.dyn.MethodHandles.Lookup; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; import static sun.dyn.MethodHandleNatives.Constants.*; +import static sun.dyn.MethodHandleImpl.IMPL_LOOKUP; /** * The JVM interface for the method handles package is all here. + * This is an interface internal and private to an implemetantion of JSR 292. + * <em>This class is not part of the JSR 292 standard.</em> * @author jrose */ class MethodHandleNatives { @@ -60,8 +64,14 @@ /** Initialize a method type, once per form. */ static native void init(MethodType self); + /** Tell the JVM about a class's bootstrap method. */ + static native void registerBootstrap(Class<?> caller, MethodHandle bootstrapMethod); + + /** Ask the JVM about a class's bootstrap method. */ + static native MethodHandle getBootstrap(Class<?> caller); + /** Tell the JVM that we need to change the target of an invokedynamic. */ - static native void linkCallSite(CallSite site, MethodHandle target); + static native void setCallSiteTarget(CallSite site, MethodHandle target); /** Fetch the vmtarget field. * It will be sanitized as necessary to avoid exposing non-Java references. @@ -114,22 +124,28 @@ */ static final int JVM_STACK_MOVE_UNIT; + /** Which conv-ops are implemented by the JVM? */ + static final int CONV_OP_IMPLEMENTED_MASK; + private static native void registerNatives(); static { boolean JVM_SUPPORT_; int JVM_PUSH_LIMIT_; int JVM_STACK_MOVE_UNIT_; + int CONV_OP_IMPLEMENTED_MASK_; try { registerNatives(); JVM_SUPPORT_ = true; JVM_PUSH_LIMIT_ = getConstant(Constants.GC_JVM_PUSH_LIMIT); JVM_STACK_MOVE_UNIT_ = getConstant(Constants.GC_JVM_STACK_MOVE_UNIT); + CONV_OP_IMPLEMENTED_MASK_ = getConstant(Constants.GC_CONV_OP_IMPLEMENTED_MASK); //sun.reflect.Reflection.registerMethodsToFilter(MethodHandleImpl.class, "init"); } catch (UnsatisfiedLinkError ee) { // ignore; if we use init() methods later we'll see linkage errors JVM_SUPPORT_ = false; JVM_PUSH_LIMIT_ = 3; // arbitrary JVM_STACK_MOVE_UNIT_ = -1; // arbitrary + CONV_OP_IMPLEMENTED_MASK_ = 0; //System.out.println("Warning: Running with JVM_SUPPORT=false"); //System.out.println(ee); JVM_SUPPORT = JVM_SUPPORT_; @@ -140,6 +156,9 @@ JVM_SUPPORT = JVM_SUPPORT_; JVM_PUSH_LIMIT = JVM_PUSH_LIMIT_; JVM_STACK_MOVE_UNIT = JVM_STACK_MOVE_UNIT_; + if (CONV_OP_IMPLEMENTED_MASK_ == 0) + CONV_OP_IMPLEMENTED_MASK_ = DEFAULT_CONV_OP_IMPLEMENTED_MASK; + CONV_OP_IMPLEMENTED_MASK = CONV_OP_IMPLEMENTED_MASK_; } // All compile-time constants go here. @@ -149,7 +168,8 @@ // MethodHandleImpl static final int // for getConstant GC_JVM_PUSH_LIMIT = 0, - GC_JVM_STACK_MOVE_UNIT = 1; + GC_JVM_STACK_MOVE_UNIT = 1, + GC_CONV_OP_IMPLEMENTED_MASK = 2; static final int ETF_HANDLE_OR_METHOD_NAME = 0, // all available data (immediate MH or method) ETF_DIRECT_HANDLE = 1, // ultimate method handle (will be a DMH, may be self) @@ -206,9 +226,8 @@ CONV_STACK_MOVE_MASK = (1 << (32 - CONV_STACK_MOVE_SHIFT)) - 1; /** Which conv-ops are implemented by the JVM? */ - static final int CONV_OP_IMPLEMENTED_MASK = - // TODO: The following expression should be replaced by - // a JVM query. + static final int DEFAULT_CONV_OP_IMPLEMENTED_MASK = + // Value to use if the corresponding JVM query fails. ((1<<OP_RETYPE_ONLY) |(1<<OP_RETYPE_RAW) |(1<<OP_CHECK_CAST) @@ -218,7 +237,7 @@ |(1<<OP_ROT_ARGS) |(1<<OP_DUP_ARGS) |(1<<OP_DROP_ARGS) - //|(1<<OP_SPREAD_ARGS) // FIXME: Check JVM assembly code. + //|(1<<OP_SPREAD_ARGS) ); /** @@ -239,6 +258,20 @@ //T_ARRAY = 13 T_VOID = 14; //T_ADDRESS = 15 + + /** + * Constant pool reference-kind codes, as used by CONSTANT_MethodHandle CP entries. + */ + static final int + REF_getField = 1, + REF_getStatic = 2, + REF_putField = 3, + REF_putStatic = 4, + REF_invokeVirtual = 5, + REF_invokeStatic = 6, + REF_invokeSpecial = 7, + REF_newInvokeSpecial = 8, + REF_invokeInterface = 9; } private static native int getNamedCon(int which, Object[] name); @@ -263,4 +296,46 @@ static { if (JVM_SUPPORT) verifyConstants(); } + + // Up-calls from the JVM. + // These must NOT be public. + + /** + * The JVM is linking an invokedynamic instruction. Create a reified call site for it. + */ + static CallSite makeDynamicCallSite(MethodHandle bootstrapMethod, + String name, MethodType type, + Object info, + MemberName callerMethod, int callerBCI) { + return CallSiteImpl.makeSite(bootstrapMethod, name, type, info, callerMethod, callerBCI); + } + + /** + * The JVM wants a pointer to a MethodType. Oblige it by finding or creating one. + */ + static MethodType findMethodHandleType(Class<?> rtype, Class<?>[] ptypes) { + MethodType.genericMethodType(0); // trigger initialization + return MethodTypeImpl.makeImpl(Access.TOKEN, rtype, ptypes, true); + } + + /** + * The JVM is resolving a CONSTANT_MethodHandle CP entry. And it wants our help. + * It will make an up-call to this method. (Do not change the name or signature.) + */ + static MethodHandle linkMethodHandleConstant(Class<?> callerClass, int refKind, + Class<?> defc, String name, Object type) { + Lookup lookup = IMPL_LOOKUP.in(callerClass); + switch (refKind) { + case REF_getField: return lookup.findGetter( defc, name, (Class<?>) type ); + case REF_getStatic: return lookup.findStaticGetter( defc, name, (Class<?>) type ); + case REF_putField: return lookup.findSetter( defc, name, (Class<?>) type ); + case REF_putStatic: return lookup.findStaticSetter( defc, name, (Class<?>) type ); + case REF_invokeVirtual: return lookup.findVirtual( defc, name, (MethodType) type ); + case REF_invokeStatic: return lookup.findStatic( defc, name, (MethodType) type ); + case REF_invokeSpecial: return lookup.findSpecial( defc, name, (MethodType) type, callerClass ); + case REF_newInvokeSpecial: return lookup.findConstructor( defc, (MethodType) type ); + case REF_invokeInterface: return lookup.findVirtual( defc, name, (MethodType) type ); + } + throw new IllegalArgumentException("bad MethodHandle constant "+name+" : "+type); + } }
--- a/jdk/src/share/classes/sun/dyn/MethodTypeImpl.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/MethodTypeImpl.java Thu Jul 08 11:28:01 2010 -0700 @@ -88,6 +88,11 @@ } 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; @@ -233,8 +238,10 @@ return primsAtEnd = t; // known to have a mix of 2 or 3 of ref, int, long - return primsAtEnd = reorderParameters(t, primsAtEndOrder(t), null); - + int[] reorder = primsAtEndOrder(t); + ct = reorderParameters(t, reorder, null); + //System.out.println("t="+t+" / reorder="+java.util.Arrays.toString(reorder)+" => "+ct); + return primsAtEnd = ct; } /** Compute a new ordering of parameters so that all references @@ -273,7 +280,8 @@ else if (!hasTwoArgSlots(pt)) ord = ifill++; else ord = lfill++; if (ord != i) changed = true; - paramOrder[i] = ord; + assert(paramOrder[ord] == 0); + paramOrder[ord] = i; } assert(rfill == argc - pac && ifill == argc - lac && lfill == argc); if (!changed) { @@ -292,15 +300,15 @@ if (newParamOrder == null) return mt; // no-op reordering Class<?>[] ptypes = METHOD_TYPE_FRIEND.ptypes(mt); Class<?>[] ntypes = new Class<?>[newParamOrder.length]; - int ordMax = ptypes.length + (moreParams == null ? 0 : moreParams.length); + int maxParam = ptypes.length + (moreParams == null ? 0 : moreParams.length); boolean changed = (ntypes.length != ptypes.length); for (int i = 0; i < newParamOrder.length; i++) { - int ord = newParamOrder[i]; - if (ord != i) changed = true; + int param = newParamOrder[i]; + if (param != i) changed = true; Class<?> nt; - if (ord < ptypes.length) nt = ptypes[ord]; - else if (ord == ordMax) nt = mt.returnType(); - else nt = moreParams[ord - ptypes.length]; + if (param < ptypes.length) nt = ptypes[param]; + else if (param == maxParam) nt = mt.returnType(); + else nt = moreParams[param - ptypes.length]; ntypes[i] = nt; } if (!changed) return mt;
--- a/jdk/src/share/classes/sun/dyn/SpreadGeneric.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/SpreadGeneric.java Thu Jul 08 11:28:01 2010 -0700 @@ -281,12 +281,12 @@ protected xS2(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected xS2 makeInstance(SpreadGeneric outer, MethodHandle t) { return new xS2(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object av) throws Throwable { av = super.check(av,0); - return target.<Object>invoke(a0, a1)); } + return target.<Object>invokeExact(a0, a1)); } protected Object invoke_S1(Object a0, Object av) throws Throwable { av = super.check(av,1); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0)); } protected Object invoke_S2(Object a0, Object av) throws Throwable { av = super.check(av,1); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1)); } } // */ @@ -304,10 +304,10 @@ " protected @cat@(SpreadGeneric outer, MethodHandle t) { super(outer, t); }", " protected @cat@ makeInstance(SpreadGeneric outer, MethodHandle t) { return new @cat@(outer, t); }", " protected Object invoke_S0(@Tvav,@Object av) throws Throwable { av = super.check(av, 0);", - " return target.<Object>invoke(@av@); }", + " return target.<Object>invokeExact(@av@); }", " //@each-S@", " protected Object invoke_S@S@(@Tvav,@Object av) throws Throwable { av = super.check(av, @S@);", - " return target.<Object>invoke(@av,@@sv@); }", + " return target.<Object>invokeExact(@av,@@sv@); }", " //@end-S@", " }", } }; @@ -418,16 +418,16 @@ protected S0(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S0 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S0(outer, t); } protected Object invoke_S0(Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(); } + return target.<Object>invokeExact(); } } static class S1 extends Adapter { protected S1(SpreadGeneric outer) { super(outer); } // to build prototype protected S1(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S1 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S1(outer, t); } protected Object invoke_S0(Object a0, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0); } + return target.<Object>invokeExact(a0); } protected Object invoke_S1(Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0)); } } static class S2 extends Adapter { @@ -435,12 +435,12 @@ protected S2(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S2 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S2(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1); } + return target.<Object>invokeExact(a0, a1); } protected Object invoke_S1(Object a0, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0)); } protected Object invoke_S2(Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1)); } } static class S3 extends Adapter { @@ -448,15 +448,15 @@ protected S3(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S3 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S3(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2); } + return target.<Object>invokeExact(a0, a1, a2); } protected Object invoke_S1(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0)); } protected Object invoke_S2(Object a0, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2)); } } static class S4 extends Adapter { @@ -464,18 +464,18 @@ protected S4(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S4 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S4(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object a3, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2, a3); } + return target.<Object>invokeExact(a0, a1, a2, a3); } protected Object invoke_S1(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, a2, + return target.<Object>invokeExact(a0, a1, a2, super.select(av,0)); } protected Object invoke_S2(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object a0, Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1), super.select(av,2)); } protected Object invoke_S4(Object av) throws Throwable { av = super.check(av, 4); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3)); } } static class S5 extends Adapter { @@ -483,21 +483,21 @@ protected S5(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S5 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S5(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object a3, Object a4, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2, a3, a4); } + return target.<Object>invokeExact(a0, a1, a2, a3, a4); } protected Object invoke_S1(Object a0, Object a1, Object a2, Object a3, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, a2, a3, + return target.<Object>invokeExact(a0, a1, a2, a3, super.select(av,0)); } protected Object invoke_S2(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, a1, a2, + return target.<Object>invokeExact(a0, a1, a2, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0), super.select(av,1), super.select(av,2)); } protected Object invoke_S4(Object a0, Object av) throws Throwable { av = super.check(av, 4); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3)); } protected Object invoke_S5(Object av) throws Throwable { av = super.check(av, 5); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4)); } } @@ -506,25 +506,25 @@ protected S6(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S6 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S6(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5); } + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5); } protected Object invoke_S1(Object a0, Object a1, Object a2, Object a3, Object a4, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, a2, a3, a4, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, super.select(av,0)); } protected Object invoke_S2(Object a0, Object a1, Object a2, Object a3, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, a1, a2, a3, + return target.<Object>invokeExact(a0, a1, a2, a3, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke(a0, a1, a2, + return target.<Object>invokeExact(a0, a1, a2, super.select(av,0), super.select(av,1), super.select(av,2)); } protected Object invoke_S4(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 4); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3)); } protected Object invoke_S5(Object a0, Object av) throws Throwable { av = super.check(av, 5); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4)); } protected Object invoke_S6(Object av) throws Throwable { av = super.check(av, 6); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5)); } } @@ -533,29 +533,29 @@ protected S7(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S7 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S7(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6); } + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6); } protected Object invoke_S1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, super.select(av,0)); } protected Object invoke_S2(Object a0, Object a1, Object a2, Object a3, Object a4, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, a1, a2, a3, a4, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object a0, Object a1, Object a2, Object a3, Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke(a0, a1, a2, a3, + return target.<Object>invokeExact(a0, a1, a2, a3, super.select(av,0), super.select(av,1), super.select(av,2)); } protected Object invoke_S4(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 4); - return target.<Object>invoke(a0, a1, a2, + return target.<Object>invokeExact(a0, a1, a2, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3)); } protected Object invoke_S5(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 5); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4)); } protected Object invoke_S6(Object a0, Object av) throws Throwable { av = super.check(av, 6); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5)); } protected Object invoke_S7(Object av) throws Throwable { av = super.check(av, 7); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6)); } } @@ -564,33 +564,33 @@ protected S8(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S8 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S8(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7); } + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); } protected Object invoke_S1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, super.select(av,0)); } protected Object invoke_S2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object a0, Object a1, Object a2, Object a3, Object a4, Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke(a0, a1, a2, a3, a4, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, super.select(av,0), super.select(av,1), super.select(av,2)); } protected Object invoke_S4(Object a0, Object a1, Object a2, Object a3, Object av) throws Throwable { av = super.check(av, 4); - return target.<Object>invoke(a0, a1, a2, a3, + return target.<Object>invokeExact(a0, a1, a2, a3, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3)); } protected Object invoke_S5(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 5); - return target.<Object>invoke(a0, a1, a2, + return target.<Object>invokeExact(a0, a1, a2, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4)); } protected Object invoke_S6(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 6); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5)); } protected Object invoke_S7(Object a0, Object av) throws Throwable { av = super.check(av, 7); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6)); } protected Object invoke_S8(Object av) throws Throwable { av = super.check(av, 8); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6), super.select(av,7)); } } @@ -599,37 +599,37 @@ protected S9(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S9 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S9(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8); } + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object invoke_S1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, super.select(av,0)); } protected Object invoke_S2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, super.select(av,0), super.select(av,1), super.select(av,2)); } protected Object invoke_S4(Object a0, Object a1, Object a2, Object a3, Object a4, Object av) throws Throwable { av = super.check(av, 4); - return target.<Object>invoke(a0, a1, a2, a3, a4, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3)); } protected Object invoke_S5(Object a0, Object a1, Object a2, Object a3, Object av) throws Throwable { av = super.check(av, 5); - return target.<Object>invoke(a0, a1, a2, a3, + return target.<Object>invokeExact(a0, a1, a2, a3, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4)); } protected Object invoke_S6(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 6); - return target.<Object>invoke(a0, a1, a2, + return target.<Object>invokeExact(a0, a1, a2, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5)); } protected Object invoke_S7(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 7); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6)); } protected Object invoke_S8(Object a0, Object av) throws Throwable { av = super.check(av, 8); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6), super.select(av,7)); } protected Object invoke_S9(Object av) throws Throwable { av = super.check(av, 9); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6), super.select(av,7), super.select(av,8)); } @@ -639,42 +639,42 @@ protected S10(SpreadGeneric outer, MethodHandle t) { super(outer, t); } protected S10 makeInstance(SpreadGeneric outer, MethodHandle t) { return new S10(outer, t); } protected Object invoke_S0(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9, Object av) throws Throwable { av = super.check(av, 0); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object invoke_S1(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object av) throws Throwable { av = super.check(av, 1); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7, a8, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, a8, super.select(av,0)); } protected Object invoke_S2(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object av) throws Throwable { av = super.check(av, 2); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, a7, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, a7, super.select(av,0), super.select(av,1)); } protected Object invoke_S3(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object av) throws Throwable { av = super.check(av, 3); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, a6, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, a6, super.select(av,0), super.select(av,1), super.select(av,2)); } protected Object invoke_S4(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object av) throws Throwable { av = super.check(av, 4); - return target.<Object>invoke(a0, a1, a2, a3, a4, a5, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, a5, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3)); } protected Object invoke_S5(Object a0, Object a1, Object a2, Object a3, Object a4, Object av) throws Throwable { av = super.check(av, 5); - return target.<Object>invoke(a0, a1, a2, a3, a4, + return target.<Object>invokeExact(a0, a1, a2, a3, a4, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4)); } protected Object invoke_S6(Object a0, Object a1, Object a2, Object a3, Object av) throws Throwable { av = super.check(av, 6); - return target.<Object>invoke(a0, a1, a2, a3, + return target.<Object>invokeExact(a0, a1, a2, a3, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5)); } protected Object invoke_S7(Object a0, Object a1, Object a2, Object av) throws Throwable { av = super.check(av, 7); - return target.<Object>invoke(a0, a1, a2, + return target.<Object>invokeExact(a0, a1, a2, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6)); } protected Object invoke_S8(Object a0, Object a1, Object av) throws Throwable { av = super.check(av, 8); - return target.<Object>invoke(a0, a1, + return target.<Object>invokeExact(a0, a1, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6), super.select(av,7)); } protected Object invoke_S9(Object a0, Object av) throws Throwable { av = super.check(av, 9); - return target.<Object>invoke(a0, + return target.<Object>invokeExact(a0, super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6), super.select(av,7), super.select(av,8)); } protected Object invoke_S10(Object av) throws Throwable { av = super.check(av, 10); - return target.<Object>invoke( + return target.<Object>invokeExact( super.select(av,0), super.select(av,1), super.select(av,2), super.select(av,3), super.select(av,4), super.select(av,5), super.select(av,6), super.select(av,7), super.select(av,8), super.select(av,9)); }
--- a/jdk/src/share/classes/sun/dyn/ToGeneric.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/ToGeneric.java Thu Jul 08 11:28:01 2010 -0700 @@ -99,12 +99,12 @@ // reordering is required; build on top of a simpler ToGeneric ToGeneric va2 = ToGeneric.of(primsAtEnd); this.adapter = va2.adapter; + if (true) throw new UnsupportedOperationException("NYI: primitive parameters must follow references; entryType = "+entryType); this.entryPoint = MethodHandleImpl.convertArguments(Access.TOKEN, va2.entryPoint, primsAtEnd, entryType, primsAtEndOrder); // example: for entryType of (int,Object,Object), the reordered // type is (Object,Object,int) and the order is {1,2,0}, - // and putPAE is (mh,int0,obj1,obj2) => mh.invoke(obj1,obj2,int0) - if (true) throw new UnsupportedOperationException("NYI"); + // and putPAE is (mh,int0,obj1,obj2) => mh.invokeExact(obj1,obj2,int0) return; } @@ -341,7 +341,7 @@ @Override public String toString() { - return target.toString(); + return target == null ? "prototype:"+convert : target.toString(); } protected boolean isPrototype() { return target == null; } @@ -371,33 +371,33 @@ // { return new ThisType(entryPoint, convert, target); } // Code to run when the arguments (<= 4) have all been boxed. - protected Object target() throws Throwable { return invoker.<Object>invoke(target); } - protected Object target(Object a0) throws Throwable { return invoker.<Object>invoke(target, a0); } + protected Object target() throws Throwable { return invoker.<Object>invokeExact(target); } + protected Object target(Object a0) throws Throwable { return invoker.<Object>invokeExact(target, a0); } protected Object target(Object a0, Object a1) - throws Throwable { return invoker.<Object>invoke(target, a0, a1); } + throws Throwable { return invoker.<Object>invokeExact(target, a0, a1); } protected Object target(Object a0, Object a1, Object a2) - throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2); } + throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2); } protected Object target(Object a0, Object a1, Object a2, Object a3) - throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3); } + throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3); } /* - protected Object target_0(Object... av) throws Throwable { return invoker.<Object>invoke(target, av); } + protected Object target_0(Object... av) throws Throwable { return invoker.<Object>invokeExact(target, av); } protected Object target_1(Object a0, Object... av) - throws Throwable { return invoker.<Object>invoke(target, a0, (Object)av); } + throws Throwable { return invoker.<Object>invokeExact(target, a0, (Object)av); } protected Object target_2(Object a0, Object a1, Object... av) - throws Throwable { return invoker.<Object>invoke(target, a0, a1, (Object)av); } + throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, (Object)av); } protected Object target_3(Object a0, Object a1, Object a2, Object... av) - throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, (Object)av); } + throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, (Object)av); } protected Object target_4(Object a0, Object a1, Object a2, Object a3, Object... av) - throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3, (Object)av); } + throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3, (Object)av); } // */ // (For more than 4 arguments, generate the code in the adapter itself.) // Code to run when the generic target has finished and produced a value. - protected Object return_L(Object res) throws Throwable { return convert.<Object>invoke(res); } - protected int return_I(Object res) throws Throwable { return convert.<int >invoke(res); } - protected long return_J(Object res) throws Throwable { return convert.<long >invoke(res); } - protected float return_F(Object res) throws Throwable { return convert.<float >invoke(res); } - protected double return_D(Object res) throws Throwable { return convert.<double>invoke(res); } + protected Object return_L(Object res) throws Throwable { return convert.<Object>invokeExact(res); } + protected int return_I(Object res) throws Throwable { return convert.<int >invokeExact(res); } + protected long return_J(Object res) throws Throwable { return convert.<long >invokeExact(res); } + protected float return_F(Object res) throws Throwable { return convert.<float >invokeExact(res); } + protected double return_D(Object res) throws Throwable { return convert.<double>invokeExact(res); } static private final String CLASS_PREFIX; // "sun.dyn.ToGeneric$" static { @@ -424,7 +424,7 @@ protected A1(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A1(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A1(e, i, c, t); } - protected Object target(Object a0) throws Throwable { return invoker.<Object>invoke(target, a0); } + protected Object target(Object a0) throws Throwable { return invoker.<Object>invokeExact(target, a0); } protected Object targetA1(Object a0) throws Throwable { return target(a0); } protected Object targetA1(int a0) throws Throwable { return target(a0); } protected Object targetA1(long a0) throws Throwable { return target(a0); } @@ -462,7 +462,7 @@ " 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@ makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new @cat@(e, i, c, t); }", - " protected Object target(@Ovav@) throws Throwable { return invoker.<Object>invoke(target, @av@); }", + " protected Object target(@Ovav@) throws Throwable { return invoker.<Object>invokeExact(target, @av@); }", " //@each-Tv@", " protected Object target@cat@(@Tvav@) throws Throwable { return target(@av@); }", " //@end-Tv@", @@ -622,7 +622,7 @@ protected A0(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A0(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A0 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A0(e, i, c, t); } - protected Object target() throws Throwable { return invoker.<Object>invoke(target); } + protected Object target() throws Throwable { return invoker.<Object>invokeExact(target); } protected Object targetA0() throws Throwable { return target(); } protected Object invoke_L() throws Throwable { return return_L(targetA0()); } protected int invoke_I() throws Throwable { return return_I(targetA0()); } @@ -634,7 +634,7 @@ protected A1(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A1(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A1(e, i, c, t); } - protected Object target(Object a0) throws Throwable { return invoker.<Object>invoke(target, a0); } + protected Object target(Object a0) throws Throwable { return invoker.<Object>invokeExact(target, a0); } protected Object targetA1(Object a0) throws Throwable { return target(a0); } protected Object targetA1(int a0) throws Throwable { return target(a0); } protected Object targetA1(long a0) throws Throwable { return target(a0); } @@ -658,7 +658,7 @@ protected A2(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A2(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A2(e, i, c, t); } - protected Object target(Object a0, Object a1) throws Throwable { return invoker.<Object>invoke(target, a0, a1); } + protected Object target(Object a0, Object a1) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1); } protected Object targetA2(Object a0, Object a1) throws Throwable { return target(a0, a1); } protected Object targetA2(Object a0, int a1) throws Throwable { return target(a0, a1); } protected Object targetA2(int a0, int a1) throws Throwable { return target(a0, a1); } @@ -694,7 +694,7 @@ protected A3(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A3(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A3 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A3(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2); } + protected Object target(Object a0, Object a1, Object a2) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2); } protected Object targetA3(Object a0, Object a1, Object a2) throws Throwable { return target(a0, a1, a2); } protected Object targetA3(Object a0, Object a1, int a2) throws Throwable { return target(a0, a1, a2); } protected Object targetA3(Object a0, int a1, int a2) throws Throwable { return target(a0, a1, a2); } @@ -743,7 +743,7 @@ 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 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A4(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2, Object a3) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3); } + protected Object target(Object a0, Object a1, Object a2, Object a3) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3); } protected Object targetA4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return target(a0, a1, a2, a3); } protected Object targetA4(Object a0, Object a1, Object a2, int a3) throws Throwable { return target(a0, a1, a2, a3); } protected Object targetA4(Object a0, Object a1, int a2, int a3) throws Throwable { return target(a0, a1, a2, a3); } @@ -785,7 +785,7 @@ 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 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A5(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3, a4); } + protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4); } protected Object targetA5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return target(a0, a1, a2, a3, a4); } protected Object targetA5(Object a0, Object a1, Object a2, Object a3, int a4) throws Throwable { return target(a0, a1, a2, a3, a4); } protected Object targetA5(Object a0, Object a1, Object a2, int a3, int a4) throws Throwable { return target(a0, a1, a2, a3, a4); } @@ -836,7 +836,7 @@ protected A6(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A6(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A6 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A6(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5); } + protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5); } protected Object targetA6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return target(a0, a1, a2, a3, a4, a5); } protected Object targetA6(Object a0, Object a1, Object a2, Object a3, Object a4, long a5) throws Throwable { return target(a0, a1, a2, a3, a4, a5); } protected Object targetA6(Object a0, Object a1, Object a2, Object a3, long a4, long a5) throws Throwable { return target(a0, a1, a2, a3, a4, a5); } @@ -870,7 +870,7 @@ protected A7(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A7(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A7 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A7(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6); } + protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6); } protected Object targetA7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6); } protected Object targetA7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, long a6) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6); } protected Object targetA7(Object a0, Object a1, Object a2, Object a3, Object a4, long a5, long a6) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6); } @@ -908,7 +908,7 @@ protected A8(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A8(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A8 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A8(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7); } + protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7); } protected Object targetA8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7); } protected Object targetA8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, long a7) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7); } protected Object targetA8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, long a6, long a7) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7); } @@ -950,7 +950,7 @@ protected A9(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A9(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A9 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A9(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8); } + protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object targetA9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object targetA9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, long a8) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7, a8); } protected Object targetA9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, long a7, long a8) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7, a8); } @@ -996,7 +996,7 @@ protected A10(MethodHandle entryPoint) { super(entryPoint); } // to build prototype protected A10(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { super(e, i, c, t); } protected A10 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) { return new A10(e, i, c, t); } - protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return invoker.<Object>invoke(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } + protected Object target(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return invoker.<Object>invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object targetA10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object targetA10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, long a9) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); } protected Object targetA10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, long a8, long a9) throws Throwable { return target(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9); }
--- a/jdk/src/share/classes/sun/dyn/package-info.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/package-info.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,10 +25,6 @@ /** * Implementation details for JSR 292 RI, package java.dyn. - * This particular version is specific to Hotspot. - * There is also a backport version of this sub-package which uses reflection, - * and can therefore run (slowly) on older versions of Java. - * Other JVM vendors may create their own versions of this sub-package. * @author jrose */
--- a/jdk/src/share/classes/sun/dyn/util/ValueConversions.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/util/ValueConversions.java Thu Jul 08 11:28:01 2010 -0700 @@ -655,7 +655,7 @@ if (nargs < ARRAYS.length) return ARRAYS[nargs]; // else need to spin bytecode or do something else fancy - throw new UnsupportedOperationException("NYI"); + throw new UnsupportedOperationException("NYI: cannot form a varargs array of length "+nargs); } private static final List<Object> NO_ARGS_LIST = Arrays.asList(NO_ARGS_ARRAY);
--- a/jdk/src/share/classes/sun/dyn/util/VerifyAccess.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/dyn/util/VerifyAccess.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,12 +26,12 @@ package sun.dyn.util; import java.dyn.LinkagePermission; -import java.dyn.MethodHandles.Lookup; import java.dyn.NoAccessException; import java.lang.reflect.Modifier; import sun.dyn.MemberName; import sun.dyn.MethodHandleImpl; import sun.dyn.empty.Empty; +import static java.lang.reflect.Modifier.*; /** * This class centralizes information about the JVM's linkage access control. @@ -41,49 +41,105 @@ private VerifyAccess() { } // cannot instantiate + private static final int PACKAGE_ONLY = 0; + private static final int ALL_ACCESS_MODES = (PUBLIC|PRIVATE|PROTECTED|PACKAGE_ONLY); + /** - * Evaluate the JVM linkage rules for access to the given method on behalf of caller. - * Return non-null if and only if the given accessing class has at least partial - * privileges to invoke the given method. The return value {@code Object.class} - * denotes unlimited privileges. + * Evaluate the JVM linkage rules for access to the given method + * on behalf of a caller class which proposes to perform the access. + * Return true if the caller class has privileges to invoke a method + * or access a field with the given properties. + * This requires an accessibility check of the referencing class, + * plus an accessibility check of the member within the class, + * which depends on the member's modifier flags. * <p> - * Some circumstances require an additional check on the - * leading parameter (the receiver) of the method, if it is non-static. - * In the case of {@code invokespecial} ({@code isSpecialInvoke} is true), - * the leading parameter must be the accessing class or a subclass. - * In the case of a call to a {@code protected} method outside the same - * package, the same constraint applies. - * @param m the proposed callee - * @param isSpecialInvoke if true, a non-static method m is checked as if for {@code invokespecial} + * The relevant properties include the defining class ({@code defc}) + * of the member, and its modifier flags ({@code mods}). + * Also relevant is the class used to make the initial symbolic reference + * to the member ({@code refc}). If this latter class is not distinguished, + * the defining class should be passed for both arguments ({@code defc == refc}). + * <h3>JVM Specification, 5.4.4 "Access Control"</h3> + * A field or method R is accessible to a class or interface D if + * and only if any of the following conditions is true:<ul> + * <li>R is public. + * <li>R is protected and is declared in a class C, and D is either + * a subclass of C or C itself. Furthermore, if R is not + * static, then the symbolic reference to R must contain a + * symbolic reference to a class T, such that T is either a + * subclass of D, a superclass of D or D itself. + * <li>R is either protected or has default access (that is, + * neither public nor protected nor private), and is declared + * by a class in the same runtime package as D. + * <li>R is private and is declared in D. + * </ul> + * This discussion of access control omits a related restriction + * on the target of a protected field access or method invocation + * (the target must be of class D or a subtype of D). That + * requirement is checked as part of the verification process + * (5.4.1); it is not part of link-time access control. + * @param refc the class used in the symbolic reference to the proposed member + * @param defc the class in which the proposed member is actually defined + * @param mods modifier flags for the proposed member * @param lookupClass the class for which the access check is being made - * @return null if the method is not accessible, else a receiver type constraint, else {@code Object.class} + * @return true iff the the accessing class can access such a member */ - public static Class<?> isAccessible(Class<?> defc, int mods, - Class<?> lookupClass, boolean isSpecialInvoke) { - if (!isAccessible(defc, lookupClass)) - return null; - Class<?> constraint = Object.class; - if (isSpecialInvoke && !Modifier.isStatic(mods)) { - constraint = lookupClass; + public static boolean isMemberAccessible(Class<?> refc, // symbolic ref class + Class<?> defc, // actual def class + int mods, // actual member mods + Class<?> lookupClass) { + // Usually refc and defc are the same, but if they differ, verify them both. + if (refc != defc) { + if (!isClassAccessible(refc, lookupClass)) { + // Note that defc is verified in the switch below. + return false; + } + if ((mods & (ALL_ACCESS_MODES|STATIC)) == (PROTECTED|STATIC)) { + // Apply the special rules for refc here. + if (!isRelatedClass(refc, lookupClass)) + return isSamePackage(defc, lookupClass); + // If refc == defc, the call to isPublicSuperClass will do + // the whole job, since in that case refc (as defc) will be + // a superclass of the lookup class. + } } - if (Modifier.isPublic(mods)) - return constraint; - if (Modifier.isPrivate(mods)) - return isSamePackageMember(defc, lookupClass) ? constraint : null; - if (isSamePackage(defc, lookupClass)) - return constraint; - if (Modifier.isProtected(mods) && defc.isAssignableFrom(lookupClass)) - return constraint; - // else it is private or package scoped, and not close enough - return null; + switch (mods & ALL_ACCESS_MODES) { + case PUBLIC: + if (refc != defc) return true; // already checked above + return isClassAccessible(refc, lookupClass); + case PROTECTED: + return isSamePackage(defc, lookupClass) || isPublicSuperClass(defc, lookupClass); + case PACKAGE_ONLY: + return isSamePackage(defc, lookupClass); + case PRIVATE: + // Loosened rules for privates follows access rules for inner classes. + return isSamePackageMember(defc, lookupClass); + default: + throw new IllegalArgumentException("bad modifiers: "+Modifier.toString(mods)); + } + } + + static boolean isRelatedClass(Class<?> refc, Class<?> lookupClass) { + return (refc == lookupClass || + refc.isAssignableFrom(lookupClass) || + lookupClass.isAssignableFrom(refc)); + } + + static boolean isPublicSuperClass(Class<?> defc, Class<?> lookupClass) { + return isPublic(defc.getModifiers()) && defc.isAssignableFrom(lookupClass); } /** * Evaluate the JVM linkage rules for access to the given class on behalf of caller. + * <h3>JVM Specification, 5.4.4 "Access Control"</h3> + * A class or interface C is accessible to a class or interface D + * if and only if either of the following conditions are true:<ul> + * <li>C is public. + * <li>C and D are members of the same runtime package. + * </ul> */ - public static boolean isAccessible(Class<?> refc, Class<?> lookupClass) { + public static boolean isClassAccessible(Class<?> refc, Class<?> lookupClass) { int mods = refc.getModifiers(); - if (Modifier.isPublic(mods)) + if (isPublic(mods)) return true; if (isSamePackage(lookupClass, refc)) return true; @@ -170,38 +226,4 @@ if (isSamePackage(requestingClass, subjectClass)) return; security.checkPermission(new LinkagePermission(permissionName, requestingClass)); } - - private static RuntimeException checkNameFailed(MemberName self, Lookup lookup, String comment) { - return new NoAccessException("cannot access from "+lookup+": "+self.toString()+": "+comment); - } - public static void checkName(MemberName self, Lookup lookup) { - Class<?> lc = lookup.lookupClass(); - if (lc == null) return; // lookup is privileged - Class<?> dc = self.getDeclaringClass(); - int samepkg = 0; - // First check the containing class. Must be public or local. - if (!Modifier.isPublic(dc.getModifiers())) { - if (lc != Empty.class) - samepkg = (isSamePackage(dc, lc) ? 1 : -1); - if (samepkg <= 0) - throw checkNameFailed(self, lookup, "class is not public"); - } - // At this point dc is known to be accessible. - if (self.isPublic()) { - return; - } else if (lc == Empty.class) { - throw checkNameFailed(self, lookup, "member is not public"); - } else if (self.isProtected()) { - if (dc.isAssignableFrom(lc)) return; - } else if (self.isPrivate()) { - if (isSamePackageMember(dc, lc)) return; - throw checkNameFailed(self, lookup, "member is private"); - } - // Fall-through handles the package-private and protected cases. - if (samepkg == 0) - samepkg = (isSamePackage(dc, lc) ? 1 : -1); - if (samepkg > 0) return; - throw checkNameFailed(self, lookup, - self.isProtected() ? "member is protected" : "member is private to package"); - } }
--- a/jdk/src/share/classes/sun/io/ByteToCharISO2022.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/io/ByteToCharISO2022.java Thu Jul 08 11:28:01 2010 -0700 @@ -124,15 +124,15 @@ switch(shiftFlag) { case SOFlag: tmpIndex = curSODes; - tmpConverter = (ByteToCharConverter [])SOConverter; + tmpConverter = SOConverter; break; case SS2Flag: tmpIndex = curSS2Des; - tmpConverter = (ByteToCharConverter [])SS2Converter; + tmpConverter = SS2Converter; break; case SS3Flag: tmpIndex = curSS3Des; - tmpConverter = (ByteToCharConverter [])SS3Converter; + tmpConverter = SS3Converter; break; }
--- a/jdk/src/share/classes/sun/io/ByteToCharISO2022JP.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/io/ByteToCharISO2022JP.java Thu Jul 08 11:28:01 2010 -0700 @@ -141,7 +141,7 @@ } else { savedSize = 2; savedBytes[0] = (byte)byte1; - savedBytes[1] = (byte)input[readOff + inputSize]; + savedBytes[1] = input[readOff + inputSize]; inputSize++; } break;
--- a/jdk/src/share/classes/sun/io/ByteToCharJISAutoDetect.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/io/ByteToCharJISAutoDetect.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,14 +34,12 @@ private final static int SJIS1B_MASK = 0x04; private final static int EUCJP_KANA1_MASK = 0x08; private final static int EUCJP_KANA2_MASK = 0x10; - private static byte[] maskTable1; - private static byte[] maskTable2; + private final static byte[] maskTable1 = JISAutoDetect.getByteMask1(); + private final static byte[] maskTable2 = JISAutoDetect.getByteMask2(); private final static int SS2 = 0x8e; private final static int SS3 = 0x8f; - private final static JISAutoDetect nioCoder = new JISAutoDetect(); - // SJISName is set to either "SJIS" or "MS932" private String SJISName; private String EUCJPName; @@ -57,8 +55,6 @@ defaultConv = new ByteToCharISO8859_1(); defaultConv.subChars = subChars; defaultConv.subMode = subMode; - maskTable1 = nioCoder.getByteMask1(); - maskTable2 = nioCoder.getByteMask2(); } public int flush(char [] output, int outStart, int outEnd) @@ -133,7 +129,7 @@ break; } if ((mask == SJIS2B_MASK) || (mask == SJIS1B_MASK) - || (nioCoder.canBeSJIS1B(firstmask) && secondmask == 0)) { + || (JISAutoDetect.canBeSJIS1B(firstmask) && secondmask == 0)) { convName = SJISName; break; } @@ -145,15 +141,15 @@ // character boundary. If we tried both // possibilities here, it might be able to be // determined correctly. - if ((byte1 == SS3) && nioCoder.canBeEUCJP(secondmask)) { + if ((byte1 == SS3) && JISAutoDetect.canBeEUCJP(secondmask)) { if (cnt+1 < inEnd) { int nextbyte = input[cnt+1] & 0xff; - if (! nioCoder.canBeEUCJP(maskTable2[nextbyte])) + if (! JISAutoDetect.canBeEUCJP(maskTable2[nextbyte])) convName = SJISName; } else convName = SJISName; } - if (nioCoder.canBeEUCKana(firstmask, secondmask)) + if (JISAutoDetect.canBeEUCKana(firstmask, secondmask)) euckana++; } else { if ((firstmask & SJIS1B_MASK) != 0) {
--- a/jdk/src/share/classes/sun/io/CharToBytePCK.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/io/CharToBytePCK.java Thu Jul 08 11:28:01 2010 -0700 @@ -66,7 +66,7 @@ switch (ch) { case '\u2015': - return (int)0x815C; + return 0x815C; case '\u2014': return 0; default:
--- a/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,2 @@ -# Jules Rendering Engine module -sun.java2d.jules.JulesRenderingEngine - # Pisces Rendering Engine module -sun.java2d.pisces.PiscesRenderingEngine \ No newline at end of file +sun.java2d.pisces.PiscesRenderingEngine
--- a/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java Thu Jul 08 11:28:01 2010 -0700 @@ -171,10 +171,9 @@ // Must hold dc.blockingLock() // - private void receive(ByteBuffer bb) throws IOException { + private SocketAddress receive(ByteBuffer bb) throws IOException { if (timeout == 0) { - dc.receive(bb); - return; + return dc.receive(bb); } // Implement timeout with a selector @@ -183,8 +182,9 @@ dc.configureBlocking(false); try { int n; - if (dc.receive(bb) != null) - return; + SocketAddress sender; + if ((sender = dc.receive(bb)) != null) + return sender; sel = Util.getTemporarySelector(dc); sk = dc.register(sel, SelectionKey.OP_READ); long to = timeout; @@ -194,8 +194,8 @@ long st = System.currentTimeMillis(); int ns = sel.select(to); if (ns > 0 && sk.isReadable()) { - if (dc.receive(bb) != null) - return; + if ((sender = dc.receive(bb)) != null) + return sender; } sel.selectedKeys().remove(sk); to -= System.currentTimeMillis() - st; @@ -222,7 +222,8 @@ ByteBuffer bb = ByteBuffer.wrap(p.getData(), p.getOffset(), p.getLength()); - receive(bb); + SocketAddress sender = receive(bb); + p.setSocketAddress(sender); p.setLength(bb.position() - p.getOffset()); } } catch (IOException x) {
--- a/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java Thu Jul 08 11:28:01 2010 -0700 @@ -144,11 +144,7 @@ } public void close() throws IOException { - try { - ssc.close(); - } catch (Exception x) { - Net.translateException(x); - } + ssc.close(); } public ServerSocketChannel getChannel() {
--- a/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/ch/SocketAdaptor.java Thu Jul 08 11:28:01 2010 -0700 @@ -404,11 +404,7 @@ } public void close() throws IOException { - try { - sc.close(); - } catch (Exception x) { - Net.translateToSocketException(x); - } + sc.close(); } public void shutdownInput() throws IOException {
--- a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java Thu Jul 08 11:28:01 2010 -0700 @@ -103,7 +103,7 @@ public final static char[] B2C_UNMAPPABLE; static { B2C_UNMAPPABLE = new char[0x100]; - Arrays.fill(B2C_UNMAPPABLE, (char)UNMAPPABLE_DECODING); + Arrays.fill(B2C_UNMAPPABLE, UNMAPPABLE_DECODING); } public static class Decoder extends CharsetDecoder @@ -374,7 +374,7 @@ static final char[] b2cSB; static { b2cSB = new char[0x100]; - Arrays.fill(b2cSB, (char)UNMAPPABLE_DECODING); + Arrays.fill(b2cSB, UNMAPPABLE_DECODING); } Decoder_EBCDIC_DBCSONLY(Charset cs, char[][] b2c, int b2Min, int b2Max) { super(cs, 0.5f, 1.0f, b2c, b2cSB, b2Min, b2Max);
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java Thu Jul 08 11:28:01 2010 -0700 @@ -79,8 +79,10 @@ JIS_X_0201.Decoder decoderJ0201; JIS_X_0212_Decoder decoderJ0212; - short[] j0208Index1; - String[] j0208Index2; + private static final short[] j0208Index1 = + JIS_X_0208_Decoder.getIndex1(); + private static final String[] j0208Index2 = + JIS_X_0208_Decoder.getIndex2(); protected Decoder(Charset cs) { super(cs); @@ -88,8 +90,6 @@ decoderJ0212 = new JIS_X_0212_Decoder(cs); start = 0xa1; end = 0xfe; - j0208Index1 = super.getIndex1(); - j0208Index2 = super.getIndex2(); } protected char decode0212(int byte1, int byte2) { return decoderJ0212.decodeDouble(byte1, byte2); @@ -238,8 +238,10 @@ JIS_X_0201.Encoder encoderJ0201; JIS_X_0212_Encoder encoderJ0212; - short[] j0208Index1; - String[] j0208Index2; + private static final short[] j0208Index1 = + JIS_X_0208_Encoder.getIndex1(); + private static final String[] j0208Index2 = + JIS_X_0208_Encoder.getIndex2(); private final Surrogate.Parser sgp = new Surrogate.Parser(); @@ -247,8 +249,6 @@ super(cs, 3.0f, 3.0f); encoderJ0201 = new JIS_X_0201.Encoder(cs); encoderJ0212 = new JIS_X_0212_Encoder(cs); - j0208Index1 = super.getIndex1(); - j0208Index2 = super.getIndex2(); } public boolean canEncode(char c) {
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java Thu Jul 08 11:28:01 2010 -0700 @@ -65,20 +65,18 @@ private static class Decoder extends CharsetDecoder { JIS_X_0201.Decoder decoderJ0201; - JIS_X_0208_Decoder decodeMappingJ0208; protected final char REPLACE_CHAR='\uFFFD'; - short[] jis0208Index1; - String[] jis0208Index2; + private static final int start = 0xa1; + private static final int end = 0xfe; + private static final short[] jis0208Index1 = + JIS_X_0208_Decoder.getIndex1(); + private static final String[] jis0208Index2 = + JIS_X_0208_Decoder.getIndex2(); private Decoder(Charset cs) { super(cs, 1.0f, 1.0f); decoderJ0201 = new JIS_X_0201.Decoder(cs); - decodeMappingJ0208 = new JIS_X_0208_Decoder(cs); - decodeMappingJ0208.start = 0xa1; - decodeMappingJ0208.end = 0xfe; - jis0208Index1 = decodeMappingJ0208.getIndex1(); - jis0208Index2 = decodeMappingJ0208.getIndex2(); } protected char convSingleByte(int b) { @@ -93,11 +91,11 @@ } if (((byte1 < 0) || (byte1 > jis0208Index1.length)) - || ((byte2 < decodeMappingJ0208.start) || (byte2 > decodeMappingJ0208.end))) + || ((byte2 < start) || (byte2 > end))) return REPLACE_CHAR; - int n = (jis0208Index1[byte1 - 0x80] & 0xf) * (decodeMappingJ0208.end - decodeMappingJ0208.start + 1) - + (byte2 - decodeMappingJ0208.start); + int n = (jis0208Index1[byte1 - 0x80] & 0xf) * (end - start + 1) + + (byte2 - start); return jis0208Index2[jis0208Index1[byte1 - 0x80] >> 4].charAt(n); } @@ -213,18 +211,16 @@ private static class Encoder extends CharsetEncoder { JIS_X_0201.Encoder encoderJ0201; - JIS_X_0208_Encoder encoderJ0208; private final Surrogate.Parser sgp = new Surrogate.Parser(); - short[] jis0208Index1; - String[] jis0208Index2; + private static final short[] jis0208Index1 = + JIS_X_0208_Encoder.getIndex1(); + private static final String[] jis0208Index2 = + JIS_X_0208_Encoder.getIndex2(); private Encoder(Charset cs) { super(cs, 2.0f, 2.0f); encoderJ0201 = new JIS_X_0201.Encoder(cs); - encoderJ0208 = new JIS_X_0208_Encoder(cs); - jis0208Index1 = encoderJ0208.getIndex1(); - jis0208Index2 = encoderJ0208.getIndex2(); } public boolean canEncode(char c) {
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java Thu Jul 08 11:28:01 2010 -0700 @@ -75,8 +75,12 @@ JIS_X_0212_Solaris_Decoder decodeMappingJ0212; JIS_X_0208_Solaris_Decoder decodeMappingJ0208; - short[] j0208Index1; - String[] j0208Index2; + private static final short[] j0208Index1 = + JIS_X_0208_Solaris_Decoder.getIndex1(); + private static final String[] j0208Index2 = + JIS_X_0208_Solaris_Decoder.getIndex2(); + private static final int start = 0xa1; + private static final int end = 0xfe; protected final char REPLACE_CHAR='\uFFFD'; @@ -84,11 +88,6 @@ super(cs); decoderJ0201 = new JIS_X_0201.Decoder(cs); decodeMappingJ0212 = new JIS_X_0212_Solaris_Decoder(cs); - decodeMappingJ0208 = new JIS_X_0208_Solaris_Decoder(cs); - decodeMappingJ0208.start = 0xa1; - decodeMappingJ0208.end = 0xfe; - j0208Index1 = decodeMappingJ0208.getIndex1(); - j0208Index2 = decodeMappingJ0208.getIndex2(); } @@ -103,9 +102,9 @@ } if (((byte1 < 0) - || (byte1 > decodeMappingJ0208.getIndex1().length)) - || ((byte2 < decodeMappingJ0208.start) - || (byte2 > decodeMappingJ0208.end))) + || (byte1 > j0208Index1.length)) + || ((byte2 < start) + || (byte2 > end))) return REPLACE_CHAR; char result = super.decodeDouble(byte1, byte2); @@ -113,8 +112,8 @@ return result; } else { int n = (j0208Index1[byte1 - 0x80] & 0xf) * - (decodeMappingJ0208.end - decodeMappingJ0208.start + 1) - + (byte2 - decodeMappingJ0208.start); + (end - start + 1) + + (byte2 - start); return j0208Index2[j0208Index1[byte1 - 0x80] >> 4].charAt(n); } } @@ -125,10 +124,11 @@ JIS_X_0201.Encoder encoderJ0201; JIS_X_0212_Solaris_Encoder encoderJ0212; - JIS_X_0208_Solaris_Encoder encoderJ0208; - short[] j0208Index1; - String[] j0208Index2; + private static final short[] j0208Index1 = + JIS_X_0208_Solaris_Encoder.getIndex1(); + private static final String[] j0208Index2 = + JIS_X_0208_Solaris_Encoder.getIndex2(); private final Surrogate.Parser sgp = new Surrogate.Parser(); @@ -136,9 +136,6 @@ super(cs); encoderJ0201 = new JIS_X_0201.Encoder(cs); encoderJ0212 = new JIS_X_0212_Solaris_Encoder(cs); - encoderJ0208 = new JIS_X_0208_Solaris_Encoder(cs); - j0208Index1 = encoderJ0208.getIndex1(); - j0208Index2 = encoderJ0208.getIndex2(); } protected int encodeSingle(char inputChar, byte[] outputByte) {
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java Thu Jul 08 11:28:01 2010 -0700 @@ -423,7 +423,7 @@ if (dst.remaining() < outSize) return CoderResult.OVERFLOW; for (int i = 0; i < outSize; i++) - dst.put((byte)bb[i]); + dst.put(bb[i]); mark += inSize; } return CoderResult.UNDERFLOW;
--- a/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java Thu Jul 08 11:28:01 2010 -0700 @@ -12339,7 +12339,7 @@ int start = 0x40, end = 0xFE; if (((byte1 < 0) || (byte1 > index1.length)) || ((byte2 < start) || (byte2 > end))) - return (char)'\uFFFD'; + return '\uFFFD'; int n = (index1[byte1] & 0xf) * (end - start + 1) + (byte2 - start); return index2[index1[byte1] >> 4].charAt(n);
--- a/jdk/src/share/classes/sun/nio/cs/ext/HKSCS.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/HKSCS.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,7 +43,7 @@ private char[][] b2cBmp; private char[][] b2cSupp; - private static DoubleByte.Decoder big5Dec; + private DoubleByte.Decoder big5Dec; protected Decoder(Charset cs, DoubleByte.Decoder big5Dec, @@ -355,7 +355,7 @@ c2b[hi] = new char[0x100]; Arrays.fill(c2b[hi], (char)UNMAPPABLE_ENCODING); } - c2b[hi][c & 0xff] = (char)bb; + c2b[hi][c & 0xff] = bb; } c++; }
--- a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java Thu Jul 08 11:28:01 2010 -0700 @@ -104,15 +104,15 @@ switch(shiftFlag) { case SOFlag: tmpIndex = curSODes; - tmpDecoder = (CharsetDecoder [])SODecoder; + tmpDecoder = SODecoder; break; case SS2Flag: tmpIndex = curSS2Des; - tmpDecoder = (CharsetDecoder [])SS2Decoder; + tmpDecoder = SS2Decoder; break; case SS3Flag: tmpIndex = curSS3Des; - tmpDecoder = (CharsetDecoder [])SS3Decoder; + tmpDecoder = SS3Decoder; break; }
--- a/jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java Thu Jul 08 11:28:01 2010 -0700 @@ -82,11 +82,11 @@ * with the sun.io JISAutoDetect implementation */ - public byte[] getByteMask1() { + public static byte[] getByteMask1() { return Decoder.maskTable1; } - public byte[] getByteMask2() { + public static byte[] getByteMask2() { return Decoder.maskTable2; }
--- a/jdk/src/share/classes/sun/nio/cs/ext/PCK.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/PCK.java Thu Jul 08 11:28:01 2010 -0700 @@ -101,17 +101,15 @@ private static class Encoder extends SJIS.Encoder { private JIS_X_0201.Encoder jis0201; - private JIS_X_0208_Solaris_Encoder jis0208; - short[] j0208Index1; - String[] j0208Index2; + private static final short[] j0208Index1 = + JIS_X_0208_Solaris_Encoder.getIndex1(); + private static final String[] j0208Index2 = + JIS_X_0208_Solaris_Encoder.getIndex2(); private Encoder(Charset cs) { super(cs); jis0201 = new JIS_X_0201.Encoder(cs); - jis0208 = new JIS_X_0208_Solaris_Encoder(cs); - j0208Index1 = jis0208.getIndex1(); - j0208Index2 = jis0208.getIndex2(); } protected int encodeDouble(char ch) { @@ -121,7 +119,7 @@ switch (ch) { case '\u2015': - return (int)0x815C; + return 0x815C; case '\u2014': return 0; default:
--- a/jdk/src/share/classes/sun/nio/cs/ext/SJIS.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/nio/cs/ext/SJIS.java Thu Jul 08 11:28:01 2010 -0700 @@ -114,14 +114,14 @@ private JIS_X_0201.Encoder jis0201; - short[] j0208Index1; - String[] j0208Index2; + private static final short[] j0208Index1 = + JIS_X_0208_Encoder.getIndex1(); + private static final String[] j0208Index2 = + JIS_X_0208_Encoder.getIndex2(); protected Encoder(Charset cs) { super(cs); jis0201 = new JIS_X_0201.Encoder(cs); - j0208Index1 = super.getIndex1(); - j0208Index2 = super.getIndex2(); } protected int encodeSingle(char inputChar) {
--- a/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/security/krb5/EncryptionKey.java Thu Jul 08 11:28:01 2010 -0700 @@ -188,24 +188,13 @@ etypes = EType.getBuiltInDefaults(); } - // set the preferred etype for preauth - if ((pa_exists) && (pa_etype != EncryptedData.ETYPE_NULL)) { - if (DEBUG) { - System.out.println("Pre-Authentication: " + - "Set preferred etype = " + pa_etype); - } - if (EType.isSupported(pa_etype)) { - // reset etypes to preferred value - etypes = new int[1]; - etypes[0] = pa_etype; - } - } - EncryptionKey[] encKeys = new EncryptionKey[etypes.length]; for (int i = 0; i < etypes.length; i++) { if (EType.isSupported(etypes[i])) { + byte[] s2kparams = (pa_exists && etypes[i] == pa_etype) + ? pa_s2kparams : null; encKeys[i] = new EncryptionKey( - stringToKey(password, salt, pa_s2kparams, etypes[i]), + stringToKey(password, salt, s2kparams, etypes[i]), etypes[i], null); } else { if (DEBUG) {
--- a/jdk/src/share/classes/sun/security/krb5/KrbAsReq.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/security/krb5/KrbAsReq.java Thu Jul 08 11:28:01 2010 -0700 @@ -342,20 +342,20 @@ } princName = cname; - - EncryptionKey key = null; - int[] tktETypes = EType.getDefaults("default_tkt_enctypes"); - if (pa_exists && pa_etype != EncryptedData.ETYPE_NULL) { - if (DEBUG) { - System.out.println("Pre-Authenticaton: find key for etype = " + pa_etype); - } - key = EncryptionKey.findKey(pa_etype, keys); - } else { - key = EncryptionKey.findKey(tktETypes[0], keys); - } - + int[] tktETypes = EType.getDefaults("default_tkt_enctypes", keys); PAData[] paData = null; if (PA_ENC_TIMESTAMP_REQUIRED) { + EncryptionKey key = null; + if (pa_etype != EncryptedData.ETYPE_NULL) { + if (DEBUG) { + System.out.println("Pre-Authenticaton: find key for etype = " + pa_etype); + } + key = EncryptionKey.findKey(pa_etype, keys); + } else { + if (tktETypes.length > 0) { + key = EncryptionKey.findKey(tktETypes[0], keys); + } + } if (DEBUG) { System.out.println("AS-REQ: Add PA_ENC_TIMESTAMP now"); }
--- a/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java Thu Jul 08 11:28:01 2010 -0700 @@ -286,6 +286,19 @@ salt = info.getSalt(); if (DEBUG) { System.out.println("\t PA-ETYPE-INFO etype = " + etype); + System.out.println("\t PA-ETYPE-INFO salt = " + salt); + } + while (der.data.available() > 0) { + value = der.data.getDerValue(); + info = new ETypeInfo(value); + if (DEBUG) { + etype = info.getEType(); + System.out.println("\t salt for " + etype + + " is " + info.getSalt()); + } + if (salt == null || salt.isEmpty()) { + salt = info.getSalt(); + } } } break; @@ -299,6 +312,19 @@ s2kparams = info2.getParams(); if (DEBUG) { System.out.println("\t PA-ETYPE-INFO2 etype = " + etype); + System.out.println("\t PA-ETYPE-INFO salt = " + salt); + } + while (der.data.available() > 0) { + value = der.data.getDerValue(); + info2 = new ETypeInfo2(value); + if (DEBUG) { + etype = info2.getEType(); + System.out.println("\t salt for " + etype + + " is " + info2.getSalt()); + } + if (salt == null || salt.isEmpty()) { + salt = info2.getSalt(); + } } } break;
--- a/jdk/src/share/classes/sun/security/validator/PKIXValidator.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/security/validator/PKIXValidator.java Thu Jul 08 11:28:01 2010 -0700 @@ -53,7 +53,7 @@ private int certPathLength = -1; // needed only for the validator - private Map<X500Principal, X509Certificate> trustedSubjects; + private Map<X500Principal, List<PublicKey>> trustedSubjects; private CertificateFactory factory; private boolean plugin = false; @@ -95,9 +95,17 @@ if (TRY_VALIDATOR == false) { return; } - trustedSubjects = new HashMap<X500Principal, X509Certificate>(); + trustedSubjects = new HashMap<X500Principal, List<PublicKey>>(); for (X509Certificate cert : trustedCerts) { - trustedSubjects.put(cert.getSubjectX500Principal(), cert); + X500Principal dn = cert.getSubjectX500Principal(); + List<PublicKey> keys; + if (trustedSubjects.containsKey(dn)) { + keys = trustedSubjects.get(dn); + } else { + keys = new ArrayList<PublicKey>(); + trustedSubjects.put(dn, keys); + } + keys.add(cert.getPublicKey()); } try { factory = CertificateFactory.getInstance("X.509"); @@ -161,13 +169,21 @@ // chain is not ordered correctly, call builder instead return doBuild(chain, otherCerts); } - if (trustedSubjects.containsKey(dn) - && trustedSubjects.get(dn).getPublicKey() - .equals(cert.getPublicKey())) { + + // Check if chain[i] is already trusted. It may be inside + // trustedCerts, or has the same dn and public key as a cert + // inside trustedCerts. The latter happens when a CA has + // updated its cert with a stronger signature algorithm in JRE + // but the weak one is still in circulation. + + if (trustedCerts.contains(cert) || // trusted cert + (trustedSubjects.containsKey(dn) && // replacing ... + trustedSubjects.get(dn).contains( // ... weak cert + cert.getPublicKey()))) { if (i == 0) { return new X509Certificate[] {chain[0]}; } - // Remove and call validator + // Remove and call validator on partial chain [0 .. i-1] X509Certificate[] newChain = new X509Certificate[i]; System.arraycopy(chain, 0, newChain, 0, i); return doValidate(newChain); @@ -217,14 +233,17 @@ return doBuild(chain, otherCerts); } - private boolean isSignatureValid(X509Certificate iss, X509Certificate sub) { + private boolean isSignatureValid(List<PublicKey> keys, X509Certificate sub) { if (plugin) { - try { - sub.verify(iss.getPublicKey()); - } catch (Exception ex) { - return false; + for (PublicKey key: keys) { + try { + sub.verify(key); + return true; + } catch (Exception ex) { + continue; + } } - return true; + return false; } return true; // only check if PLUGIN is set }
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java Thu Jul 08 11:28:01 2010 -0700 @@ -109,6 +109,12 @@ new StringBuffer("AATextInfoPropertyKey"); /** + * Attribute key for the content elements. If it is set on an element, the + * element is considered to be a line break. + */ + public static final String IMPLIED_CR = "CR"; + + /** * Used to tell a text component, being used as an editor for table * or tree, how many clicks it took to start editing. */
--- a/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java Thu Jul 08 11:28:01 2010 -0700 @@ -127,7 +127,7 @@ public static SortOrder getColumnSortOrder(JTable table, int column) { SortOrder rv = null; - if (table.getRowSorter() == null) { + if (table == null || table.getRowSorter() == null) { return rv; } java.util.List<? extends RowSorter.SortKey> sortKeys =
--- a/jdk/src/share/classes/sun/tools/jstat/Arguments.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/tools/jstat/Arguments.java Thu Jul 08 11:28:01 2010 -0700 @@ -47,6 +47,7 @@ private static final String JVMSTAT_USERDIR = ".jvmstat"; private static final String OPTIONS_FILENAME = "jstat_options"; + private static final String UNSUPPORTED_OPTIONS_FILENAME = "jstat_unsupported_options"; private static final String ALL_NAMES = "\\w*"; private Comparator<Monitor> comparator; @@ -411,8 +412,8 @@ return optionFormat; } - public URL[] optionsSources() { - URL[] sources = new URL[2]; + public List<URL> optionsSources() { + List<URL> sources = new ArrayList<URL>(); int i = 0; String filename = OPTIONS_FILENAME; @@ -421,7 +422,7 @@ String userHome = System.getProperty("user.home"); String userDir = userHome + "/" + JVMSTAT_USERDIR; File home = new File(userDir + "/" + filename); - sources[i++] = home.toURL(); + sources.add(home.toURI().toURL()); } catch (Exception e) { if (debug) { System.err.println(e.getMessage()); @@ -430,8 +431,15 @@ throw new IllegalArgumentException("Internal Error: Bad URL: " + e.getMessage()); } - sources[i] = this.getClass().getResource("resources/" + filename); - assert sources[i] != null; + URL u = this.getClass().getResource("resources/" + filename); + assert u != null; + sources.add(u); + + if (showUnsupported) { + u = this.getClass().getResource("resources/" + UNSUPPORTED_OPTIONS_FILENAME); + assert u != null; + sources.add(u); + } return sources; } }
--- a/jdk/src/share/classes/sun/tools/jstat/OptionFinder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/tools/jstat/OptionFinder.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,9 +39,9 @@ private static final boolean debug = false; - URL[] optionsSources; + List<URL> optionsSources; - public OptionFinder(URL[] optionsSources) { + public OptionFinder(List<URL> optionsSources) { this.optionsSources = optionsSources; } @@ -59,24 +59,25 @@ return of; } - protected OptionFormat getOptionFormat(String option, URL[] sources) { + protected OptionFormat getOptionFormat(String option, List<URL> sources) { OptionFormat of = null; - for (int i = 0; (i < sources.length) && (of == null); i++) { + for (URL u : sources) { try { - URL u = sources[i]; Reader r = new BufferedReader( new InputStreamReader(u.openStream())); of = new Parser(r).parse(option); + if (of != null) + break; } catch (IOException e) { if (debug) { - System.err.println("Error processing " + sources[i] + System.err.println("Error processing " + u + " : " + e.getMessage()); e.printStackTrace(); } } catch (ParserException e) { // Exception in parsing the options file. - System.err.println(sources[i] + ": " + e.getMessage()); - System.err.println("Parsing of " + sources[i] + " aborted"); + System.err.println(u + ": " + e.getMessage()); + System.err.println("Parsing of " + u + " aborted"); } } return of;
--- a/jdk/src/share/classes/sun/tools/jstat/OptionLister.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/tools/jstat/OptionLister.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,9 +37,9 @@ */ public class OptionLister { private static final boolean debug = false; - private URL[] sources; + private List<URL> sources; - public OptionLister(URL[] sources) { + public OptionLister(List<URL> sources) { this.sources = sources; } @@ -54,9 +54,8 @@ Set<OptionFormat> options = new TreeSet<OptionFormat>(c); - for (int i = 0; i < sources.length; i++) { + for (URL u : sources) { try { - URL u = sources[i]; Reader r = new BufferedReader( new InputStreamReader(u.openStream())); Set<OptionFormat> s = new Parser(r).parseOptions(); @@ -68,8 +67,8 @@ } } catch (ParserException e) { // Exception in parsing the options file. - System.err.println(sources[i] + ": " + e.getMessage()); - System.err.println("Parsing of " + sources[i] + " aborted"); + System.err.println(u + ": " + e.getMessage()); + System.err.println("Parsing of " + u + " aborted"); } }
--- a/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/classes/sun/tools/jstat/resources/jstat_options Thu Jul 08 11:28:01 2010 -0700 @@ -37,7 +37,7 @@ option class { column { header "^Loaded^" /* Number of classes loaded */ - data java.cls.loadedClasses + data (java.cls.loadedClasses + java.cls.sharedLoadedClasses) align right scale raw width 5 @@ -45,7 +45,7 @@ } column { header "^Bytes^" /* Accumulated Size of classes loaded */ - data sun.cls.loadedBytes + data (sun.cls.loadedBytes + sun.cls.sharedLoadedBytes) align right scale K width 7 @@ -53,7 +53,7 @@ } column { header "^Unloaded^" /* Number of classes unloaded */ - data java.cls.unloadedClasses + data (java.cls.unloadedClasses + java.cls.sharedUnloadedClasses) align right width 5 scale raw @@ -61,7 +61,7 @@ } column { header "^Bytes^" /* Accumulated size of classes unloaded */ - data sun.cls.unloadedBytes + data (sun.cls.unloadedBytes + sun.cls.sharedUnloadedBytes) align right scale K width 7
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,228 @@ +/* + * Copyright (c) 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. + */ + +option classload { + column { + header "^Loaded^" /* Number of classes loaded */ + data (java.cls.loadedClasses + java.cls.sharedLoadedClasses) + align right + scale raw + width 5 + format "0" + } + column { + header "Time^" /* Accumulated time for class loading */ + data sun.cls.time/sun.os.hrt.frequency + scale sec + align right + width 10 + format "0.000" + } + column { + header "^Inited^" /* Number of initialized classes */ + data sun.cls.initializedClasses + align right + scale raw + width 5 + format "0" + } + column { + header "Time^" /* Accumulated time for class initialization */ + data sun.cls.classInitTime.self/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "Shared^" /* Number of system classes loaded from shared archive */ + data java.cls.sharedLoadedClasses + align right + scale raw + width 5 + format "0" + } + column { + header "Kbytes^" /* Accumulated Size of classes loaded */ + data sun.cls.sharedLoadedBytes + align right + scale K + width 7 + format "0.0" + } + column { + header "LoadTime^" /* Accumulated time for loading classes from shared archive */ + data sun.cls.sharedClassLoadTime/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "^SysClass^" /* Number of system classes loaded */ + data java.cls.loadedClasses + align right + scale raw + width 5 + format "0" + } + column { + header "Kbytes^" /* Bytes read from system class files */ + data sun.cls.sysClassBytes + align right + scale K + width 7 + format "0.0" + } + column { + header "LoadTime^" /* Accumulated time for loading non-shared system classes */ + data sun.cls.sysClassLoadTime/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "Lookup^" /* Time spent in looking up/reading of system classes */ + data sun.cls.lookupSysClassTime/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "Parse^" /* Time spent in parsing system classes */ + data sun.cls.parseClassTime.self/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "^Linked^" /* Number of linked classes */ + data sun.cls.linkedClasses + align right + scale raw + width 5 + format "0" + } + column { + header "Time^" /* Accumulated time for class linking */ + data sun.cls.classInitTime.self/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "^Verified^" /* Number of verified classes */ + data sun.cls.verifiedClasses + align right + scale raw + width 5 + format "0" + } + column { + header "Time^" /* Accumulated time for class verification */ + data sun.cls.classVerifyTime.self/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "AppClass^" /* Number of loaded application classes */ + data sun.cls.appClassLoadCount + align right + scale raw + width 5 + format "0" + } + column { + header "Kbytes^" /* Bytes read from app class files */ + data sun.cls.appClassBytes + align right + scale K + width 7 + format "0.0" + } + column { + header "AppCL^" /* Accumulated time for loading app classes */ + data sun.cls.appClassLoadTime/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "^DefineClass^" /* Number of defineClass calls */ + data sun.cls.defineAppClasses + align right + scale raw + width 5 + format "0" + } + column { + header "Time^" /* Accumulated time for defineClass */ + data sun.cls.defineAppClassTime.self/sun.os.hrt.frequency + scale raw + align right + width 10 + format "0.000" + } + column { + header "^FindClass^" /* Number of findClass calls */ + data sun.classloader.findClasses + align right + scale raw + width 5 + format "0" + } + column { + header "Time^" /* Accumulated time for findClass */ + data sun.classloader.findClassTime/1000000000 + scale raw + align right + width 10 + format "0.000" + } + column { + header "Delegation^" /* Parent class loader delegation time */ + data sun.classloader.parentDelegationTime/1000000000 + scale raw + align right + width 10 + format "0.000" + } + column { + header "URLCL Read^" /* Accumulated time for URLClassLoader reading bytes */ + data sun.urlClassLoader.readClassBytesTime/1000000000 + scale raw + align right + width 10 + format "0.000" + } +} +
--- a/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt Thu Jul 08 11:28:01 2010 -0700 @@ -132,7 +132,7 @@ LIBRARY=lib$(LIBNAME).so LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text # Libraries we are dependent on - LIBRARIES= -lnsl -ldl -lc + LIBRARIES= -ldl -lc # Building a shared library LINK_SHARED=$(LINK.c) -shared -o $@ endif
--- a/jdk/src/share/javavm/export/classfile_constants.h Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/javavm/export/classfile_constants.h Thu Jul 08 11:28:01 2010 -0700 @@ -84,7 +84,22 @@ JVM_CONSTANT_Fieldref = 9, JVM_CONSTANT_Methodref = 10, JVM_CONSTANT_InterfaceMethodref = 11, - JVM_CONSTANT_NameAndType = 12 + JVM_CONSTANT_NameAndType = 12, + JVM_CONSTANT_MethodHandle = 15, // JSR 292 + JVM_CONSTANT_MethodType = 16 // JSR 292 +}; + +/* JVM_CONSTANT_MethodHandle subtypes */ +enum { + JVM_REF_getField = 1, + JVM_REF_getStatic = 2, + JVM_REF_putField = 3, + JVM_REF_putStatic = 4, + JVM_REF_invokeVirtual = 5, + JVM_REF_invokeStatic = 6, + JVM_REF_invokeSpecial = 7, + JVM_REF_newInvokeSpecial = 8, + JVM_REF_invokeInterface = 9 }; /* StackMapTable type item numbers */
--- a/jdk/src/share/native/common/check_code.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/native/common/check_code.c Thu Jul 08 11:28:01 2010 -0700 @@ -204,6 +204,8 @@ #define LDC_CLASS_MAJOR_VERSION 49 +#define LDC_METHOD_HANDLE_MAJOR_VERSION 51 + #define ALLOC_STACK_SIZE 16 /* big enough */ typedef struct alloc_stack_type { @@ -1181,6 +1183,10 @@ if (context->major_version >= LDC_CLASS_MAJOR_VERSION) { types |= 1 << JVM_CONSTANT_Class; } + if (context->major_version >= LDC_METHOD_HANDLE_MAJOR_VERSION) { + types |= (1 << JVM_CONSTANT_MethodHandle) | + (1 << JVM_CONSTANT_MethodType); + } this_idata->operand.i = key; verify_constant_pool_type(context, key, types); break; @@ -1194,6 +1200,10 @@ if (context->major_version >= LDC_CLASS_MAJOR_VERSION) { types |= 1 << JVM_CONSTANT_Class; } + if (context->major_version >= LDC_METHOD_HANDLE_MAJOR_VERSION) { + types |= (1 << JVM_CONSTANT_MethodHandle) | + (1 << JVM_CONSTANT_MethodType); + } this_idata->operand.i = key; verify_constant_pool_type(context, key, types); break; @@ -2667,6 +2677,22 @@ full_info = make_class_info_from_name(context, "java/lang/Class"); break; + case JVM_CONSTANT_MethodHandle: + case JVM_CONSTANT_MethodType: + if (context->major_version < LDC_METHOD_HANDLE_MAJOR_VERSION) + CCerror(context, "Internal error #3"); + stack_results = "A"; + switch (type_table[operand]) { + case JVM_CONSTANT_MethodType: + full_info = make_class_info_from_name(context, + "java/dyn/MethodType"); + break; + default: //JVM_CONSTANT_MethodHandle + full_info = make_class_info_from_name(context, + "java/dyn/MethodHandle"); + break; + } + break; default: CCerror(context, "Internal error #3"); stack_results = ""; /* Never reached: keep lint happy */
--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Thu Jul 08 11:28:01 2010 -0700 @@ -182,7 +182,7 @@ int success = 0; stream->read(stream, sig, SIG_BYTES); - if (!png_check_sig(sig, SIG_BYTES)) { + if (png_sig_cmp(sig, 0, SIG_BYTES)) { goto done; } success = SplashDecodePng(splash, my_png_read_stream, stream);
--- a/jdk/src/share/native/sun/font/freetypeScaler.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/share/native/sun/font/freetypeScaler.c Thu Jul 08 11:28:01 2010 -0700 @@ -490,22 +490,23 @@ /* ascent */ ax = 0; - ay = -(jfloat) FT26Dot6ToFloat( - scalerInfo->face->size->metrics.ascender + - bmodifier/2); + ay = -(jfloat) FT26Dot6ToFloat(FT_MulFix( + ((jlong) scalerInfo->face->ascender + bmodifier/2), + (jlong) scalerInfo->face->size->metrics.y_scale)); /* descent */ dx = 0; - dy = -(jfloat) FT26Dot6ToFloat( - scalerInfo->face->size->metrics.descender + - bmodifier/2); + dy = -(jfloat) FT26Dot6ToFloat(FT_MulFix( + ((jlong) scalerInfo->face->descender + bmodifier/2), + (jlong) scalerInfo->face->size->metrics.y_scale)); /* baseline */ bx = by = 0; /* leading */ lx = 0; - ly = (jfloat) FT26Dot6ToFloat( - scalerInfo->face->size->metrics.height + - bmodifier) + ay - dy; + ly = (jfloat) FT26Dot6ToFloat(FT_MulFix( + (jlong) scalerInfo->face->height + bmodifier, + (jlong) scalerInfo->face->size->metrics.y_scale)) + + ay - dy; /* max advance */ mx = (jfloat) FT26Dot6ToFloat( scalerInfo->face->size->metrics.max_advance +
--- a/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux Thu Jul 08 11:28:01 2010 -0700 @@ -25,25 +25,42 @@ package java.lang; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.FileDescriptor; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Arrays; +import java.util.concurrent.Executors; +import java.util.concurrent.Executor; +import java.util.concurrent.ThreadFactory; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; -/* java.lang.Process subclass in the UNIX environment. +/** + * java.lang.Process subclass in the UNIX environment. * * @author Mario Wolczko and Ross Knippel. * @author Konstantin Kladko (ported to Linux) + * @author Martin Buchholz */ - final class UNIXProcess extends Process { private static final sun.misc.JavaIOFileDescriptorAccess fdAccess = sun.misc.SharedSecrets.getJavaIOFileDescriptorAccess(); - private int pid; + private final int pid; private int exitcode; private boolean hasExited; - private OutputStream stdin_stream; - private InputStream stdout_stream; - private InputStream stderr_stream; + private /* final */ OutputStream stdin; + private /* final */ InputStream stdout; + private /* final */ InputStream stderr; /* this is for the reaping thread */ private native int waitForProcessExit(int pid); @@ -51,155 +68,136 @@ /** * Create a process using fork(2) and exec(2). * - * @param std_fds array of file descriptors. Indexes 0, 1, and - * 2 correspond to standard input, standard output and - * standard error, respectively. On input, a value of -1 - * means to create a pipe to connect child and parent - * processes. On output, a value which is not -1 is the - * parent pipe fd corresponding to the pipe which has - * been created. An element of this array is -1 on input - * if and only if it is <em>not</em> -1 on output. + * @param fds an array of three file descriptors. + * Indexes 0, 1, and 2 correspond to standard input, + * standard output and standard error, respectively. On + * input, a value of -1 means to create a pipe to connect + * child and parent processes. On output, a value which + * is not -1 is the parent pipe fd corresponding to the + * pipe which has been created. An element of this array + * is -1 on input if and only if it is <em>not</em> -1 on + * output. * @return the pid of the subprocess */ private native int forkAndExec(byte[] prog, byte[] argBlock, int argc, byte[] envBlock, int envc, byte[] dir, - int[] std_fds, + int[] fds, boolean redirectErrorStream) throws IOException; - /* In the process constructor we wait on this gate until the process */ - /* has been created. Then we return from the constructor. */ - /* fork() is called by the same thread which later waits for the process */ - /* to terminate */ - - private static class Gate { + /** + * The thread factory used to create "process reaper" daemon threads. + */ + private static class ProcessReaperThreadFactory implements ThreadFactory { + private final static ThreadGroup group = getRootThreadGroup(); - private boolean exited = false; - private IOException savedException; - - synchronized void exit() { /* Opens the gate */ - exited = true; - this.notify(); + private static ThreadGroup getRootThreadGroup() { + return AccessController.doPrivileged + (new PrivilegedAction<ThreadGroup> () { + public ThreadGroup run() { + ThreadGroup root = Thread.currentThread().getThreadGroup(); + while (root.getParent() != null) + root = root.getParent(); + return root; + }}); } - synchronized void waitForExit() { /* wait until the gate is open */ - boolean interrupted = false; - while (!exited) { - try { - this.wait(); - } catch (InterruptedException e) { - interrupted = true; - } - } - if (interrupted) { - Thread.currentThread().interrupt(); - } - } - - void setException (IOException e) { - savedException = e; - } - - IOException getException() { - return savedException; + public Thread newThread(Runnable grimReaper) { + // Our thread stack requirement is quite modest. + Thread t = new Thread(group, grimReaper, "process reaper", 32768); + t.setDaemon(true); + // A small attempt (probably futile) to avoid priority inversion + t.setPriority(Thread.MAX_PRIORITY); + return t; } } + /** + * The thread pool of "process reaper" daemon threads. + */ + private static final Executor processReaperExecutor + = Executors.newCachedThreadPool(new ProcessReaperThreadFactory()); + UNIXProcess(final byte[] prog, final byte[] argBlock, final int argc, final byte[] envBlock, final int envc, final byte[] dir, - final int[] std_fds, + final int[] fds, final boolean redirectErrorStream) - throws IOException { + throws IOException { + + pid = forkAndExec(prog, + argBlock, argc, + envBlock, envc, + dir, + fds, + redirectErrorStream); - final Gate gate = new Gate(); - /* - * For each subprocess forked a corresponding reaper thread - * is started. That thread is the only thread which waits - * for the subprocess to terminate and it doesn't hold any - * locks while doing so. This design allows waitFor() and - * exitStatus() to be safely executed in parallel (and they - * need no native code). - */ + try { + AccessController.doPrivileged + (new PrivilegedExceptionAction<Void>() { + public Void run() throws IOException { + initStreams(fds); + return null; + }}); + } catch (PrivilegedActionException ex) { + throw (IOException) ex.getException(); + } + } + + static FileDescriptor newFileDescriptor(int fd) { + FileDescriptor fileDescriptor = new FileDescriptor(); + fdAccess.set(fileDescriptor, fd); + return fileDescriptor; + } - java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction<Void>() { - public Void run() { - Thread t = new Thread("process reaper") { - public void run() { - try { - pid = forkAndExec(prog, - argBlock, argc, - envBlock, envc, - dir, - std_fds, - redirectErrorStream); - } catch (IOException e) { - gate.setException(e); /*remember to rethrow later*/ - gate.exit(); - return; - } - java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction<Void>() { - public Void run() { - if (std_fds[0] == -1) - stdin_stream = new ProcessBuilder.NullOutputStream(); - else { - FileDescriptor stdin_fd = new FileDescriptor(); - fdAccess.set(stdin_fd, std_fds[0]); - stdin_stream = new BufferedOutputStream( - new FileOutputStream(stdin_fd)); - } + void initStreams(int[] fds) throws IOException { + stdin = (fds[0] == -1) ? + ProcessBuilder.NullOutputStream.INSTANCE : + new ProcessPipeOutputStream(fds[0]); + + stdout = (fds[1] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new ProcessPipeInputStream(fds[1]); + + stderr = (fds[2] == -1) ? + ProcessBuilder.NullInputStream.INSTANCE : + new ProcessPipeInputStream(fds[2]); - if (std_fds[1] == -1) - stdout_stream = new ProcessBuilder.NullInputStream(); - else { - FileDescriptor stdout_fd = new FileDescriptor(); - fdAccess.set(stdout_fd, std_fds[1]); - stdout_stream = new BufferedInputStream( - new FileInputStream(stdout_fd)); - } - - if (std_fds[2] == -1) - stderr_stream = new ProcessBuilder.NullInputStream(); - else { - FileDescriptor stderr_fd = new FileDescriptor(); - fdAccess.set(stderr_fd, std_fds[2]); - stderr_stream = new FileInputStream(stderr_fd); - } + processReaperExecutor.execute(new Runnable() { + public void run() { + int exitcode = waitForProcessExit(pid); + UNIXProcess.this.processExited(exitcode); + }}); + } - return null; }}); - gate.exit(); /* exit from constructor */ - int res = waitForProcessExit(pid); - synchronized (UNIXProcess.this) { - hasExited = true; - exitcode = res; - UNIXProcess.this.notifyAll(); - } - } - }; - t.setDaemon(true); - t.start(); - return null; }}); - gate.waitForExit(); - IOException e = gate.getException(); - if (e != null) - throw new IOException(e.toString()); + synchronized void processExited(int exitcode) { + if (stdout instanceof ProcessPipeInputStream) + ((ProcessPipeInputStream) stdout).processExited(); + + if (stderr instanceof ProcessPipeInputStream) + ((ProcessPipeInputStream) stderr).processExited(); + + if (stdin instanceof ProcessPipeOutputStream) + ((ProcessPipeOutputStream) stdin).processExited(); + + this.exitcode = exitcode; + hasExited = true; + notifyAll(); } public OutputStream getOutputStream() { - return stdin_stream; + return stdin; } public InputStream getInputStream() { - return stdout_stream; + return stdout; } public InputStream getErrorStream() { - return stderr_stream; + return stderr; } public synchronized int waitFor() throws InterruptedException { @@ -228,13 +226,9 @@ if (!hasExited) destroyProcess(pid); } - try { - stdin_stream.close(); - stdout_stream.close(); - stderr_stream.close(); - } catch (IOException e) { - // ignore - } + try { stdin.close(); } catch (IOException ignored) {} + try { stdout.close(); } catch (IOException ignored) {} + try { stderr.close(); } catch (IOException ignored) {} } /* This routine initializes JNI field offsets for the class */ @@ -243,4 +237,77 @@ static { initIDs(); } + + /** + * A buffered input stream for a subprocess pipe file descriptor + * that allows the underlying file descriptor to be reclaimed when + * the process exits, via the processExited hook. + * + * This is tricky because we do not want the user-level InputStream to be + * closed until the user invokes close(), and we need to continue to be + * able to read any buffered data lingering in the OS pipe buffer. + */ + static class ProcessPipeInputStream extends BufferedInputStream { + ProcessPipeInputStream(int fd) { + super(new FileInputStream(newFileDescriptor(fd))); + } + + private static byte[] drainInputStream(InputStream in) + throws IOException { + if (in == null) return null; + int n = 0; + int j; + byte[] a = null; + while ((j = in.available()) > 0) { + a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j); + n += in.read(a, n, j); + } + return (a == null || n == a.length) ? a : Arrays.copyOf(a, n); + } + + /** Called by the process reaper thread when the process exits. */ + synchronized void processExited() { + // Most BufferedInputStream methods are synchronized, but close() + // is not, and so we have to handle concurrent racing close(). + try { + InputStream in = this.in; + if (in != null) { + byte[] stragglers = drainInputStream(in); + in.close(); + this.in = (stragglers == null) ? + ProcessBuilder.NullInputStream.INSTANCE : + new ByteArrayInputStream(stragglers); + if (buf == null) // asynchronous close()? + this.in = null; + } + } catch (IOException ignored) { + // probably an asynchronous close(). + } + } + } + + /** + * A buffered output stream for a subprocess pipe file descriptor + * that allows the underlying file descriptor to be reclaimed when + * the process exits, via the processExited hook. + */ + static class ProcessPipeOutputStream extends BufferedOutputStream { + ProcessPipeOutputStream(int fd) { + super(new FileOutputStream(newFileDescriptor(fd))); + } + + /** Called by the process reaper thread when the process exits. */ + synchronized void processExited() { + OutputStream out = this.out; + if (out != null) { + try { + out.close(); + } catch (IOException ignored) { + // We know of no reason to get an IOException, but if + // we do, there's nothing else to do but carry on. + } + this.out = ProcessBuilder.NullOutputStream.INSTANCE; + } + } + } }
--- a/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris Thu Jul 08 11:28:01 2010 -0700 @@ -86,7 +86,7 @@ java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Void>() { public Void run() { if (std_fds[0] == -1) - stdin_stream = new ProcessBuilder.NullOutputStream(); + stdin_stream = ProcessBuilder.NullOutputStream.INSTANCE; else { FileDescriptor stdin_fd = new FileDescriptor(); fdAccess.set(stdin_fd, std_fds[0]); @@ -95,7 +95,7 @@ } if (std_fds[1] == -1) - stdout_stream = new ProcessBuilder.NullInputStream(); + stdout_stream = ProcessBuilder.NullInputStream.INSTANCE; else { FileDescriptor stdout_fd = new FileDescriptor(); fdAccess.set(stdout_fd, std_fds[1]); @@ -104,7 +104,7 @@ } if (std_fds[2] == -1) - stderr_stream = new ProcessBuilder.NullInputStream(); + stderr_stream = ProcessBuilder.NullInputStream.INSTANCE; else { FileDescriptor stderr_fd = new FileDescriptor(); fdAccess.set(stderr_fd, std_fds[2]);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,5 @@ +# Jules Rendering Engine module +sun.java2d.jules.JulesRenderingEngine + +# Pisces Rendering Engine module +sun.java2d.pisces.PiscesRenderingEngine
--- a/jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,8 @@ * cannot be used for actual encoding because they are shared across all * COMPOUND_TEXT encoders and may be stateful. */ - private static final Map encodingToEncoderMap = - Collections.synchronizedMap(new HashMap(21, 1.0f)); + private static final Map<String,CharsetEncoder> encodingToEncoderMap = + Collections.synchronizedMap(new HashMap<String,CharsetEncoder>(21, 1.0f)); private static final CharsetEncoder latin1Encoder; private static final CharsetEncoder defaultEncoder; private static final boolean defaultEncodingSupported; @@ -221,7 +221,7 @@ out.put((byte)0x1B); out.put((byte)0x25); out.put((byte)0x2F); - out.put((byte)nonStandardBytes[3]); + out.put(nonStandardBytes[3]); int toWrite = Math.min(numBytes - nonStandardBytesOff, (1 << 14) - 1 - nonStandardEncodingLen); @@ -313,12 +313,9 @@ } // 4. Brute force search of all supported encodings. - for (Iterator iter = CompoundTextSupport.getEncodings().iterator(); - iter.hasNext();) + for (String encoding : CompoundTextSupport.getEncodings()) { - String encoding = (String)iter.next(); - CharsetEncoder enc = - (CharsetEncoder)encodingToEncoderMap.get(encoding); + CharsetEncoder enc = encodingToEncoderMap.get(encoding); if (enc == null) { enc = CompoundTextSupport.getEncoder(encoding); if (enc == null) {
--- a/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java Thu Jul 08 11:28:01 2010 -0700 @@ -130,13 +130,13 @@ /** * Maps a GL or GR escape sequence to an encoding. */ - private static final Map sequenceToEncodingMap; + private static final Map<ControlSequence, String> sequenceToEncodingMap; /** * Indicates whether a particular encoding wants the high bit turned on * or off. */ - private static final Map highBitsMap; + private static final Map<ControlSequence, Boolean> highBitsMap; /** * Maps an encoding to an escape sequence. Rather than manage two @@ -144,18 +144,21 @@ * modify both GL and GR if necessary. This makes the output slightly less * efficient, but our code much simpler. */ - private static final Map encodingToSequenceMap; + private static final Map<String, ControlSequence> encodingToSequenceMap; /** * The keys of 'encodingToSequenceMap', sorted in preferential order. */ - private static final List encodings; + private static final List<String> encodings; static { - HashMap tSequenceToEncodingMap = new HashMap(33, 1.0f); - HashMap tHighBitsMap = new HashMap(31, 1.0f); - HashMap tEncodingToSequenceMap = new HashMap(21, 1.0f); - ArrayList tEncodings = new ArrayList(21); + HashMap<ControlSequence, String> tSequenceToEncodingMap = + new HashMap<>(33, 1.0f); + HashMap<ControlSequence, Boolean> tHighBitsMap = + new HashMap<>(31, 1.0f); + HashMap<String, ControlSequence> tEncodingToSequenceMap = + new HashMap<>(21, 1.0f); + ArrayList<String> tEncodings = new ArrayList<>(21); if (!(isEncodingSupported("US-ASCII") && isEncodingSupported("ISO-8859-1"))) @@ -457,13 +460,12 @@ return getNonStandardDecoder(escSequence, null); } static boolean getHighBit(byte[] escSequence) { - Boolean bool = (Boolean)highBitsMap.get - (new ControlSequence(escSequence)); + Boolean bool = highBitsMap.get(new ControlSequence(escSequence)); return (bool == Boolean.TRUE); } static CharsetDecoder getNonStandardDecoder(byte[] escSequence, byte[] encoding) { - return getDecoder((String)sequenceToEncodingMap.get + return getDecoder(sequenceToEncodingMap.get (new ControlSequence(escSequence, encoding))); } static CharsetDecoder getDecoder(String enc) { @@ -474,7 +476,7 @@ try { cs = Charset.forName(enc); } catch (IllegalArgumentException e) { - Class cls; + Class<?> cls; try { cls = Class.forName("sun.awt.motif." + enc); } catch (ClassNotFoundException ee) { @@ -497,22 +499,20 @@ // For Encoder static byte[] getEscapeSequence(String encoding) { - ControlSequence seq = (ControlSequence) - encodingToSequenceMap.get(encoding); + ControlSequence seq = encodingToSequenceMap.get(encoding); if (seq != null) { return seq.escSequence; } return null; } static byte[] getEncoding(String encoding) { - ControlSequence seq = (ControlSequence) - encodingToSequenceMap.get(encoding); + ControlSequence seq = encodingToSequenceMap.get(encoding); if (seq != null) { return seq.encoding; } return null; } - static List getEncodings() { + static List<String> getEncodings() { return encodings; } static CharsetEncoder getEncoder(String enc) { @@ -523,7 +523,7 @@ try { cs = Charset.forName(enc); } catch (IllegalArgumentException e) { - Class cls; + Class<?> cls; try { cls = Class.forName("sun.awt.motif." + enc); } catch (ClassNotFoundException ee) {
--- a/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,6 +37,8 @@ * Linux implementation of HotSpotVirtualMachine */ public class LinuxVirtualMachine extends HotSpotVirtualMachine { + // temp directory for socket file + private static final String tmpdir = System.getProperty("java.io.tmpdir"); // Indicates if this machine uses the old LinuxThreads static boolean isLinuxThreads; @@ -260,7 +262,7 @@ // Return the socket file for the given process. // Checks working directory of process for .java_pid<pid>. If not - // found it looks in /tmp. + // found it looks in temp directory. private String findSocketFile(int pid) { // First check for a .java_pid<pid> file in the working directory // of the target process @@ -268,20 +270,17 @@ String path = "/proc/" + pid + "/cwd/" + fn; File f = new File(path); if (!f.exists()) { - // Not found, so try /tmp - path = "/tmp/" + fn; - f = new File(path); - if (!f.exists()) { - return null; // not found - } + // Not found, so try temp directory + f = new File(tmpdir, fn); + path = f.exists() ? f.getPath() : null; } return path; } // On Solaris/Linux a simple handshake is used to start the attach mechanism // if not already started. The client creates a .attach_pid<pid> file in the - // target VM's working directory (or /tmp), and the SIGQUIT handler checks - // for the file. + // target VM's working directory (or temp directory), and the SIGQUIT handler + // checks for the file. private File createAttachFile(int pid) throws IOException { String fn = ".attach_pid" + pid; String path = "/proc/" + pid + "/cwd/" + fn; @@ -289,8 +288,7 @@ try { f.createNewFile(); } catch (IOException x) { - path = "/tmp/" + fn; - f = new File(path); + f = new File(tmpdir, fn); f.createNewFile(); } return f;
--- a/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,6 +38,11 @@ * Solaris implementation of HotSpotVirtualMachine. */ public class SolarisVirtualMachine extends HotSpotVirtualMachine { + // Use /tmp instead of /var/tmp on Solaris as /tmp is the default used by + // HotSpot when the property is not set on the command line. + private static final String tmpdir1 = System.getProperty("java.io.tmpdir"); + private static final String tmpdir = + (tmpdir1.equals("/var/tmp") || tmpdir1.equals("/var/tmp/")) ? "/tmp" : tmpdir1; // door descriptor; private int fd = -1; @@ -187,7 +192,7 @@ } // The door is attached to .java_pid<pid> in the target VM's working - // directory or /tmp. + // directory or temporary directory. private int openDoor(int pid) throws IOException { // First check for a .java_pid<pid> file in the working directory // of the target process @@ -196,7 +201,7 @@ try { fd = open(path); } catch (FileNotFoundException fnf) { - path = "/tmp/" + fn; + path = tmpdir + "/" + fn; fd = open(path); } @@ -213,8 +218,8 @@ // On Solaris/Linux a simple handshake is used to start the attach mechanism // if not already started. The client creates a .attach_pid<pid> file in the - // target VM's working directory (or /tmp), and the SIGQUIT handler checks - // for the file. + // target VM's working directory (or temporary directory), and the SIGQUIT + // handler checks for the file. private File createAttachFile(int pid) throws IOException { String fn = ".attach_pid" + pid; String path = "/proc/" + pid + "/cwd/" + fn; @@ -222,8 +227,7 @@ try { f.createNewFile(); } catch (IOException x) { - path = "/tmp/" + fn; - f = new File(path); + f = new File(tmpdir, fn); f.createNewFile(); } return f;
--- a/jdk/src/windows/classes/java/lang/ProcessImpl.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/windows/classes/java/lang/ProcessImpl.java Thu Jul 08 11:28:01 2010 -0700 @@ -159,7 +159,7 @@ new java.security.PrivilegedAction<Void>() { public Void run() { if (stdHandles[0] == -1L) - stdin_stream = new ProcessBuilder.NullOutputStream(); + stdin_stream = ProcessBuilder.NullOutputStream.INSTANCE; else { FileDescriptor stdin_fd = new FileDescriptor(); fdAccess.setHandle(stdin_fd, stdHandles[0]); @@ -168,7 +168,7 @@ } if (stdHandles[1] == -1L) - stdout_stream = new ProcessBuilder.NullInputStream(); + stdout_stream = ProcessBuilder.NullInputStream.INSTANCE; else { FileDescriptor stdout_fd = new FileDescriptor(); fdAccess.setHandle(stdout_fd, stdHandles[1]); @@ -177,7 +177,7 @@ } if (stdHandles[2] == -1L) - stderr_stream = new ProcessBuilder.NullInputStream(); + stderr_stream = ProcessBuilder.NullInputStream.INSTANCE; else { FileDescriptor stderr_fd = new FileDescriptor(); fdAccess.setHandle(stderr_fd, stdHandles[2]);
--- a/jdk/src/windows/native/sun/font/fontpath.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/windows/native/sun/font/fontpath.c Thu Jul 08 11:28:01 2010 -0700 @@ -154,7 +154,7 @@ fullname = JNU_NewStringPlatform(env, lpelfe->elfFullName); fullnameLC = (*env)->CallObjectMethod(env, fullname, fmi->toLowerCaseMID, fmi->locale); - (*env)->CallObjectMethod(env, fmi->list, fmi->addMID, fullname); + (*env)->CallBooleanMethod(env, fmi->list, fmi->addMID, fullname); (*env)->CallObjectMethod(env, fmi->fontToFamilyMap, fmi->putMID, fullnameLC, fmi->family); return 1; @@ -238,7 +238,7 @@ wcslen((LPWSTR)lpelfe->elfFullName)); fullnameLC = (*env)->CallObjectMethod(env, fullname, fmi->toLowerCaseMID, fmi->locale); - (*env)->CallObjectMethod(env, fmi->list, fmi->addMID, fullname); + (*env)->CallBooleanMethod(env, fmi->list, fmi->addMID, fullname); (*env)->CallObjectMethod(env, fmi->fontToFamilyMap, fmi->putMID, fullnameLC, fmi->family); return 1;
--- a/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c Thu Jul 08 11:28:01 2010 -0700 @@ -120,6 +120,12 @@ rv = connect((SOCKET)fd, (struct sockaddr *)&sa, sa_len); if (rv == SOCKET_ERROR) { handleSocketError(env, WSAGetLastError()); + } else { + /* Disable WSAECONNRESET errors as socket is no longer connected */ + BOOL enable = FALSE; + DWORD bytesReturned = 0; + WSAIoctl((SOCKET)fd, SIO_UDP_CONNRESET, &enable, sizeof(enable), + NULL, 0, &bytesReturned, NULL, NULL); } }
--- a/jdk/src/windows/native/sun/nio/ch/Net.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/windows/native/sun/nio/ch/Net.c Thu Jul 08 11:28:01 2010 -0700 @@ -67,6 +67,14 @@ #define COPY_INET6_ADDRESS(env, source, target) \ (*env)->GetByteArrayRegion(env, source, 0, 16, target) +/** + * Enable or disable receipt of WSAECONNRESET errors. + */ +static void setConnectionReset(SOCKET s, BOOL enable) { + DWORD bytesReturned = 0; + WSAIoctl(s, SIO_UDP_CONNRESET, &enable, sizeof(enable), + NULL, 0, &bytesReturned, NULL, NULL); +} JNIEXPORT void JNICALL @@ -109,6 +117,12 @@ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (const char *)&opt, sizeof(opt)); } + + /* Disable WSAECONNRESET errors for initially unconnected UDP sockets */ + if (!stream) { + setConnectionReset(s, FALSE); + } + } else { NET_ThrowNew(env, WSAGetLastError(), "socket"); } @@ -149,12 +163,13 @@ SOCKETADDRESS sa; int rv; int sa_len; + SOCKET s = (SOCKET)fdval(env, fdo); if (NET_InetAddressToSockaddr(env, iao, port, (struct sockaddr *)&sa, &sa_len, preferIPv6) != 0) { return IOS_THROWN; } - rv = connect(fdval(env, fdo), (struct sockaddr *)&sa, sa_len); + rv = connect(s, (struct sockaddr *)&sa, sa_len); if (rv != 0) { int err = WSAGetLastError(); if (err == WSAEINPROGRESS || err == WSAEWOULDBLOCK) { @@ -162,6 +177,13 @@ } NET_ThrowNew(env, err, "connect"); return IOS_THROWN; + } else { + /* Enable WSAECONNRESET errors when a UDP socket is connected */ + int type = 0, optlen = sizeof(type); + rv = getsockopt(s, SOL_SOCKET, SO_TYPE, (char*)&type, &optlen); + if (rv == 0 && type == SOCK_DGRAM) { + setConnectionReset(s, TRUE); + } } return 1; }
--- a/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c Thu Jul 08 11:28:01 2010 -0700 @@ -50,6 +50,10 @@ jint fd = fdval(env, fdo); WSABUF buf; + /* limit size */ + if (len > MAX_BUFFER_SIZE) + len = MAX_BUFFER_SIZE; + /* destination buffer and size */ buf.buf = (char *)address; buf.len = (u_long)len; @@ -86,6 +90,7 @@ jint fd = fdval(env, fdo); struct iovec *iovp = (struct iovec *)address; WSABUF *bufs = malloc(len * sizeof(WSABUF)); + jint rem = MAX_BUFFER_SIZE; if (bufs == 0) { JNU_ThrowOutOfMemoryError(env, 0); @@ -98,8 +103,16 @@ /* copy iovec into WSABUF */ for(i=0; i<len; i++) { + jint iov_len = iovp[i].iov_len; + if (iov_len > rem) + iov_len = rem; bufs[i].buf = (char *)iovp[i].iov_base; - bufs[i].len = (u_long)iovp[i].iov_len; + bufs[i].len = (u_long)iov_len; + rem -= iov_len; + if (rem == 0) { + len = i+1; + break; + } } /* read into the buffers */ @@ -136,6 +149,10 @@ jint fd = fdval(env, fdo); WSABUF buf; + /* limit size */ + if (len > MAX_BUFFER_SIZE) + len = MAX_BUFFER_SIZE; + /* copy iovec into WSABUF */ buf.buf = (char *)address; buf.len = (u_long)len; @@ -171,6 +188,7 @@ jint fd = fdval(env, fdo); struct iovec *iovp = (struct iovec *)address; WSABUF *bufs = malloc(len * sizeof(WSABUF)); + jint rem = MAX_BUFFER_SIZE; if (bufs == 0) { JNU_ThrowOutOfMemoryError(env, 0); @@ -183,8 +201,16 @@ /* copy iovec into WSABUF */ for(i=0; i<len; i++) { + jint iov_len = iovp[i].iov_len; + if (iov_len > rem) + iov_len = rem; bufs[i].buf = (char *)iovp[i].iov_base; - bufs[i].len = (u_long)iovp[i].iov_len; + bufs[i].len = (u_long)iov_len; + rem -= iov_len; + if (rem == 0) { + len = i+1; + break; + } } /* read into the buffers */
--- a/jdk/src/windows/native/sun/nio/ch/nio_util.h Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/src/windows/native/sun/nio/ch/nio_util.h Thu Jul 08 11:28:01 2010 -0700 @@ -25,6 +25,14 @@ #include "jni.h" +/** + * The maximum buffer size for WSASend/WSARecv. Microsoft recommendation for + * blocking operations is to use buffers no larger than 64k. We need the + * maximum to be less than 128k to support asynchronous close on Windows + * Server 2003 and newer editions of Windows. + */ +#define MAX_BUFFER_SIZE ((128*1024)-1) + jint fdval(JNIEnv *env, jobject fdo); jlong handleval(JNIEnv *env, jobject fdo); jboolean isNT();
--- a/jdk/test/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -307,7 +307,7 @@ passc="`$(CAT) $(PASSLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ failc="`$(CAT) $(FAILLIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ exclc="`$(CAT) $(EXCLUDELIST) | $(WC) -l | $(AWK) '{print $$1;}'`"; \ - $(ECHO) "TEST STATS: run=$${runc} pass=$${passc} fail=$${failc} excluded=$${exclc}" \ + $(ECHO) "TEST STATS: name=$(UNIQUE_DIR) run=$${runc} pass=$${passc} fail=$${failc} excluded=$${exclc}" \ >> $(STATS_TXT); \ else \ $(ECHO) "Missing file: $${_summary}" >> $(STATS_TXT); \ @@ -326,7 +326,7 @@ # Prep for output prep: clean @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) - @$(MKDIR) -p `dirname $(ARCHIVE_BUNDLE)` + @$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` # Cleanup clean: @@ -376,7 +376,7 @@ $(EXCLUDELIST): $(PROBLEM_LISTS) $(TESTDIRS) @$(RM) $@ $@.temp1 $@.temp2 @(($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-all' ) ;\ - ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH)' ) ;\ + ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(PLATFORM_OS)' ) ;\ ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_ARCH2)' ) ;\ ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- '$(OS_NAME)-$(OS_VERSION)') ;\ ($(CAT) $(PROBLEM_LISTS) | $(EGREP) -- 'generic-$(OS_ARCH)' ) ;\ @@ -562,7 +562,7 @@ JDK_ALL_TARGETS += jdk_tools2 jdk_tools2: com/sun/tools sun/jvmstat sun/tools tools vm com/sun/servicetag com/sun/tracing $(call SharedLibraryPermissions,tools/launcher) - $(call RunOthervmBatch) + $(call RunSamevmBatch) # All tools tests jdk_tools: jdk_tools1 jdk_tools2
--- a/jdk/test/ProblemList.txt Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/ProblemList.txt Thu Jul 08 11:28:01 2010 -0700 @@ -174,10 +174,6 @@ java/beans/XMLEncoder/Test4625418.java solaris-sparc # Problems with samevm and setting security manager (speculation partially) -java/beans/Beans/Test4080522.java generic-all -java/beans/EventHandler/Test6277246.java generic-all -java/beans/EventHandler/Test6277266.java generic-all -java/beans/Introspector/Test6277246.java generic-all java/beans/Introspector/4168475/Test4168475.java generic-all java/beans/Introspector/4520754/Test4520754.java generic-all java/beans/Introspector/6380849/TestBeanInfo.java generic-all @@ -191,229 +187,14 @@ ############################################################################ -# jdk_io - -# Many of these tests have a tendency to leave input streams open, which -# will cause following tests to be failures when used in samevm mode. - -# Should be othervm, or corrected for samevm, fails with samevm: -java/io/BufferedReader/BigMark.java generic-all -java/io/BufferedReader/ReadLineSync.java generic-all - -# One of these is leaving "a.ser" file open, windows samevm -java/io/Serializable/duplicateSerialFields/Setup.java generic-all -java/io/Serializable/duplicateSerialFields/Test.java generic-all - -# One of these leaving foo.ser open, windows samevm problem -java/io/Serializable/enum/constantSubclasses/Read.java generic-all -java/io/Serializable/enum/constantSubclasses/Write.java generic-all -java/io/Serializable/enum/missingConstant/Read.java generic-all -java/io/Serializable/enum/missingConstant/Write.java generic-all - -# This is leaving subtest1.tmp open, windows samevm problem -java/io/Serializable/oldTests/AnnotateClass.java generic-all - -# One or more of these leave a piotest* file open, windows samevm -java/io/Serializable/oldTests/ArrayFields.java generic-all -java/io/Serializable/oldTests/ArraysOfArrays.java generic-all -java/io/Serializable/oldTests/BinaryTree.java generic-all -java/io/Serializable/oldTests/CircularList.java generic-all -java/io/Serializable/oldTests/SerializeWithException.java generic-all -java/io/Serializable/oldTests/SimpleArrays.java generic-all -java/io/Serializable/oldTests/WritePrimitive.java generic-all - -# Missing close on file 0.ser, windows samevm -java/io/Serializable/enum/badResolve/Read.java generic-all -java/io/Serializable/enum/badResolve/Write.java generic-all - -# One of these tests is leaving parents.ser open, windows samevm -java/io/Serializable/parents/EvolvedClass.java generic-all -java/io/Serializable/parents/OriginalClass.java generic-all - -# One of these tests is leaving file foo.ser and/or bar.ser open, windows samevm -java/io/Serializable/fieldTypeString/Read.java generic-all -java/io/Serializable/fieldTypeString/Write.java generic-all - -# One of these tests is leaving tmp.ser file open, windows samevm -java/io/Serializable/ClassCastExceptionDetail/Read.java generic-all -java/io/Serializable/ClassCastExceptionDetail/Write.java generic-all -java/io/Serializable/GetField/Read.java generic-all -java/io/Serializable/GetField/Read2.java generic-all -java/io/Serializable/GetField/Write.java generic-all -java/io/Serializable/PutField/Read.java generic-all -java/io/Serializable/PutField/Read2.java generic-all -java/io/Serializable/PutField/Write.java generic-all -java/io/Serializable/PutField/Write2.java generic-all -java/io/Serializable/arraySuidConflict/Read.java generic-all -java/io/Serializable/arraySuidConflict/Write.java generic-all -java/io/Serializable/backRefCNFException/Read.java generic-all -java/io/Serializable/backRefCNFException/Write.java generic-all -java/io/Serializable/class/Test.java generic-all -java/io/Serializable/evolution/AddedExternField/ReadAddedField.java generic-all -java/io/Serializable/evolution/AddedExternField/WriteAddedField.java generic-all -java/io/Serializable/evolution/AddedExternField/run.sh generic-all -java/io/Serializable/evolution/AddedField/ReadAddedField.java generic-all -java/io/Serializable/evolution/AddedField/WriteAddedField.java generic-all -java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java generic-all -java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java generic-all -java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java generic-all -java/io/Serializable/proxy/skipMissing/Read.java generic-all -java/io/Serializable/proxy/skipMissing/Write.java generic-all -java/io/Serializable/readObjectNoData/Read.java generic-all -java/io/Serializable/readObjectNoData/Write.java generic-all -java/io/Serializable/skipWriteObject/Read.java generic-all -java/io/Serializable/skipWriteObject/Write.java generic-all -java/io/Serializable/skippedObjCNFException/Read.java generic-all -java/io/Serializable/skippedObjCNFException/Write.java generic-all -java/io/Serializable/stopCustomDeserialization/Read.java generic-all -java/io/Serializable/stopCustomDeserialization/Write.java generic-all -java/io/Serializable/unresolvedClassDesc/Read.java generic-all -java/io/Serializable/unresolvedClassDesc/Write.java generic-all -java/io/Serializable/unshared/Read.java generic-all -java/io/Serializable/unshared/Write.java generic-all -java/io/Serializable/wrongReturnTypes/Read.java generic-all -java/io/Serializable/wrongReturnTypes/Write.java generic-all - -# Windows samevm issues? triggers other tests to fail, missing close() on f.txt? -java/io/DataInputStream/OpsAfterClose.java generic-all - -# Windows 32bit samevm failure: RuntimeException: File.getFreeSpace() failed -java/io/File/MaxPathLength.java generic-all - -# Should be othervm, or corrected for samevm, fails with samevm: -java/io/File/DeleteOnExit.java generic-all -java/io/File/DeleteOnExitLong.java generic-all -java/io/File/DeleteOnExitNPE.java generic-all -java/io/File/IsHidden.java generic-all -java/io/FileDescriptor/FileChannelFDTest.java generic-all -java/io/FileDescriptor/Finalize.java generic-all -java/io/FileInputStream/FinalizeShdCallClose.java generic-all - -# Known to cause samevm issues on windows, other tests fail, missing close()? -java/io/FileInputStream/OpsAfterClose.java generic-all - -# Should be othervm, or corrected for samevm, fails with samevm: -java/io/FileOutputStream/FinalizeShdCallClose.java generic-all - -# Known to cause samevm issues on windows, other tests fail, missing close()? -java/io/FileOutputStream/OpsAfterClose.java generic-all - -# Windows samevm issues? triggers other tests to fail, missing close() on f.txt? -java/io/InputStream/OpsAfterClose.java generic-all - -# Missing close() on x.ReadBounds file? Windows samevm issues -java/io/InputStream/ReadParams.java generic-all - -# Known to cause samevm issues on windows, other tests fail, missing close()? -java/io/InputStreamReader/GrowAfterEOF.java generic-all - -# Should be othervm, or corrected for samevm, fails with samevm: -java/io/ObjectInputStream/ResolveProxyClass.java generic-all - -# Not doing a close() on x.ParameterCheck file? windows samevm cascade error -java/io/RandomAccessFile/ParameterCheck.java generic-all - -# Not doing a close on x.ReadLine file? windows cascade samevm problems -java/io/RandomAccessFile/ReadLine.java generic-all - -# Not doing close on file input x.WriteByteChars, windows samevm problems -java/io/RandomAccessFile/WriteBytesChars.java generic-all - -# Not doing close on file input x.WriteUTF, windows samevm problems -java/io/RandomAccessFile/WriteUTF.java generic-all - -# Possibly, not doing a close() on input.txt, windows samevm issues. -java/io/RandomAccessFile/skipBytes/SkipBytes.java generic-all -java/io/readBytes/MemoryLeak.java generic-all -java/io/readBytes/ReadBytesBounds.java generic-all - -# Missing close on fields.ser, windows samevm -java/io/Serializable/checkModifiers/CheckModifiers.java generic-all - -# Should be othervm, or corrected for samevm, fails with samevm: -java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java generic-all -java/io/Serializable/proxy/Basic.java generic-all - -# Possibly not doing a close() on input.txt, windows samevm issues. -java/io/StreamTokenizer/Comment.java generic-all - -############################################################################ - # jdk_lang -# Some of these tests (like java/lang/management) may just need to be marked -# othervm, but that is partially speculation. - -# Samevm failure on OpenSolaris, security manager? -java/lang/ClassLoader/UninitializedParent.java generic-all - # Times out on solaris 10 sparc java/lang/ClassLoader/Assert.java generic-all -# Fedora 9 X64, RuntimeException: MyThread expected to be blocked on lock, but got null -java/lang/management/ThreadMXBean/ThreadStateTest.java generic-all - -# RuntimeException: Uptime of the JVM is more than 30 minutes (32 minutes). -java/lang/management/RuntimeMXBean/UpTime.java generic-all - # Solaris sparc, samevm, java.lang.Exception: Read from closed pipe hangs java/lang/Runtime/exec/SleepyCat.java generic-all -# Need to be marked othervm, or changed to be samevm safe -java/lang/annotation/ParameterAnnotations.java generic-all - -# Need to be marked othervm, or changed to be samevm safe -java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java generic-all -java/lang/ClassLoader/findSystemClass/Loader.java generic-all - -# Fedora 9 32bit, -client, samevm, Error while cleaning up threads after test -java/lang/management/ThreadMXBean/Locks.java generic-all - -# Need to be marked othervm, or changed to be samevm safe -java/lang/management/ClassLoadingMXBean/LoadCounts.java generic-all -java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java generic-all -java/lang/management/ManagementFactory/MXBeanProxyTest.java generic-all -java/lang/management/ManagementFactory/ThreadMXBeanProxy.java generic-all -java/lang/management/MemoryMXBean/CollectionUsageThreshold.java generic-all -java/lang/management/MemoryMXBean/GetMBeanInfo.java generic-all -java/lang/management/MemoryMXBean/LowMemoryTest.java generic-all -java/lang/management/MemoryMXBean/MemoryManagement.java generic-all -java/lang/management/MemoryMXBean/MemoryTest.java generic-all -java/lang/management/MemoryMXBean/Pending.java generic-all - -# Problematic on all platforms (even as othervm) -java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java generic-all - -# Causes jtreg exit samevm issues due to non-String object in system properties -java/lang/management/RuntimeMXBean/GetSystemProperties.java generic-all - -# Need to be marked othervm, or changed to be samevm safe -java/lang/management/RuntimeMXBean/PropertiesTest.java generic-all -java/lang/management/ThreadMXBean/AllThreadIds.java generic-all -java/lang/management/ThreadMXBean/EnableTest.java generic-all -java/lang/management/ThreadMXBean/FindMonitorDeadlock.java generic-all -java/lang/management/ThreadMXBean/LockingThread.java generic-all -java/lang/management/ThreadMXBean/MonitorDeadlock.java generic-all -java/lang/management/ThreadMXBean/MyOwnSynchronizer.java generic-all -java/lang/management/ThreadMXBean/SharedSynchronizer.java generic-all -java/lang/management/ThreadMXBean/SynchronizerLockingThread.java generic-all -java/lang/management/ThreadMXBean/ThreadCounts.java generic-all - -# Need to be marked othervm, or changed to be samevm safe -java/lang/reflect/Proxy/Boxing.java generic-all -java/lang/reflect/Proxy/ClassRestrictions.java generic-all -java/lang/reflect/Proxy/returnTypes/Test.java generic-all - -# Need to be marked othervm, or changed to be samevm safe -java/lang/Runtime/exec/LotsOfOutput.java generic-all -java/lang/System/ExitFinalizersAndJIT.java generic-all -java/lang/System/finalization/FinThreads.java generic-all -java/lang/System/IgnoreNullSecurityManager.java generic-all -java/lang/Thread/GenerifyStackTraces.java generic-all -java/lang/Thread/StackTraces.java generic-all -java/lang/ThreadGroup/Daemon.java generic-all -java/lang/ThreadGroup/NullThreadName.java generic-all - # Times out on solaris sparc -server java/lang/ThreadLocal/MemoryLeak.java solaris-all @@ -427,18 +208,12 @@ # jdk_management +# Failing, bug was filed: 6959636 +javax/management/loading/LibraryLoader/LibraryLoaderTest.java generic-all + # Access denied messages on windows/mks, filed 6954450 sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh windows-all -# Filed 6951284, fails on linux 64bit Fedora 9, peak thread count differences -java/lang/management/ThreadMXBean/ResetPeakThreadCount.java generic-all - -# Started failing on linux and solaris (filed 6950927) -# com.sun.tools.attach.AttachNotSupportedException: -# Unable to open socket file: -# target process not responding or HotSpot VM not loaded -sun/management/jmxremote/bootstrap/JvmstatCountersTest.java generic-all - # Fails on linux: KO: StringMonitor notification missed or not emitted javax/management/monitor/NonComparableAttributeValueTest.java generic-all @@ -737,9 +512,6 @@ # Suspect many of these tests auffer from using fixed ports, no concrete # evidence. -# Failing on Solaris x86 and Linux x86, filed 6934585 -java/nio/channels/AsynchronousSocketChannel/Basic.java generic-all - # Occasionally Failing with java.lang.AssertionError on Windows X64 # at sun.nio.ch.PendingIoCache.clearPendingIoMap(PendingIoCache.java:144) #java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java windows-all @@ -751,26 +523,6 @@ com/sun/nio/sctp/SctpChannel/Send.java generic-all com/sun/nio/sctp/SctpChannel/Shutdown.java generic-all -# Fails on Windows 2000, Can't delete test directory .\x.SetLastModified.dir -# at SetLastModified.main(SetLastModified.java:107) -java/io/File/SetLastModified.java generic-all - -# Fails on Solaris 10 x64, address already in use -java/nio/channels/DatagramChannel/SRTest.java generic-all - -# Fails on Solaris 10 x86, times out -java/nio/channels/DatagramChannel/Sender.java generic-all - -# Fails on Fedora 9 x86, address in use -java/nio/channels/Selector/SelectWrite.java generic-all - -# Fails on Fedora 9 32bit times out -java/nio/channels/DatagramChannel/EmptyBuffer.java generic-all - -# Fails on Windows 2000, ExceptionInInitializerError -# in WindowsAsynchronousServerSocketChannelImpl.java:316 -java/nio/channels/AsynchronousChannelGroup/Unbounded.java generic-all - # Fails on Windows 2000, times out java/nio/channels/FileChannel/Transfer.java generic-all @@ -784,9 +536,6 @@ # Triggers a hotspot crash on Fedora 9 32bit -server and Windows X64 samevm sun/nio/cs/TestUTF8.java generic-all -# Solaris sparc, socket timeout -java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh generic-all - # Runtime exception on windows X64, samevm mode java/nio/channels/Selector/WakeupNow.java generic-all @@ -809,14 +558,12 @@ # Linux 64bit failures. too many files open java/nio/channels/Selector/HelperSlowToDie.java generic-all -# Timeouts etc. on Window -java/nio/channels/AsyncCloseAndInterrupt.java windows-all - -# Gets java.lang.ExceptionInInitializerError on windows: (Windows 2000 only?) +# Gets java.lang.ExceptionInInitializerError on Windows 2000 (need XP or newer) java/nio/channels/AsynchronousChannelGroup/Basic.java windows-5.0 java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java windows-5.0 java/nio/channels/AsynchronousChannelGroup/Identity.java windows-5.0 java/nio/channels/AsynchronousChannelGroup/Restart.java windows-5.0 +java/nio/channels/AsynchronousChannelGroup/Unbounded.java windows-5.0 java/nio/channels/AsynchronousDatagramChannel/Basic.java windows-5.0 java/nio/channels/AsynchronousFileChannel/Lock.java windows-5.0 java/nio/channels/AsynchronousServerSocketChannel/Basic.java windows-5.0 @@ -827,19 +574,10 @@ java/nio/channels/AsynchronousSocketChannel/StressLoopback.java windows-5.0 java/nio/channels/Channels/Basic2.java windows-5.0 -# Solaris sparc timeout -java/nio/channels/DatagramChannel/Connect.java generic-all - -# Solaris i586 timeouts -java/nio/channels/DatagramChannel/EmptyBuffer.java solaris-all - # Failed loopback connection? On windows 32bit? # Considered a stress test, can consume all resources. java/nio/channels/Selector/LotsOfChannels.java generic-all -# Solaris sparcv9, just fails with exception -java/nio/channels/Selector/OpRead.java solaris-sparc - # Windows i586 client, crashed hotspot? Unpredictable # Considered a stress test, can consume all resources. java/nio/channels/Selector/RegAfterPreClose.java generic-all @@ -854,18 +592,6 @@ java/nio/channels/SocketChannel/ConnectState.java windows-all java/nio/channels/SocketChannel/FinishConnect.java windows-all -# Need to be marked othervm, or changed to be samevm safe -java/nio/channels/SocketChannel/OpenLeak.java generic-all - -# Gets java.net.BindException alot (static port number?) -java/nio/channels/SocketChannel/VectorIO.java generic-all - -# Solaris i586 java.net.BindExceptions -java/nio/channels/SocketChannel/VectorParams.java solaris-all - -# Linux i586 address already in use, samevm issues -java/nio/channels/SocketChannel/Write.java generic-all - # Fails on all platforms due to overlap of JDK jar file contents: sun/nio/cs/Test4200310.sh generic-all @@ -1142,97 +868,6 @@ # jdk_tools -# Filed bug 6951287, failed on Linux 64bit, sometimes? -com/sun/jdi/PopAndInvokeTest.java generic-all - -# Some of the tools tests kind of require "othervm" or if they don't will -# always be firing up another VM anyway due to the nature of tools testing. -# So most if not all tools tests are now being run with "othervm" mode. -# Some of these tools tests have a tendency to use fixed ports, bad idea. - -# Fails with -ea -esa on Solaris, Assertion error (Solaris specific test) -com/sun/tracing/BasicFunctionality.java generic-all - -# Fails on Fedora 9 32bit, jps output differs problem -sun/tools/jstatd/jstatdDefaults.sh generic-all - -# Fails on Linux Fedora 9 32bit, Could not read data for remote JVM 16133 -# jstat output differs from expected output -sun/tools/jstatd/jstatdExternalRegistry.sh generic-all - -# Output of jps differs from expected output. -# Invalid argument count on solaris-sparc and x64 -sun/tools/jstatd/jstatdPort.sh generic-all - -# othervm mode, Could not synchronize with target -sun/tools/jps/jps-l_1.sh generic-all -sun/tools/jps/jps-l_2.sh generic-all -sun/tools/jps/jps-lm.sh generic-all -sun/tools/jps/jps-Vvml_2.sh generic-all -sun/tools/jps/jps-m_2.sh generic-all - -# Fails on Solaris 10 sparcv9, shell exits with 1 -# Turning off use of shared archive because of choice of garbage collector or large pages -# Could not synchronize with target -sun/tools/jps/jps-v_1.sh generic-all - -# Fails on OpenSolaris "Could not synchronize with target" -sun/tools/jps/jps-Defaults.sh generic-all -sun/tools/jps/jps-V_2.sh generic-all -sun/tools/jps/jps-Vm_2.sh generic-all -sun/tools/jps/jps-Vvm.sh generic-all -sun/tools/jps/jps-Vvml.sh generic-all -sun/tools/jps/jps-m.sh generic-all - -# Server name error, port 2098 problem? -sun/tools/jstatd/jstatdServerName.sh generic-all - -# These tests fail on solaris sparc, all the time -com/sun/servicetag/DeleteServiceTag.java generic-all -com/sun/servicetag/DuplicateNotFound.java generic-all -com/sun/servicetag/FindServiceTags.java generic-all -com/sun/servicetag/InstanceUrnCheck.java generic-all -com/sun/servicetag/InvalidRegistrationData.java generic-all -com/sun/servicetag/InvalidServiceTag.java generic-all -com/sun/servicetag/JavaServiceTagTest.java generic-all -com/sun/servicetag/JavaServiceTagTest1.java generic-all -com/sun/servicetag/NewRegistrationData.java generic-all -com/sun/servicetag/SystemRegistryTest.java generic-all -com/sun/servicetag/TestLoadFromXML.java generic-all -com/sun/servicetag/UpdateServiceTagTest.java generic-all -com/sun/servicetag/ValidRegistrationData.java generic-all - -# Problems on windows, jmap.exe hangs? -com/sun/tools/attach/BasicTests.sh windows-all - -# Fails on Solaris 10 sparc, in othervm mode, throws unexpected exception -sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all - -# Unexpected Monitor Exception, solaris sparc -client -sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh generic-all - -# Problems on windows, jmap.exe hangs? (these run jmap) -sun/tools/jmap/Basic.sh windows-all - -# Invalid argument count on solaris-sparc and x64 -sun/tools/jstatd/jstatdDefaults.sh solaris-all - -# Solaris sparcv9, jps output does not match, x64 different -sun/tools/jstatd/jstatdExternalRegistry.sh solaris-all - -# Solaris 10 sparc 32bit -client, java.lang.AssertionError: Some tests failed -tools/jar/JarEntryTime.java generic-all - -# Times out on sparc? -tools/launcher/VersionCheck.java generic-all - -# These tests fail on solaris sparc, all the time -tools/jar/ChangeDir.java generic-all - -# Cannot write jar -# Also, possible problems on windows, jmap.exe hangs? -tools/jar/index/MetaInf.java windows-all - ############################################################################ # jdk_util @@ -1241,12 +876,6 @@ # 11 separate stacktraces created... file reuse problem? java/util/zip/ZipFile/ReadLongZipFileName.java generic-all -# Recent failure on all platforms -sun/util/resources/TimeZone/Bug6317929.java generic-all - -# Fails with -ea -esa on all platforms with Assertion error -java/util/ResourceBundle/Test4300693.java generic-all - # Failing on all -client 32bit platforms starting with b77? See 6908348. java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java generic-all @@ -1274,39 +903,7 @@ java/util/Formatter/Constructors.java generic-all # Need to be marked othervm, or changed to be samevm safe -java/util/Locale/Bug4175998Test.java generic-all -java/util/Locale/Bug4184873Test.java generic-all -java/util/Locale/LocaleTest.java generic-all - -# Need to be marked othervm, or changed to be samevm safe -java/util/logging/GetGlobalTest.java generic-all -java/util/logging/LoggerSubclass.java generic-all -java/util/logging/LoggingDeadlock.java generic-all -java/util/logging/LoggingDeadlock2.java generic-all -java/util/logging/LoggingMXBeanTest.java generic-all -java/util/logging/LoggingMXBeanTest2.java generic-all -java/util/logging/LoggingNIOChange.java generic-all -java/util/logging/ParentLoggersTest.java generic-all - -# Need to be marked othervm, or changed to be samevm safe -java/util/ResourceBundle/Bug4168625Test.java generic-all -java/util/ResourceBundle/Bug6359330.java generic-all -java/util/ResourceBundle/TestBug4179766.java generic-all - -# Need to be marked othervm, or changed to be samevm safe java/util/WeakHashMap/GCDuringIteration.java generic-all -# Possible missing input stream close()? Causes samevm issues on windows -java/util/zip/InfoZip.java generic-all - -# Missing a close() on file Test0.zip? windows samevm cascade problem -java/util/zip/ZipFile/Comment.java generic-all - -# Suspect missing close() on bad*.zip files, windows cascade errors with samevm -java/util/zip/ZipFile/CorruptedZipFiles.java generic-all - -# Should be samevm but causes problems with samevm, no details: -java/util/zip/ZipFile/ManyEntries.java generic-all - ############################################################################
--- a/jdk/test/com/sun/jdi/PopAndInvokeTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/com/sun/jdi/PopAndInvokeTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -24,6 +24,7 @@ /** * @test * @bug 6517249 + * @ignore 6951287 * @summary JDWP: Cannot do an invokeMethod after a popFrames operation * * @author jjh
--- a/jdk/test/com/sun/servicetag/FindServiceTags.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/com/sun/servicetag/FindServiceTags.java Thu Jul 08 11:28:01 2010 -0700 @@ -56,8 +56,17 @@ private static int expectedUrnCount = 3; public static void main(String[] argv) throws Exception { - registry = Util.getSvcTagClientRegistry(); + try { + registry = Util.getSvcTagClientRegistry(); + runTest(); + } finally { + // restore empty registry file + Util.emptyRegistryFile(); + } + System.out.println("Test passed."); + } + public static void runTest() throws Exception { for (String filename : files) { File f = new File(servicetagDir, filename); ServiceTag svcTag = Util.newServiceTag(f); @@ -95,7 +104,6 @@ tags.size()); } - System.out.println("Test passed."); } private static void findServiceTags(String productUrn) throws Exception {
--- a/jdk/test/com/sun/servicetag/JavaServiceTagTest1.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/com/sun/servicetag/JavaServiceTagTest1.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ * are both created correctly. * @author Mandy Chung * - * @run build JavaServiceTagTest1 + * @run build JavaServiceTagTest1 SvcTagClient Util * @run main JavaServiceTagTest1 */ @@ -46,6 +46,16 @@ private static File svcTagFile; private static Registry registry; public static void main(String[] argv) throws Exception { + try { + registry = Util.getSvcTagClientRegistry(); + runTest(); + } finally { + // restore empty registry file + Util.emptyRegistryFile(); + } + } + + private static void runTest() throws Exception { // cleanup the registration.xml and servicetag file in the test directory System.setProperty("servicetag.dir.path", registrationDir); regFile = new File(registrationDir, "registration.xml"); @@ -54,8 +64,6 @@ svcTagFile = new File(registrationDir, "servicetag"); svcTagFile.delete(); - registry = Util.getSvcTagClientRegistry(); - // verify that only one service tag is created ServiceTag st1 = testJavaServiceTag("Test1");
--- a/jdk/test/com/sun/servicetag/SystemRegistryTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/com/sun/servicetag/SystemRegistryTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -50,8 +50,16 @@ private static Registry registry; public static void main(String[] argv) throws Exception { - registry = Util.getSvcTagClientRegistry(); + try { + registry = Util.getSvcTagClientRegistry(); + runTest(); + } finally { + // restore empty registry file + Util.emptyRegistryFile(); + } + } + private static void runTest() throws Exception { for (String filename : files) { File f = new File(servicetagDir, filename); ServiceTag svcTag = Util.newServiceTag(f);
--- a/jdk/test/com/sun/servicetag/Util.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/com/sun/servicetag/Util.java Thu Jul 08 11:28:01 2010 -0700 @@ -219,25 +219,25 @@ } private static Registry registry = null; + private static File registryFile = null; /** * Returns the Registry processed by SvcTagClient that simulates * stclient. */ static synchronized Registry getSvcTagClientRegistry() throws IOException { + String regDir = System.getProperty("test.classes"); + File f = new File(regDir, "registry.xml"); if (registry != null) { + if (!f.equals(registryFile) && f.length() != 0) { + throw new AssertionError("Has to be empty registry.xml to run in samevm"); + } return registry; } // System.setProperty("servicetag.verbose", "true"); // enable the helper class System.setProperty("servicetag.sthelper.supported", "true"); - - // clean up registry.xml - String regDir = System.getProperty("test.classes"); - File registryFile = new File(regDir, "registry.xml"); - if (registryFile.exists()) { - registryFile.delete(); - } + registryFile = f; String stclientCmd = Util.getSvcClientCommand(registryFile.getCanonicalPath()); System.out.println("stclient cmd: " + stclientCmd); @@ -247,4 +247,17 @@ registry = Registry.getSystemRegistry(); return registry; } + + static void emptyRegistryFile() throws IOException { + if (registryFile.exists()) { + BufferedOutputStream out = new BufferedOutputStream( + new FileOutputStream(registryFile)); + try { + RegistrationData data = new RegistrationData(); + data.storeToXML(out); + } finally { + out.close(); + } + } + } }
--- a/jdk/test/com/sun/tools/attach/BasicTests.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/com/sun/tools/attach/BasicTests.sh Thu Jul 08 11:28:01 2010 -0700 @@ -37,6 +37,21 @@ exit 1 fi +# Windows 2000 is a problem here, so we skip it, see 6962615 +osrev=`uname -a` +if [ "`echo ${osrev} | grep 'CYGWIN'`" != "" ] ; then + if [ "`echo ${osrev} | grep '5.0'`" != "" ] ; then + echo "Treating as a pass, not testing Windows 2000" + exit 0 + fi +fi +if [ "`echo ${osrev} | grep 'Windows'`" != "" ] ; then + if [ "`echo ${osrev} | grep '5 00'`" != "" ] ; then + echo "Treating as a pass, not testing Windows 2000" + exit 0 + fi +fi + . ${TESTSRC}/CommonSetup.sh . ${TESTSRC}/ApplicationSetup.sh . ${TESTSRC}/AgentSetup.sh
--- a/jdk/test/com/sun/tracing/BasicFunctionality.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/com/sun/tracing/BasicFunctionality.java Thu Jul 08 11:28:01 2010 -0700 @@ -24,6 +24,7 @@ /** * @test * @bug 6537506 + * @ignore 6962535 * @summary Basic unit test for tracing framework */
--- a/jdk/test/java/beans/Beans/Test4080522.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/beans/Beans/Test4080522.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,6 +29,7 @@ * Beans.setGuiAvailable * Introspector.setBeanInfoSearchPath * PropertyEditorManager.setEditorSearchPath + * @run main/othervm Test4080522 * @author Graham Hamilton */
--- a/jdk/test/java/beans/EventHandler/Test6277246.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/beans/EventHandler/Test6277246.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,6 +25,7 @@ * @test * @bug 6277246 * @summary Tests problem with java.beans use of reflection + * @run main/othervm Test6277246 * @author Jeff Nisewanger */
--- a/jdk/test/java/beans/EventHandler/Test6277266.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/beans/EventHandler/Test6277266.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,6 +25,7 @@ * @test * @bug 6277266 * @summary Tests access control issue in EventHandler + * @run main/othervm Test6277266 * @author Jeff Nisewanger */
--- a/jdk/test/java/beans/Introspector/Test6277246.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/beans/Introspector/Test6277246.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,6 +25,7 @@ * @test * @bug 6277246 * @summary Tests problem with java.beans use of reflection + * @run main/othervm Test6277246 * @author Jeff Nisewanger */
--- a/jdk/test/java/dyn/MethodHandlesTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/dyn/MethodHandlesTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -26,19 +26,18 @@ /* @test * @summary unit tests for java.dyn.MethodHandles * @compile -XDinvokedynamic MethodHandlesTest.java - * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableInvokeDynamic jdk.java.dyn.MethodHandlesTest + * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableInvokeDynamic test.java.dyn.MethodHandlesTest */ -package jdk.java.dyn; +package test.java.dyn; import java.dyn.*; import java.dyn.MethodHandles.Lookup; import java.lang.reflect.*; import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; import org.junit.*; import static org.junit.Assert.*; +import static org.junit.Assume.*; /** @@ -47,7 +46,11 @@ */ public class MethodHandlesTest { // How much output? - static int verbosity = 1; + static int verbosity = 0; + static { + String vstr = System.getProperty("test.java.dyn.MethodHandlesTest.verbosity"); + if (vstr != null) verbosity = Integer.parseInt(vstr); + } // Set this true during development if you want to fast-forward to // a particular new, non-working test. Tests which are known to @@ -57,55 +60,82 @@ // Set true to test more calls. If false, some tests are just // lookups, without exercising the actual method handle. - static boolean DO_MORE_CALLS = false; + static boolean DO_MORE_CALLS = true; @Test public void testFirst() throws Throwable { verbosity += 9; try { // left blank for debugging - } finally { verbosity -= 9; } + } finally { printCounts(); verbosity -= 9; } } // current failures @Test @Ignore("failure in call to makeRawRetypeOnly in ToGeneric") public void testFail_1() throws Throwable { + // AMH.<init>: IllegalArgumentException: bad adapter (conversion=0xfffab300): adapter pushes too many parameters testSpreadArguments(int.class, 0, 6); } - @Test @Ignore("failure in JVM when expanding the stack") + @Test @Ignore("failure in JVM when expanding the stack using asm stub for _adapter_spread_args") public void testFail_2() throws Throwable { // if CONV_OP_IMPLEMENTED_MASK includes OP_SPREAD_ARGS, this crashes: testSpreadArguments(Object.class, 0, 2); } @Test @Ignore("IllArgEx failure in call to ToGeneric.make") public void testFail_3() throws Throwable { + // ToGeneric.<init>: UnsupportedOperationException: NYI: primitive parameters must follow references; entryType = (int,java.lang.Object)java.lang.Object testSpreadArguments(int.class, 1, 2); } @Test @Ignore("IllArgEx failure in call to ToGeneric.make") public void testFail_4() throws Throwable { + // ToGeneric.<init>: UnsupportedOperationException: NYI: primitive parameters must follow references; entryType = (int,java.lang.Object)java.lang.Object testCollectArguments(int.class, 1, 2); } @Test @Ignore("cannot collect leading primitive types") public void testFail_5() throws Throwable { + // ToGeneric.<init>: UnsupportedOperationException: NYI: primitive parameters must follow references; entryType = (int,java.lang.Object)java.lang.Object testInvokers(MethodType.genericMethodType(2).changeParameterType(0, int.class)); } @Test @Ignore("should not insert arguments beyond MethodHandlePushLimit") public void testFail_6() throws Throwable { - testInsertArguments(0, 0, MAX_ARG_INCREASE+1); + // ValueConversions.varargsArray: UnsupportedOperationException: NYI: cannot form a varargs array of length 13 + testInsertArguments(0, 0, MAX_ARG_INCREASE+10); } static final int MAX_ARG_INCREASE = 3; public MethodHandlesTest() { } + @Before + public void checkImplementedPlatform() { + boolean platformOK = false; + Properties properties = System.getProperties(); + String vers = properties.getProperty("java.vm.version"); + String name = properties.getProperty("java.vm.name"); + String arch = properties.getProperty("os.arch"); + if ((arch.equals("amd64") || arch.equals("i386") || arch.equals("x86") || + arch.equals("sparc") || arch.equals("sparcv9")) && + (name.contains("Client") || name.contains("Server")) + ) { + platformOK = true; + } else { + System.err.println("Skipping tests for unsupported platform: "+Arrays.asList(vers, name, arch)); + } + assumeTrue(platformOK); + } + String testName; + static int allPosTests, allNegTests; int posTests, negTests; @After public void printCounts() { - if (verbosity >= 1 && (posTests | negTests) != 0) { + if (verbosity >= 2 && (posTests | negTests) != 0) { System.out.println(); if (posTests != 0) System.out.println("=== "+testName+": "+posTests+" positive test cases run"); if (negTests != 0) System.out.println("=== "+testName+": "+negTests+" negative test cases run"); + allPosTests += posTests; + allNegTests += negTests; + posTests = negTests = 0; } } void countTest(boolean positive) { @@ -115,7 +145,7 @@ void countTest() { countTest(true); } void startTest(String name) { if (testName != null) printCounts(); - if (verbosity >= 0) + if (verbosity >= 1) System.out.println(name); posTests = negTests = 0; testName = name; @@ -125,11 +155,17 @@ public static void setUpClass() throws Exception { calledLog.clear(); calledLog.add(null); - nextArg = 1000000; + nextArgVal = INITIAL_ARG_VAL; } @AfterClass public static void tearDownClass() throws Exception { + int posTests = allPosTests, negTests = allNegTests; + if (verbosity >= 2 && (posTests | negTests) != 0) { + System.out.println(); + if (posTests != 0) System.out.println("=== "+posTests+" total positive test cases"); + if (negTests != 0) System.out.println("=== "+negTests+" total negative test cases"); + } } static List<Object> calledLog = new ArrayList<Object>(); @@ -144,18 +180,17 @@ static void assertCalled(String name, Object... args) { Object expected = logEntry(name, args); Object actual = calledLog.get(calledLog.size() - 1); - if (expected.equals(actual)) return; + if (expected.equals(actual) && verbosity < 9) return; System.out.println("assertCalled "+name+":"); System.out.println("expected: "+expected); System.out.println("actual: "+actual); System.out.println("ex. types: "+getClasses(expected)); System.out.println("act. types: "+getClasses(actual)); - assertEquals("previous method call types", expected, actual); assertEquals("previous method call", expected, actual); } static void printCalled(MethodHandle target, String name, Object... args) { - if (verbosity >= 2) - System.out.println("calling "+logEntry(name, args)+" on "+target); + if (verbosity >= 3) + System.out.println("calling MH="+target+" to "+name+Arrays.toString(args)); } static Object castToWrapper(Object value, Class<?> dst) { @@ -188,11 +223,40 @@ return null; } - static int nextArg; + static final int ONE_MILLION = (1000*1000), // first int value + TEN_BILLION = (10*1000*1000*1000), // scale factor to reach upper 32 bits + INITIAL_ARG_VAL = ONE_MILLION << 1; // <<1 makes space for sign bit; + static long nextArgVal; + static long nextArg(boolean moreBits) { + long val = nextArgVal++; + long sign = -(val & 1); // alternate signs + val >>= 1; + if (moreBits) + // Guarantee some bits in the high word. + // In any case keep the decimal representation simple-looking, + // with lots of zeroes, so as not to make the printed decimal + // strings unnecessarily noisy. + val += (val % ONE_MILLION) * TEN_BILLION; + return val ^ sign; + } + static int nextArg() { + // Produce a 32-bit result something like ONE_MILLION+(smallint). + // Example: 1_000_042. + return (int) nextArg(false); + } + static long nextArg(Class<?> kind) { + if (kind == long.class || kind == Long.class || + kind == double.class || kind == Double.class) + // produce a 64-bit result something like + // ((TEN_BILLION+1) * (ONE_MILLION+(smallint))) + // Example: 10_000_420_001_000_042. + return nextArg(true); + return (long) nextArg(); + } + static Object randomArg(Class<?> param) { - Object wrap = castToWrapperOrNull(nextArg, param); + Object wrap = castToWrapperOrNull(nextArg(param), param); if (wrap != null) { - nextArg++; return wrap; } // import sun.dyn.util.Wrapper; @@ -202,7 +266,7 @@ // if (wrap != Wrapper.OBJECT) // return wrap.wrap(nextArg++); if (param.isInterface() || param.isAssignableFrom(String.class)) - return "#"+(nextArg++); + return "#"+nextArg(); else try { return param.newInstance(); @@ -277,7 +341,7 @@ // Subject methods... static class Example implements IntExample { final String name; - public Example() { name = "Example#"+(nextArg++); } + public Example() { name = "Example#"+nextArg(); } protected Example(String name) { this.name = name; } protected Example(int x) { this(); called("protected <init>", this, x); } @Override public String toString() { return name; } @@ -301,43 +365,56 @@ public static Object s5(long x, int y) { return called("s5", x, y); } public static Object s6(int x, long y) { return called("s6", x, y); } public static Object s7(float x, double y) { return called("s7", x, y); } + + static final Lookup EXAMPLE = MethodHandles.lookup(); // for testing findSpecial } + static final Lookup EXAMPLE = Example.EXAMPLE; public static class PubExample extends Example { + public PubExample() { super("PubExample#"+nextArg()); } } static class SubExample extends Example { @Override public void v0() { called("Sub/v0", this); } @Override void pkg_v0() { called("Sub/pkg_v0", this); } private SubExample(int x) { called("<init>", this, x); } - public SubExample() { super("SubExample#"+(nextArg++)); } + public SubExample() { super("SubExample#"+nextArg()); } } public static interface IntExample { public void v0(); static class Impl implements IntExample { public void v0() { called("Int/v0", this); } final String name; - public Impl() { name = "Example#"+(nextArg++); } + public Impl() { name = "Impl#"+nextArg(); } + @Override public String toString() { return name; } } } static final Object[][][] ACCESS_CASES = { - { { false, PUBLIC }, { false, PACKAGE }, { false, PRIVATE } }, - { { false, PUBLIC }, { false, PACKAGE }, { true, PRIVATE } }, - { { false, PUBLIC }, { true, PACKAGE }, { true, PRIVATE } }, - { { true, PUBLIC }, { true, PACKAGE }, { true, PRIVATE } }, + { { false, PUBLIC }, { false, PACKAGE }, { false, PRIVATE }, { false, EXAMPLE } }, //[0]: all false + { { false, PUBLIC }, { false, PACKAGE }, { true, PRIVATE }, { true, EXAMPLE } }, //[1]: only PRIVATE + { { false, PUBLIC }, { true, PACKAGE }, { true, PRIVATE }, { true, EXAMPLE } }, //[2]: PUBLIC false + { { true, PUBLIC }, { true, PACKAGE }, { true, PRIVATE }, { true, EXAMPLE } }, //[3]: all true }; - static Object[][] accessCases(Class<?> defc, String name) { - if (name.contains("pri_")) { - return ACCESS_CASES[1]; // PRIVATE only - } else if (name.contains("pkg_")) { - return ACCESS_CASES[2]; // not PUBLIC + static Object[][] accessCases(Class<?> defc, String name, boolean isSpecial) { + Object[][] cases; + if (name.contains("pri_") || isSpecial) { + cases = ACCESS_CASES[1]; // PRIVATE only + } else if (name.contains("pkg_") || !Modifier.isPublic(defc.getModifiers())) { + cases = ACCESS_CASES[2]; // not PUBLIC } else { assertTrue(name.indexOf('_') < 0); boolean pubc = Modifier.isPublic(defc.getModifiers()); if (pubc) - return ACCESS_CASES[3]; // all access levels - return ACCESS_CASES[2]; // PACKAGE but not PUBLIC + cases = ACCESS_CASES[3]; // all access levels + else + cases = ACCESS_CASES[2]; // PACKAGE but not PUBLIC } + if (defc != Example.class && cases[cases.length-1][1] == EXAMPLE) + cases = Arrays.copyOfRange(cases, 0, cases.length-1); + return cases; + } + static Object[][] accessCases(Class<?> defc, String name) { + return accessCases(defc, name, false); } @Test @@ -374,12 +451,13 @@ MethodHandle target = null; RuntimeException noAccess = null; try { + if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type); target = lookup.findStatic(defc, name, type); } catch (NoAccessException ex) { noAccess = ex; } - if (verbosity >= 2) - System.out.println("findStatic "+lookup+": "+defc+"."+name+"/"+type+" => "+target + if (verbosity >= 3) + System.out.println("findStatic "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target +(noAccess == null ? "" : " !! "+noAccess)); if (positive && noAccess != null) throw noAccess; assertEquals(positive ? "positive test" : "negative test erroneously passed", positive, target != null); @@ -391,7 +469,8 @@ printCalled(target, name, args); target.invokeVarargs(args); assertCalled(name, args); - System.out.print(':'); + if (verbosity >= 1) + System.out.print(':'); } @Test @@ -436,21 +515,20 @@ MethodHandle target = null; RuntimeException noAccess = null; try { + if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type); target = lookup.findVirtual(defc, methodName, type); } catch (NoAccessException ex) { noAccess = ex; } - if (verbosity >= 2) - System.out.println("findVirtual "+lookup+": "+defc+"."+name+"/"+type+" => "+target + if (verbosity >= 3) + System.out.println("findVirtual "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target +(noAccess == null ? "" : " !! "+noAccess)); if (positive && noAccess != null) throw noAccess; assertEquals(positive ? "positive test" : "negative test erroneously passed", positive, target != null); if (!positive) return; // negative test failed as expected Class<?>[] paramsWithSelf = cat(array(Class[].class, (Class)defc), params); MethodType typeWithSelf = MethodType.methodType(ret, paramsWithSelf); - MethodType ttype = target.type(); - ttype = ttype.changeParameterType(0, defc); // FIXME: test this - assertEquals(typeWithSelf, ttype); + assertEquals(typeWithSelf, target.type()); assertTrue(target.toString().contains(methodName)); // rough check if (!DO_MORE_CALLS && lookup != PRIVATE) return; Object[] argsWithSelf = randomArgs(paramsWithSelf); @@ -458,52 +536,61 @@ printCalled(target, name, argsWithSelf); target.invokeVarargs(argsWithSelf); assertCalled(name, argsWithSelf); - System.out.print(':'); + if (verbosity >= 1) + System.out.print(':'); } @Test public void testFindSpecial() throws Throwable { if (CAN_SKIP_WORKING) return; startTest("findSpecial"); - testFindSpecial(Example.class, void.class, "v0"); - testFindSpecial(Example.class, void.class, "pkg_v0"); - testFindSpecial(false, PRIVATE, Example.class, void.class, "<init>", int.class); - testFindSpecial(false, PRIVATE, Example.class, void.class, "bogus"); + testFindSpecial(SubExample.class, Example.class, void.class, "v0"); + testFindSpecial(SubExample.class, Example.class, void.class, "pkg_v0"); + // Do some negative testing: + for (Lookup lookup : new Lookup[]{ PRIVATE, EXAMPLE, PACKAGE, PUBLIC }) { + testFindSpecial(false, lookup, Object.class, Example.class, void.class, "v0"); + testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "<init>", int.class); + testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "s0"); + testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "bogus"); + } } - void testFindSpecial(Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable { - testFindSpecial(true, PRIVATE, defc, ret, name, params); - testFindSpecial(false, PACKAGE, defc, ret, name, params); - testFindSpecial(false, PUBLIC, defc, ret, name, params); + void testFindSpecial(Class<?> specialCaller, + Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable { + testFindSpecial(true, EXAMPLE, specialCaller, defc, ret, name, params); + testFindSpecial(true, PRIVATE, specialCaller, defc, ret, name, params); + testFindSpecial(false, PACKAGE, specialCaller, defc, ret, name, params); + testFindSpecial(false, PUBLIC, specialCaller, defc, ret, name, params); } - void testFindSpecial(boolean positive, Lookup lookup, Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable { + void testFindSpecial(boolean positive, Lookup lookup, Class<?> specialCaller, + Class<?> defc, Class<?> ret, String name, Class<?>... params) throws Throwable { countTest(positive); MethodType type = MethodType.methodType(ret, params); MethodHandle target = null; RuntimeException noAccess = null; try { - target = lookup.findSpecial(defc, name, type, defc); + if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type); + target = lookup.findSpecial(defc, name, type, specialCaller); } catch (NoAccessException ex) { noAccess = ex; } - if (verbosity >= 2) - System.out.println("findSpecial "+defc+"."+name+"/"+type+" => "+target - +(noAccess == null ? "" : " !! "+noAccess)); + if (verbosity >= 3) + System.out.println("findSpecial from "+specialCaller.getName()+" to "+defc.getName()+"."+name+"/"+type+" => "+target + +(target == null ? "" : target.type()) + +(noAccess == null ? "" : " !! "+noAccess)); if (positive && noAccess != null) throw noAccess; assertEquals(positive ? "positive test" : "negative test erroneously passed", positive, target != null); if (!positive) return; // negative test failed as expected - Class<?>[] paramsWithSelf = cat(array(Class[].class, (Class)defc), params); + assertEquals(specialCaller, target.type().parameterType(0)); + assertEquals(type, target.type().dropParameterTypes(0,1)); + Class<?>[] paramsWithSelf = cat(array(Class[].class, (Class)specialCaller), params); MethodType typeWithSelf = MethodType.methodType(ret, paramsWithSelf); - MethodType ttype = target.type(); - ttype = ttype.changeParameterType(0, defc); // FIXME: test this - assertEquals(typeWithSelf, ttype); assertTrue(target.toString().contains(name)); // rough check - if (!DO_MORE_CALLS && lookup != PRIVATE) return; + if (!DO_MORE_CALLS && lookup != PRIVATE && lookup != EXAMPLE) return; Object[] args = randomArgs(paramsWithSelf); printCalled(target, name, args); target.invokeVarargs(args); assertCalled(name, args); - System.out.print(':'); } @Test @@ -538,11 +625,12 @@ MethodHandle target = null; RuntimeException noAccess = null; try { + if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type); target = lookup.bind(receiver, methodName, type); } catch (NoAccessException ex) { noAccess = ex; } - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("bind "+receiver+"."+name+"/"+type+" => "+target +(noAccess == null ? "" : " !! "+noAccess)); if (positive && noAccess != null) throw noAccess; @@ -554,7 +642,8 @@ target.invokeVarargs(args); Object[] argsWithReceiver = cat(array(Object[].class, receiver), args); assertCalled(name, argsWithReceiver); - System.out.print(':'); + if (verbosity >= 1) + System.out.print(':'); } @Test @@ -567,10 +656,10 @@ testUnreflect(Example.class, true, Object.class, "s1", Object.class); testUnreflect(Example.class, true, Object.class, "s2", int.class); - //testUnreflect(Example.class, true, Object.class, "s3", long.class); - //testUnreflect(Example.class, true, Object.class, "s4", int.class, int.class); - //testUnreflect(Example.class, true, Object.class, "s5", long.class, int.class); - //testUnreflect(Example.class, true, Object.class, "s6", int.class, long.class); + testUnreflect(Example.class, true, Object.class, "s3", long.class); + testUnreflect(Example.class, true, Object.class, "s4", int.class, int.class); + testUnreflect(Example.class, true, Object.class, "s5", long.class, int.class); + testUnreflect(Example.class, true, Object.class, "s6", int.class, long.class); testUnreflect(Example.class, false, void.class, "v0"); testUnreflect(Example.class, false, void.class, "pkg_v0"); @@ -584,10 +673,17 @@ void testUnreflect(Class<?> defc, boolean isStatic, Class<?> ret, String name, Class<?>... params) throws Throwable { for (Object[] ac : accessCases(defc, name)) { - testUnreflect((Boolean)ac[0], (Lookup)ac[1], defc, isStatic, ret, name, params); + testUnreflectMaybeSpecial(null, (Boolean)ac[0], (Lookup)ac[1], defc, (isStatic ? null : defc), ret, name, params); } } - void testUnreflect(boolean positive, Lookup lookup, Class<?> defc, boolean isStatic, Class<?> ret, String name, Class<?>... params) throws Throwable { + void testUnreflect(Class<?> defc, Class<?> rcvc, Class<?> ret, String name, Class<?>... params) throws Throwable { + for (Object[] ac : accessCases(defc, name)) { + testUnreflectMaybeSpecial(null, (Boolean)ac[0], (Lookup)ac[1], defc, rcvc, ret, name, params); + } + } + void testUnreflectMaybeSpecial(Class<?> specialCaller, + boolean positive, Lookup lookup, + Class<?> defc, Class<?> rcvc, Class<?> ret, String name, Class<?>... params) throws Throwable { countTest(positive); MethodType type = MethodType.methodType(ret, params); Method rmethod = null; @@ -598,43 +694,67 @@ } catch (NoSuchMethodException ex) { throw new NoAccessException(ex); } - assertEquals(isStatic, Modifier.isStatic(rmethod.getModifiers())); + boolean isStatic = (rcvc == null); + boolean isSpecial = (specialCaller != null); try { - target = lookup.unreflect(rmethod); + if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type); + if (isSpecial) + target = lookup.unreflectSpecial(rmethod, specialCaller); + else + target = lookup.unreflect(rmethod); } catch (NoAccessException ex) { noAccess = ex; } - if (verbosity >= 2) - System.out.println("unreflect "+defc+"."+name+"/"+type+" => "+target - +(noAccess == null ? "" : " !! "+noAccess)); + if (verbosity >= 3) + System.out.println("unreflect"+(isSpecial?"Special":"")+" "+defc.getName()+"."+name+"/"+type + +(!isSpecial ? "" : " specialCaller="+specialCaller) + +( isStatic ? "" : " receiver="+rcvc) + +" => "+target + +(noAccess == null ? "" : " !! "+noAccess)); if (positive && noAccess != null) throw noAccess; assertEquals(positive ? "positive test" : "negative test erroneously passed", positive, target != null); if (!positive) return; // negative test failed as expected + assertEquals(isStatic, Modifier.isStatic(rmethod.getModifiers())); Class<?>[] paramsMaybeWithSelf = params; if (!isStatic) { - paramsMaybeWithSelf = cat(array(Class[].class, (Class)defc), params); + paramsMaybeWithSelf = cat(array(Class[].class, (Class)rcvc), params); } MethodType typeMaybeWithSelf = MethodType.methodType(ret, paramsMaybeWithSelf); - MethodType ttype = target.type(); - if (!isStatic) - ttype = ttype.changeParameterType(0, defc); // FIXME: test this - assertEquals(typeMaybeWithSelf, ttype); + if (isStatic) { + assertEquals(typeMaybeWithSelf, target.type()); + } else { + if (isSpecial) + assertEquals(specialCaller, target.type().parameterType(0)); + else + assertEquals(defc, target.type().parameterType(0)); + assertEquals(typeMaybeWithSelf, target.type().changeParameterType(0, rcvc)); + } Object[] argsMaybeWithSelf = randomArgs(paramsMaybeWithSelf); printCalled(target, name, argsMaybeWithSelf); target.invokeVarargs(argsMaybeWithSelf); assertCalled(name, argsMaybeWithSelf); - System.out.print(':'); + if (verbosity >= 1) + System.out.print(':'); + } + + void testUnreflectSpecial(Class<?> defc, Class<?> rcvc, Class<?> ret, String name, Class<?>... params) throws Throwable { + for (Object[] ac : accessCases(defc, name, true)) { + Class<?> specialCaller = rcvc; + testUnreflectMaybeSpecial(specialCaller, (Boolean)ac[0], (Lookup)ac[1], defc, rcvc, ret, name, params); + } } - @Test @Ignore("unimplemented") + @Test public void testUnreflectSpecial() throws Throwable { - Lookup lookup = PRIVATE; // FIXME: test more lookups than this one + if (CAN_SKIP_WORKING) return; startTest("unreflectSpecial"); - Method m = null; - MethodHandle expResult = null; - MethodHandle result = lookup.unreflectSpecial(m, Example.class); - assertEquals(expResult, result); - fail("The test case is a prototype."); + testUnreflectSpecial(Example.class, Example.class, void.class, "v0"); + testUnreflectSpecial(Example.class, SubExample.class, void.class, "v0"); + testUnreflectSpecial(Example.class, Example.class, void.class, "pkg_v0"); + testUnreflectSpecial(Example.class, SubExample.class, void.class, "pkg_v0"); + testUnreflectSpecial(Example.class, Example.class, Object.class, "v2", int.class, int.class); + testUnreflectSpecial(Example.class, SubExample.class, Object.class, "v2", int.class, int.class); + testUnreflectMaybeSpecial(Example.class, false, PRIVATE, Example.class, Example.class, void.class, "s0"); } public static class HasFields { @@ -704,28 +824,52 @@ } } + static final int TEST_UNREFLECT = 1, TEST_FIND_FIELD = 2, TEST_FIND_STATIC_FIELD = 3; + static boolean testModeMatches(int testMode, boolean isStatic) { + switch (testMode) { + case TEST_FIND_STATIC_FIELD: return isStatic; + case TEST_FIND_FIELD: return !isStatic; + default: return true; // unreflect matches both + } + } + @Test public void testUnreflectGetter() throws Throwable { + startTest("unreflectGetter"); + testGetter(TEST_UNREFLECT); + } + @Test + public void testFindGetter() throws Throwable { + startTest("findGetter"); + testGetter(TEST_FIND_FIELD); + } + @Test + public void testFindStaticGetter() throws Throwable { + startTest("findStaticGetter"); + testGetter(TEST_FIND_STATIC_FIELD); + } + public void testGetter(int testMode) throws Throwable { Lookup lookup = PRIVATE; // FIXME: test more lookups than this one - startTest("unreflectGetter"); for (Object[] c : HasFields.CASES) { Field f = (Field)c[0]; Object value = c[1]; Class<?> type = f.getType(); - if (type.isPrimitive() && type != int.class) - continue; //FIXME - testUnreflectGetter(lookup, f, type, value); + testGetter(lookup, f, type, value, testMode); } } - public void testUnreflectGetter(MethodHandles.Lookup lookup, - Field f, Class<?> type, Object value) throws Throwable { + public void testGetter(MethodHandles.Lookup lookup, + Field f, Class<?> type, Object value, int testMode) throws Throwable { + boolean isStatic = Modifier.isStatic(f.getModifiers()); + Class<?> fclass = f.getDeclaringClass(); + String fname = f.getName(); + Class<?> ftype = f.getType(); + if (!testModeMatches(testMode, isStatic)) return; countTest(true); - boolean isStatic = Modifier.isStatic(f.getModifiers()); MethodType expType = MethodType.methodType(type, HasFields.class); if (isStatic) expType = expType.dropParameterTypes(0, 1); MethodHandle mh = lookup.unreflectGetter(f); assertSame(mh.type(), expType); - assertEquals(mh.toString(), f.getName()); + assertEquals(mh.toString(), fname); HasFields fields = new HasFields(); Object sawValue; Class<?> rtype = type; @@ -735,14 +879,14 @@ for (int i = 0; i <= 1; i++) { if (isStatic) { if (type == int.class) - sawValue = mh.<int>invoke(); // do these exactly + sawValue = mh.<int>invokeExact(); // do these exactly else - sawValue = mh.invoke(); + sawValue = mh.invokeExact(); } else { if (type == int.class) - sawValue = mh.<int>invoke((Object) fields); + sawValue = mh.<int>invokeExact((Object) fields); else - sawValue = mh.invoke((Object) fields); + sawValue = mh.invokeExact((Object) fields); } assertEquals(sawValue, expValue); Object random = randomArg(type); @@ -755,26 +899,49 @@ @Test public void testUnreflectSetter() throws Throwable { + startTest("unreflectSetter"); + testSetter(TEST_UNREFLECT); + } + @Test + public void testFindSetter() throws Throwable { + startTest("findSetter"); + testSetter(TEST_FIND_FIELD); + } + @Test + public void testFindStaticSetter() throws Throwable { + startTest("findStaticSetter"); + testSetter(TEST_FIND_STATIC_FIELD); + } + public void testSetter(int testMode) throws Throwable { Lookup lookup = PRIVATE; // FIXME: test more lookups than this one startTest("unreflectSetter"); for (Object[] c : HasFields.CASES) { Field f = (Field)c[0]; Object value = c[1]; Class<?> type = f.getType(); - if (type.isPrimitive() && type != int.class) - continue; //FIXME - testUnreflectSetter(lookup, f, type, value); + testSetter(lookup, f, type, value, testMode); } } - public void testUnreflectSetter(MethodHandles.Lookup lookup, - Field f, Class<?> type, Object value) throws Throwable { + public void testSetter(MethodHandles.Lookup lookup, + Field f, Class<?> type, Object value, int testMode) throws Throwable { + boolean isStatic = Modifier.isStatic(f.getModifiers()); + Class<?> fclass = f.getDeclaringClass(); + String fname = f.getName(); + Class<?> ftype = f.getType(); + if (!testModeMatches(testMode, isStatic)) return; countTest(true); - boolean isStatic = Modifier.isStatic(f.getModifiers()); MethodType expType = MethodType.methodType(void.class, HasFields.class, type); if (isStatic) expType = expType.dropParameterTypes(0, 1); - MethodHandle mh = lookup.unreflectSetter(f); + MethodHandle mh; + if (testMode == TEST_UNREFLECT) + mh = lookup.unreflectSetter(f); + else if (testMode == TEST_FIND_FIELD) + mh = lookup.findSetter(fclass, fname, ftype); + else if (testMode == TEST_FIND_STATIC_FIELD) + mh = lookup.findStaticSetter(fclass, fname, ftype); + else throw new InternalError(); assertSame(mh.type(), expType); - assertEquals(mh.toString(), f.getName()); + assertEquals(mh.toString(), fname); HasFields fields = new HasFields(); Object sawValue; Class<?> vtype = type; @@ -786,14 +953,14 @@ Object putValue = randomArg(type); if (isStatic) { if (type == int.class) - mh.<void>invoke((int)(Integer)putValue); // do these exactly + mh.<void>invokeExact((int)(Integer)putValue); // do these exactly else - mh.<void>invoke(putValue); + mh.<void>invokeExact(putValue); } else { if (type == int.class) - mh.<void>invoke((Object) fields, (int)(Integer)putValue); + mh.<void>invokeExact((Object) fields, (int)(Integer)putValue); else - mh.<void>invoke((Object) fields, putValue); + mh.<void>invokeExact((Object) fields, putValue); } assertEquals(f.get(fields), putValue); } @@ -803,25 +970,31 @@ @Test public void testArrayElementGetter() throws Throwable { startTest("arrayElementGetter"); - testArrayElementGetterSetter(new Object[10], false); - testArrayElementGetterSetter(new String[10], false); - testArrayElementGetterSetter(new int[10], false); - // FIXME: Do the other primitive types. - //testArrayElementGetterSetter(new float[10], false); + testArrayElementGetterSetter(false); } @Test public void testArrayElementSetter() throws Throwable { startTest("arrayElementSetter"); - testArrayElementGetterSetter(new Object[10], true); - testArrayElementGetterSetter(new String[10], true); - testArrayElementGetterSetter(new int[10], true); - // FIXME: Do the other primitive types. - //testArrayElementGetterSetter(new float[10], true); + testArrayElementGetterSetter(true); + } + + public void testArrayElementGetterSetter(boolean testSetter) throws Throwable { + testArrayElementGetterSetter(new Object[10], testSetter); + testArrayElementGetterSetter(new String[10], testSetter); + testArrayElementGetterSetter(new boolean[10], testSetter); + testArrayElementGetterSetter(new byte[10], testSetter); + testArrayElementGetterSetter(new char[10], testSetter); + testArrayElementGetterSetter(new short[10], testSetter); + testArrayElementGetterSetter(new int[10], testSetter); + testArrayElementGetterSetter(new float[10], testSetter); + testArrayElementGetterSetter(new long[10], testSetter); + testArrayElementGetterSetter(new double[10], testSetter); } public void testArrayElementGetterSetter(Object array, boolean testSetter) throws Throwable { countTest(true); + if (verbosity >= 2) System.out.println("array type = "+array.getClass().getComponentType().getName()+"["+Array.getLength(array)+"]"); Class<?> arrayType = array.getClass(); Class<?> elemType = arrayType.getComponentType(); MethodType expType = !testSetter @@ -831,7 +1004,19 @@ ? MethodHandles.arrayElementGetter(arrayType) : MethodHandles.arrayElementSetter(arrayType); assertSame(mh.type(), expType); - //assertEquals(mh.toString(), f.getName()); + if (elemType != int.class && elemType != boolean.class) { + MethodType gtype; + if (true) { // FIXME: remove this path (and remove <void> below in the mh.invokes) + gtype = mh.type().changeParameterType(0, Object.class); + if (testSetter) + gtype = gtype.changeParameterType(2, Object.class); + else + gtype = gtype.changeReturnType(Object.class); + } else + // FIXME: This simpler path hits a bug in convertArguments => ToGeneric + gtype = mh.type().generic().changeParameterType(1, int.class); + mh = MethodHandles.convertArguments(mh, gtype); + } Object sawValue, expValue; List<Object> model = array2list(array); int length = Array.getLength(array); @@ -841,22 +1026,31 @@ model.set(i, random); if (testSetter) { if (elemType == int.class) - mh.<void>invoke((int[]) array, i, (int)(Integer)random); + mh.<void>invokeExact((int[]) array, i, (int)(Integer)random); + else if (elemType == boolean.class) + mh.<void>invokeExact((boolean[]) array, i, (boolean)(Boolean)random); else - mh.invokeGeneric(array, i, random); + mh.<void>invokeExact(array, i, random); assertEquals(model, array2list(array)); } else { Array.set(array, i, random); - + } + if (verbosity >= 5) { + List<Object> array2list = array2list(array); + System.out.println("a["+i+"]="+random+" => "+array2list); + if (!array2list.equals(model)) + System.out.println("*** != "+model); } // observe array element sawValue = Array.get(array, i); if (!testSetter) { expValue = sawValue; if (elemType == int.class) - sawValue = mh.<int>invoke((int[]) array, i); + sawValue = mh.<int>invokeExact((int[]) array, i); + else if (elemType == boolean.class) + sawValue = mh.<boolean>invokeExact((boolean[]) array, i); else - sawValue = mh.invokeGeneric(array, i); + sawValue = mh.invokeExact(array, i); assertEquals(sawValue, expValue); assertEquals(model, array2list(array)); } @@ -906,6 +1100,8 @@ testConvert(Callee.ofType(1), null, "id", String.class); testConvert(Callee.ofType(1), null, "id", Integer.class); testConvert(Callee.ofType(1), null, "id", short.class); + testConvert(Callee.ofType(1), null, "id", char.class); + testConvert(Callee.ofType(1), null, "id", byte.class); } void testConvert(MethodHandle id, Class<?> rtype, String name, Class<?>... params) throws Throwable { @@ -943,7 +1139,7 @@ } catch (RuntimeException ex) { error = ex; } - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("convert "+id+ " to "+newType+" => "+target +(error == null ? "" : " !! "+error)); if (positive && error != null) throw error; @@ -954,7 +1150,8 @@ Object result = target.invokeVarargs(args); assertCalled(name, convArgs); assertEquals(convResult, result); - System.out.print(':'); + if (verbosity >= 1) + System.out.print(':'); } @Test @@ -966,7 +1163,7 @@ //testPermuteArguments(4, Integer.class, 1, int.class, 6); } public void testPermuteArguments(int max, Class<?> type1, int t2c, Class<?> type2, int dilution) throws Throwable { - if (verbosity >= 1) + if (verbosity >= 2) System.out.println("permuteArguments "+max+"*"+type1.getName() +(t2c==0?"":"/"+t2c+"*"+type2.getName()) +(dilution > 0 ? " with dilution "+dilution : "")); @@ -1054,7 +1251,7 @@ } int inargs = args.length, outargs = reorder.length; assert(inargs == types.length); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("permuteArguments "+Arrays.toString(reorder)); Object[] permArgs = new Object[outargs]; Class<?>[] permTypes = new Class<?>[outargs]; @@ -1062,7 +1259,7 @@ permArgs[i] = args[reorder[i]]; permTypes[i] = types[reorder[i]]; } - if (verbosity >= 3) { + if (verbosity >= 4) { System.out.println("in args: "+Arrays.asList(args)); System.out.println("out args: "+Arrays.asList(permArgs)); System.out.println("in types: "+Arrays.asList(types)); @@ -1083,13 +1280,14 @@ if (CAN_SKIP_WORKING) return; startTest("spreadArguments"); for (Class<?> argType : new Class[]{Object.class, Integer.class, int.class}) { - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("spreadArguments "+argType); + // FIXME: enable _adapter_spread_args and fix Fail_2 for (int nargs = 0; nargs < 10; nargs++) { if (argType == int.class && nargs >= 6) continue; // FIXME Fail_1 for (int pos = 0; pos < nargs; pos++) { if (argType == int.class && pos > 0) continue; // FIXME Fail_3 - testSpreadArguments(argType, pos, nargs); + testSpreadArguments(argType, pos, nargs); } } } @@ -1098,7 +1296,7 @@ countTest(); MethodHandle target = ValueConversions.varargsArray(nargs); MethodHandle target2 = changeArgTypes(target, argType); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("spread into "+target2+" ["+pos+".."+nargs+"]"); Object[] args = randomArgs(target2.type().parameterArray()); // make sure the target does what we think it does: @@ -1107,15 +1305,15 @@ assertArrayEquals(args, check); switch (nargs) { case 0: - check = target.<Object[]>invoke(); + check = target.<Object[]>invokeExact(); assertArrayEquals(args, check); break; case 1: - check = target.<Object[]>invoke(args[0]); + check = target.<Object[]>invokeExact(args[0]); assertArrayEquals(args, check); break; case 2: - check = target.<Object[]>invoke(args[0], args[1]); + check = target.<Object[]>invokeExact(args[0], args[1]); assertArrayEquals(args, check); break; } @@ -1129,7 +1327,7 @@ MethodHandle result = MethodHandles.spreadArguments(target2, newType); Object[] returnValue; if (pos == 0) { - returnValue = (Object[]) result.invoke(args); + returnValue = (Object[]) result.invokeExact(args); } else { Object[] args1 = Arrays.copyOfRange(args, 0, pos+1); args1[pos] = Arrays.copyOfRange(args, pos, args.length); @@ -1143,7 +1341,7 @@ if (CAN_SKIP_WORKING) return; startTest("collectArguments"); for (Class<?> argType : new Class[]{Object.class, Integer.class, int.class}) { - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("collectArguments "+argType); for (int nargs = 0; nargs < 10; nargs++) { for (int pos = 0; pos < nargs; pos++) { @@ -1167,7 +1365,7 @@ MethodHandle target = ValueConversions.varargsArray(pos+1); target = changeArgTypes(target, 0, pos, argType); target = changeArgTypes(target, pos, pos+1, Object[].class); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("collect from "+Arrays.asList(args)+" ["+pos+".."+nargs+"]"); MethodHandle result = MethodHandles.collectArguments(target, newType); Object[] returnValue = (Object[]) result.invokeVarargs(args); @@ -1198,14 +1396,14 @@ List<Object> resList = Arrays.asList(args); List<Object> argsToPass = new ArrayList<Object>(resList); List<Object> argsToInsert = argsToPass.subList(pos, pos + ins); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("insert: "+argsToInsert+" into "+target); MethodHandle target2 = MethodHandles.insertArguments(target, pos, (Object[]) argsToInsert.toArray()); argsToInsert.clear(); // remove from argsToInsert Object res2 = target2.invokeVarargs(argsToPass); Object res2List = Arrays.asList((Object[])res2); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("result: "+res2List); //if (!resList.equals(res2List)) // System.out.println("*** fail at n/p/i = "+nargs+"/"+pos+"/"+ins+": "+resList+" => "+res2List); @@ -1229,17 +1427,17 @@ MethodHandle filter = ValueConversions.varargsList(1); filter = MethodHandles.convertArguments(filter, filter.type().generic()); Object[] argsToPass = randomArgs(nargs, Object.class); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("filter "+target+" at "+pos+" with "+filter); MethodHandle[] filters = new MethodHandle[pos*2+1]; filters[pos] = filter; MethodHandle target2 = MethodHandles.filterArguments(target, filters); // Simulate expected effect of filter on arglist: Object[] filteredArgs = argsToPass.clone(); - filteredArgs[pos] = filter.invoke(filteredArgs[pos]); + filteredArgs[pos] = filter.invokeExact(filteredArgs[pos]); List<Object> expected = Arrays.asList(filteredArgs); Object result = target2.invokeVarargs(argsToPass); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("result: "+result); if (!expected.equals(result)) System.out.println("*** fail at n/p = "+nargs+"/"+pos+": "+argsToPass+" => "+result); @@ -1265,18 +1463,18 @@ MethodHandle target = ValueConversions.varargsList(1 + nargs); MethodHandle combine = ValueConversions.varargsList(fold); List<Object> argsToPass = Arrays.asList(randomArgs(nargs, Object.class)); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("fold "+target+" with "+combine); MethodHandle target2 = MethodHandles.foldArguments(target, combine); // Simulate expected effect of combiner on arglist: List<Object> expected = new ArrayList<Object>(argsToPass); List<Object> argsToFold = expected.subList(pos, pos + fold); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("fold: "+argsToFold+" into "+target2); Object foldedArgs = combine.invokeVarargs(argsToFold); argsToFold.add(0, foldedArgs); Object result = target2.invokeVarargs(argsToPass); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("result: "+result); if (!expected.equals(result)) System.out.println("*** fail at n/p/f = "+nargs+"/"+pos+"/"+fold+": "+argsToPass+" => "+result); @@ -1343,7 +1541,7 @@ } public void testInvokers(MethodType type) throws Throwable { - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("test invokers for "+type); int nargs = type.parameterCount(); boolean testRetCode = type.returnType() != void.class; @@ -1373,16 +1571,16 @@ calledLog.clear(); switch (nargs) { case 0: - result = inv.invoke(target); + result = inv.invokeExact(target); break; case 1: - result = inv.invoke(target, args[0]); + result = inv.invokeExact(target, args[0]); break; case 2: - result = inv.invoke(target, args[0], args[1]); + result = inv.invokeExact(target, args[0], args[1]); break; case 3: - result = inv.invoke(target, args[0], args[1], args[2]); + result = inv.invokeExact(target, args[0], args[1], args[2]); break; } if (testRetCode) assertEquals(code, result); @@ -1395,14 +1593,14 @@ // varargs invoker #0 calledLog.clear(); inv = MethodHandles.varargsInvoker(type, 0); - result = inv.invoke(target, args); + result = inv.invokeExact(target, args); if (testRetCode) assertEquals(code, result); assertCalled("invokee", args); if (nargs >= 1) { // varargs invoker #1 calledLog.clear(); inv = MethodHandles.varargsInvoker(type, 1); - result = inv.invoke(target, args[0], Arrays.copyOfRange(args, 1, nargs)); + result = inv.invokeExact(target, args[0], Arrays.copyOfRange(args, 1, nargs)); if (testRetCode) assertEquals(code, result); assertCalled("invokee", args); } @@ -1410,7 +1608,7 @@ // varargs invoker #2 calledLog.clear(); inv = MethodHandles.varargsInvoker(type, 2); - result = inv.invoke(target, args[0], args[1], Arrays.copyOfRange(args, 2, nargs)); + result = inv.invokeExact(target, args[0], args[1], Arrays.copyOfRange(args, 2, nargs)); if (testRetCode) assertEquals(code, result); assertCalled("invokee", args); } @@ -1418,7 +1616,7 @@ // varargs invoker #3 calledLog.clear(); inv = MethodHandles.varargsInvoker(type, 3); - result = inv.invoke(target, args[0], args[1], args[2], Arrays.copyOfRange(args, 3, nargs)); + result = inv.invokeExact(target, args[0], args[1], args[2], Arrays.copyOfRange(args, 3, nargs)); if (testRetCode) assertEquals(code, result); assertCalled("invokee", args); } @@ -1523,7 +1721,7 @@ default: equals = argList[0].equals(argList[1]); break; } String willCall = (equals ? "targetIfEquals" : "fallbackIfNotEquals"); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println(logEntry(willCall, argList)); Object result = mh.invokeVarargs(argList); assertCalled(willCall, argList); @@ -1552,7 +1750,7 @@ void testCatchException(Class<?> returnType, Throwable thrown, boolean throwIt, int nargs) throws Throwable { countTest(); - if (verbosity >= 2) + if (verbosity >= 3) System.out.println("catchException rt="+returnType+" throw="+throwIt+" nargs="+nargs); Class<? extends Throwable> exType = thrown.getClass(); MethodHandle throwOrReturn @@ -1594,9 +1792,10 @@ //System.out.println("throwing with "+target+" : "+thrown); MethodType expectedType = MethodType.methodType(returnType, exType); assertEquals(expectedType, target.type()); + target = MethodHandles.convertArguments(target, target.type().generic()); Throwable caught = null; try { - Object res = target.invokeGeneric(thrown); + Object res = target.invokeExact((Object) thrown); fail("got "+res+" instead of throwing "+thrown); } catch (Throwable ex) { if (ex != thrown) { @@ -1647,7 +1846,7 @@ void testCastFailure(String mode, int okCount) throws Throwable { countTest(false); - if (verbosity > 1) System.out.println("mode="+mode); + if (verbosity > 2) System.out.println("mode="+mode); Surprise boo = new Surprise(); MethodHandle identity = Surprise.REF_IDENTITY, surprise = boo; if (mode.endsWith("/return")) { @@ -1680,22 +1879,22 @@ surprise = MethodHandles.convertArguments(surprise, MethodType.genericMethodType(1)); Object x = 42; for (int i = 0; i < okCount; i++) { - Object y = identity.invoke(x); + Object y = identity.invokeExact(x); assertEquals(x, y); - Object z = surprise.invoke(x); + Object z = surprise.invokeExact(x); assertEquals(x, z); } boo.boo("Boo!"); - Object y = identity.invoke(x); + Object y = identity.invokeExact(x); assertEquals(x, y); try { - Object z = surprise.invoke(x); + Object z = surprise.invokeExact(x); System.out.println("Failed to throw; got z="+z); assertTrue(false); } catch (Exception ex) { - if (verbosity > 1) + if (verbosity > 2) System.out.println("caught "+ex); - if (verbosity > 2) + if (verbosity > 3) ex.printStackTrace(); assertTrue(ex instanceof ClassCastException // FIXME: accept only one of the two for any given unit test @@ -1704,6 +1903,39 @@ } } + static Example userMethod(Object o, String s, int i) { + called("userMethod", o, s, i); + return null; + } + + @Test + public void testUserClassInSignature() throws Throwable { + if (CAN_SKIP_WORKING) return; + startTest("testUserClassInSignature"); + Lookup lookup = MethodHandles.lookup(); + String name; MethodType mt; MethodHandle mh; + Object[] args; + + // Try a static method. + name = "userMethod"; + mt = MethodType.methodType(Example.class, Object.class, String.class, int.class); + mh = lookup.findStatic(lookup.lookupClass(), name, mt); + assertEquals(mt, mh.type()); + assertEquals(Example.class, mh.type().returnType()); + args = randomArgs(mh.type().parameterArray()); + mh.invokeVarargs(args); + assertCalled(name, args); + + // Try a virtual method. + name = "v2"; + mt = MethodType.methodType(Object.class, Object.class, int.class); + mh = lookup.findVirtual(Example.class, name, mt); + assertEquals(mt, mh.type().dropParameterTypes(0,1)); + assertTrue(mh.type().parameterList().contains(Example.class)); + args = randomArgs(mh.type().parameterArray()); + mh.invokeVarargs(args); + assertCalled(name, args); + } } // Local abbreviated copy of sun.dyn.util.ValueConversions class ValueConversions { @@ -1766,7 +1998,7 @@ if (nargs < ARRAYS.length) return ARRAYS[nargs]; // else need to spin bytecode or do something else fancy - throw new UnsupportedOperationException("NYI"); + throw new UnsupportedOperationException("NYI: cannot form a varargs array of length "+nargs); } private static final List<Object> NO_ARGS_LIST = Arrays.asList(NO_ARGS_ARRAY);
--- a/jdk/test/java/io/BufferedReader/BigMark.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/BufferedReader/BigMark.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,6 +25,8 @@ @summary BufferedReader should throw an OutOfMemoryError when the read-ahead limit is very large @bug 6350733 + @build BigMark + @run main/othervm BigMark */ import java.io.*;
--- a/jdk/test/java/io/BufferedReader/ReadLineSync.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/BufferedReader/ReadLineSync.java Thu Jul 08 11:28:01 2010 -0700 @@ -46,16 +46,20 @@ BufferedReader reader = new BufferedReader( new FileReader(f)); - int threadCount = 2; + try { + int threadCount = 2; - ExecutorService es = Executors.newFixedThreadPool(threadCount); + ExecutorService es = Executors.newFixedThreadPool(threadCount); - for (int i=0; i < threadCount; i++) - es.execute(new BufferedReaderConsumer(reader)); + for (int i=0; i < threadCount; i++) + es.execute(new BufferedReaderConsumer(reader)); - // Wait for the tasks to complete - es.shutdown(); - while (!es.awaitTermination(60, TimeUnit.SECONDS)); + // Wait for the tasks to complete + es.shutdown(); + while (!es.awaitTermination(60, TimeUnit.SECONDS)); + } finally { + reader.close(); + } } static class BufferedReaderConsumer extends Thread {
--- a/jdk/test/java/io/DataInputStream/OpsAfterClose.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/DataInputStream/OpsAfterClose.java Thu Jul 08 11:28:01 2010 -0700 @@ -244,13 +244,19 @@ f.deleteOnExit(); FileInputStream fis = new FileInputStream(f); - - DataInputStream dis = new DataInputStream( - new FileInputStream(f)); - if (testDataInputStream(dis)) { - failed = true; + try { + DataInputStream dis = new DataInputStream( + new FileInputStream(f)); + try { + if (testDataInputStream(dis)) { + failed = true; + } + } finally { + dis.close(); + } + } finally { + fis.close(); } - } private static boolean testDataInputStream(DataInputStream is)
--- a/jdk/test/java/io/DataInputStream/ReadFully.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/DataInputStream/ReadFully.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,6 +43,7 @@ } catch (IndexOutOfBoundsException ie) { caughtException = true; } finally { + dis.close(); if (!caughtException) throw new RuntimeException("Test failed"); }
--- a/jdk/test/java/io/File/DeleteOnExit.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/File/DeleteOnExit.java Thu Jul 08 11:28:01 2010 -0700 @@ -48,7 +48,9 @@ public static void main (String args[]) throws Exception{ if (args.length == 0) { - Runtime.getRuntime().exec(java + " DeleteOnExit -test").waitFor(); + String cmd = java + " -classpath " + System.getProperty("test.classes") + + " DeleteOnExit -test"; + Runtime.getRuntime().exec(cmd).waitFor(); if (file1.exists() || file2.exists() || file3.exists() || dir.exists() || file4.exists() || file5.exists() || file6.exists() || file7.exists()) {
--- a/jdk/test/java/io/File/DeleteOnExitNPE.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/File/DeleteOnExitNPE.java Thu Jul 08 11:28:01 2010 -0700 @@ -45,7 +45,8 @@ public static void runTest() throws Exception { String cmd = System.getProperty("java.home") + File.separator + - "bin" + File.separator + "java"; + "bin" + File.separator + "java" + + " -classpath " + System.getProperty("test.classes"); Process process = Runtime.getRuntime().exec(cmd + " DeleteOnExitNPE -test"); BufferedReader isReader = new BufferedReader(new InputStreamReader(process.getInputStream())); BufferedReader esReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
--- a/jdk/test/java/io/File/IsHidden.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/File/IsHidden.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,7 +27,7 @@ */ import java.io.*; - +import java.nio.file.attribute.DosFileAttributeView; public class IsHidden { @@ -41,15 +41,20 @@ System.err.println(path + " ==> " + x); } + private static void setHidden(File f, boolean value) throws IOException { + f.toPath().getFileAttributeView(DosFileAttributeView.class).setHidden(value); + } + private static void testWin32() throws Exception { File f = new File(dir, "test"); f.deleteOnExit(); f.createNewFile(); - String name = f.getCanonicalPath(); - Process p = Runtime.getRuntime().exec("cmd.exe /c attrib +H " + name); - p.waitFor(); - ck(name, true); - + setHidden(f, true); + try { + ck(f.getPath(), true); + } finally { + setHidden(f, false); + } ck(".foo", false); ck("foo", false); }
--- a/jdk/test/java/io/FileInputStream/LeadingSlash.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/FileInputStream/LeadingSlash.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ File file = null; try { file = File.createTempFile("bug", "4487368"); - new FileInputStream("\\" + file.getPath()); - new FileOutputStream("\\" + file.getPath()); + new FileInputStream("\\" + file.getPath()).close(); + new FileOutputStream("\\" + file.getPath()).close(); } finally { if (file != null) file.delete();
--- a/jdk/test/java/io/InputStream/OpsAfterClose.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/InputStream/OpsAfterClose.java Thu Jul 08 11:28:01 2010 -0700 @@ -125,23 +125,35 @@ f.deleteOnExit(); FileInputStream fis = new FileInputStream(f); - if (testInputStream(fis)) { - failed = true; - } - if (testFileInputStream(fis)) { - failed = true; + try { + if (testInputStream(fis)) { + failed = true; + } + if (testFileInputStream(fis)) { + failed = true; + } + } finally { + fis.close(); } BufferedInputStream bs = new BufferedInputStream( new FileInputStream(f)); - if (testInputStream(bs)) { - failed = true; + try { + if (testInputStream(bs)) { + failed = true; + } + } finally { + bs.close(); } DataInputStream dis = new DataInputStream( new FileInputStream(f)); - if (testInputStream(dis)) { - failed = true; + try { + if (testInputStream(dis)) { + failed = true; + } + } finally { + dis.close(); } PushbackInputStream pbis = new PushbackInputStream(
--- a/jdk/test/java/io/InputStream/ReadParams.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/InputStream/ReadParams.java Thu Jul 08 11:28:01 2010 -0700 @@ -137,6 +137,7 @@ oos.writeInt(12345); oos.writeObject("Today"); oos.writeObject(new Integer(32)); + oos.close(); ObjectInputStream ois = new ObjectInputStream(new FileInputStream(fn)); doTest(ois); doTest1(ois);
--- a/jdk/test/java/io/InputStreamReader/GrowAfterEOF.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/InputStreamReader/GrowAfterEOF.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,29 +33,36 @@ public static void main(String[] args) throws Exception { File input = new File(".", "TestEOFInput.txt"); RandomAccessFile rf = new RandomAccessFile(input, "rw"); - BufferedReader r = new BufferedReader - (new InputStreamReader(new FileInputStream(input))); + try { + BufferedReader r = new BufferedReader + (new InputStreamReader(new FileInputStream(input))); + try { + // write something + rf.writeBytes("a line"); - // write something - rf.writeBytes("a line"); + // read till the end of file + while (r.readLine() != null); - // read till the end of file - while (r.readLine() != null); + // append to the end of the file + rf.seek(rf.length()); + rf.writeBytes("new line"); - // append to the end of the file - rf.seek(rf.length()); - rf.writeBytes("new line"); - - // now try to read again - boolean readMore = false; - while (r.readLine() != null) { - readMore = true; - } - if (!readMore) { - input.delete(); - throw new Exception("Failed test: unable to read!"); - } else { - input.delete(); + // now try to read again + boolean readMore = false; + while (r.readLine() != null) { + readMore = true; + } + if (!readMore) { + input.delete(); + throw new Exception("Failed test: unable to read!"); + } else { + input.delete(); + } + } finally { + r.close(); + } + } finally { + rf.close(); } } }
--- a/jdk/test/java/io/ObjectInputStream/ResolveProxyClass.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/ObjectInputStream/ResolveProxyClass.java Thu Jul 08 11:28:01 2010 -0700 @@ -79,7 +79,7 @@ * code, and it should be the first loader on the stack when * ObjectInputStream.resolveProxyClass gets executed. */ - ClassLoader expectedLoader = ClassLoader.getSystemClassLoader(); + ClassLoader expectedLoader = ResolveProxyClass.class.getClassLoader(); TestObjectInputStream in = new TestObjectInputStream(); Class proxyClass = in.resolveProxyClass(
--- a/jdk/test/java/io/RandomAccessFile/EOF.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/RandomAccessFile/EOF.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,12 +35,16 @@ int n; String dir = System.getProperty("test.src", "."); RandomAccessFile raf = new RandomAccessFile(new File(dir, "EOF.java"), "r"); - for (;;) { - n = raf.read(buf, 0, buf.length); - if (n <= 0) break; + try { + for (;;) { + n = raf.read(buf, 0, buf.length); + if (n <= 0) break; + } + if (n != -1) + throw new RuntimeException("Expected -1 for EOF, got " + n); + } finally { + raf.close(); } - if (n != -1) - throw new RuntimeException("Expected -1 for EOF, got " + n); } }
--- a/jdk/test/java/io/RandomAccessFile/ParameterCheck.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/RandomAccessFile/ParameterCheck.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,6 +44,7 @@ private static void doTest(String method) throws Exception { File fn = new File("x.ParameterCheck"); + RandomAccessFile raf = null; try { byte b[] = new byte[32]; @@ -55,7 +56,7 @@ fout.write(i); } fout.close(); - RandomAccessFile raf = new RandomAccessFile(fn , "rw"); + raf = new RandomAccessFile(fn , "rw"); System.err.println("-----------------------------" + "-----------------------------"); @@ -125,6 +126,8 @@ System.err.println("-----------------------------" + "-----------------------------"); } finally { + if (raf != null) + raf.close(); fn.delete(); }
--- a/jdk/test/java/io/RandomAccessFile/ReadLine.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/RandomAccessFile/ReadLine.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,26 +33,30 @@ public static void main(String args[]) throws Exception { File fn = new File("x.ReadLine"); RandomAccessFile raf = new RandomAccessFile(fn,"rw"); - String line; - int ctr = 1; - String expected; + try { + String line; + int ctr = 1; + String expected; - raf.writeBytes - ("ln1\rln2\r\nln3\nln4\rln5\r\nln6\n\rln8\r\rln10\n\nln12\r\r\nln14"); - raf.seek(0); + raf.writeBytes + ("ln1\rln2\r\nln3\nln4\rln5\r\nln6\n\rln8\r\rln10\n\nln12\r\r\nln14"); + raf.seek(0); - while ((line=raf.readLine()) != null) { - if ((ctr == 7) || (ctr == 9) || - (ctr == 11) || (ctr == 13)) { - expected = ""; - } else { - expected = "ln" + ctr; + while ((line=raf.readLine()) != null) { + if ((ctr == 7) || (ctr == 9) || + (ctr == 11) || (ctr == 13)) { + expected = ""; + } else { + expected = "ln" + ctr; + } + if (!line.equals(expected)) { + throw new Exception("Expected \"" + expected + "\"" + + ", read \"" + line + "\""); + } + ctr++; } - if (!line.equals(expected)) { - throw new Exception("Expected \"" + expected + "\"" + - ", read \"" + line + "\""); - } - ctr++; + } finally { + raf.close(); } System.err.println("Successfully completed test!"); }
--- a/jdk/test/java/io/RandomAccessFile/Seek.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/RandomAccessFile/Seek.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,6 +44,8 @@ throw new Exception ("Should have thrown an IOException when seek offset is < 0"); } catch (IOException e) { + } finally { + raf.close(); } } }
--- a/jdk/test/java/io/RandomAccessFile/WriteBytesChars.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/RandomAccessFile/WriteBytesChars.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,8 @@ byte[] b = new byte[80]; File fn = new File("x.WriteBytesChars"); - try{ - RandomAccessFile raf = new RandomAccessFile(fn , "rw");; + RandomAccessFile raf = new RandomAccessFile(fn , "rw");; + try { for (int i = 0; i < 80; i++) { buf[i] = 'a'; } @@ -71,6 +71,7 @@ RuntimeException("RandomAccessFile.writeChars, wrong result"); } } finally { + raf.close(); fn.delete(); } }
--- a/jdk/test/java/io/RandomAccessFile/WriteUTF.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/RandomAccessFile/WriteUTF.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,8 +42,8 @@ s += s; System.err.println("String length " + s.length()); + f = new RandomAccessFile(fn, "rw"); try { - f = new RandomAccessFile(fn, "rw"); try { f.writeUTF(s); } @@ -53,6 +53,7 @@ throw new RuntimeException("UTFDataFormatException not thrown"); } finally { + f.close(); fn.delete(); }
--- a/jdk/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java Thu Jul 08 11:28:01 2010 -0700 @@ -96,14 +96,18 @@ public static void main(String[] args) throws Exception { RandomAccessFile raf = new RandomAccessFile("input.txt" , "rw"); - int length = (int)raf.length(); + try { + int length = (int)raf.length(); - doTest(raf , 0 , 2*length); - doTest(raf , 0 , length); - doTest(raf , 0 , length/2); - doTest(raf , length/2 , -2); - doTest(raf , length , 0); - doTest(raf , 0 , -1); + doTest(raf , 0 , 2*length); + doTest(raf , 0 , length); + doTest(raf , 0 , length/2); + doTest(raf , length/2 , -2); + doTest(raf , length , 0); + doTest(raf , 0 , -1); + } finally{ + raf.close(); + } }
--- a/jdk/test/java/io/Reader/Skip.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Reader/Skip.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,12 +35,16 @@ File f = new File(System.getProperty("test.src", "."), "SkipInput.txt"); FileReader fr = new FileReader(f); - long nchars = 8200; - long actual = fr.skip(nchars); + try { + long nchars = 8200; + long actual = fr.skip(nchars); - if (actual > nchars) { - throw new Exception - ("Should skip " + nchars + ", but skipped " +actual+" chars"); + if (actual > nchars) { + throw new Exception + ("Should skip " + nchars + ", but skipped " +actual+" chars"); + } + } finally { + fr.close(); } } }
--- a/jdk/test/java/io/Reader/SkipNegative.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Reader/SkipNegative.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,6 +41,8 @@ } catch(IllegalArgumentException e){ // Negative argument caught return; + } finally { + fr.close(); } throw new Exception("Skip should not accept negative values"); }
--- a/jdk/test/java/io/Serializable/ClassCastExceptionDetail/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/ClassCastExceptionDetail/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,9 +40,9 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("tmp.ser")); + FileInputStream in = new FileInputStream("tmp.ser"); try { + ObjectInputStream oin = new ObjectInputStream(in); oin.readObject(); throw new Error("readObject should not succeed"); } catch (ClassCastException e) { @@ -57,6 +57,8 @@ { throw new Error("ClassNotFoundException message incomplete"); } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,6 +26,8 @@ * @summary Verify that unauthorized ObjectOutputStream and ObjectInputStream * cannot be constructed if they override security-sensitive non-final * methods. + * @build AuditStreamSubclass + * @run main/othervm AuditStreamSubclass */ import java.io.*;
--- a/jdk/test/java/io/Serializable/backRefCNFException/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/backRefCNFException/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,13 +38,17 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("tmp.ser")); - oin.readObject(); + FileInputStream in = new FileInputStream("tmp.ser"); try { + ObjectInputStream oin = new ObjectInputStream(in); oin.readObject(); - throw new Error("back reference read succeeded"); - } catch (ClassNotFoundException ex) { + try { + oin.readObject(); + throw new Error("back reference read succeeded"); + } catch (ClassNotFoundException ex) { + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/checkModifiers/CheckModifiers.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/checkModifiers/CheckModifiers.java Thu Jul 08 11:28:01 2010 -0700 @@ -213,33 +213,39 @@ FileOutputStream fos = new FileOutputStream("fields.ser"); - ObjectOutputStream oos = new ObjectOutputStream(fos); - - System.out.println("Writing obj 1"); - oos.writeObject(tc1); - System.out.println("Writing obj 2"); - oos.writeObject(tc2); - System.out.println("Writing obj 3"); - oos.writeObject(tc3); - System.out.println("Writing obj 4"); - oos.writeObject(tc4); + try { + ObjectOutputStream oos = new ObjectOutputStream(fos); + System.out.println("Writing obj 1"); + oos.writeObject(tc1); + System.out.println("Writing obj 2"); + oos.writeObject(tc2); + System.out.println("Writing obj 3"); + oos.writeObject(tc3); + System.out.println("Writing obj 4"); + oos.writeObject(tc4); + oos.flush(); + } finally { + fos.close(); + } FileInputStream fis = new FileInputStream("fields.ser"); - ObjectInputStream ois = new ObjectInputStream(fis); - - - System.out.println("Test modifiers for serialPeristentFields "); - System.out.println("---------------------------------------- "); - System.out.println("Declaration missing final modifier"); - ois.readObject(); - System.out.println(); - System.out.println("Declaration with public instead of private access"); - ois.readObject(); - System.out.println(); - System.out.println("Declaration with different type"); - ois.readObject(); - System.out.println(); - System.out.println("Declaration as in specification"); - ois.readObject(); + try { + ObjectInputStream ois = new ObjectInputStream(fis); + System.out.println("Test modifiers for serialPeristentFields "); + System.out.println("---------------------------------------- "); + System.out.println("Declaration missing final modifier"); + ois.readObject(); + System.out.println(); + System.out.println("Declaration with public instead of private access"); + ois.readObject(); + System.out.println(); + System.out.println("Declaration with different type"); + ois.readObject(); + System.out.println(); + System.out.println("Declaration as in specification"); + ois.readObject(); + } finally { + fis.close(); + } } };
--- a/jdk/test/java/io/Serializable/classDescFlagConflict/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/classDescFlagConflict/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,10 +42,15 @@ * descriptor. */ File f = new File(System.getProperty("test.src", "."), "Foo.ser"); - new ObjectInputStream(new FileInputStream(f)).readObject(); - throw new Error( - "read succeeded for object whose class descriptor has " + - "both SC_SERIALIZABLE and SC_EXTERNALIZABLE flags set"); + FileInputStream in = new FileInputStream(f); + try { + new ObjectInputStream(in).readObject(); + throw new Error( + "read succeeded for object whose class descriptor has " + + "both SC_SERIALIZABLE and SC_EXTERNALIZABLE flags set"); + } finally { + in.close(); + } } catch (InvalidClassException e) { } }
--- a/jdk/test/java/io/Serializable/classDescHooks/ClassDescHooks.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/classDescHooks/ClassDescHooks.java Thu Jul 08 11:28:01 2010 -0700 @@ -93,8 +93,12 @@ bout = new ByteArrayOutputStream(); foof = new File(System.getProperty("test.src", "."), "Foo.ser"); fin = new FileInputStream(foof); - while (fin.available() > 0) - bout.write(fin.read()); + try { + while (fin.available() > 0) + bout.write(fin.read()); + } finally { + fin.close(); + } byte[] buf1 = bout.toByteArray(); bout = new ByteArrayOutputStream(); @@ -107,11 +111,16 @@ if (! Arrays.equals(buf1, buf2)) throw new Error("Incompatible stream format (write)"); + Foo foocopy; fin = new FileInputStream(foof); - oin = new ObjectInputStream(fin); - Foo foocopy = (Foo) oin.readObject(); - if (! foo.equals(foocopy)) - throw new Error("Incompatible stream format (read)"); + try { + oin = new ObjectInputStream(fin); + foocopy = (Foo) oin.readObject(); + if (! foo.equals(foocopy)) + throw new Error("Incompatible stream format (read)"); + } finally { + fin.close(); + } // make sure write hook not called when old protocol in use bout = new ByteArrayOutputStream();
--- a/jdk/test/java/io/Serializable/duplicateSerialFields/Test.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/duplicateSerialFields/Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -82,18 +82,26 @@ } catch (InvalidClassException e) { } + FileInputStream in = new FileInputStream("a.ser"); try { - new ObjectInputStream(new FileInputStream("a.ser")).readObject(); + ObjectInputStream oin = new ObjectInputStream(in); + oin.readObject(); throw new Error( "read of A should fail with InvalidClassException"); } catch (InvalidClassException e) { + } finally { + in.close(); } + in = new FileInputStream("b.ser"); try { - new ObjectInputStream(new FileInputStream("b.ser")).readObject(); + ObjectInputStream oin = new ObjectInputStream(in); + oin.readObject(); throw new Error( "read of B should fail with InvalidClassException"); } catch (InvalidClassException e) { + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/enum/badResolve/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/enum/badResolve/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,13 +44,15 @@ } static void read(String filename) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream(filename)); + FileInputStream in = new FileInputStream(filename); try { + ObjectInputStream oin = new ObjectInputStream(in); Object obj = oin.readObject(); throw new Error("read of " + obj + " should not have succeeded"); } catch (InvalidClassException e) { System.out.println("caught expected exception " + e); + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/enum/constantSubclasses/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/enum/constantSubclasses/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,13 +38,17 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("foo.ser")); - for (Foo f : Foo.values()) { - Object obj = oin.readObject(); - if (obj != f) { - throw new Error("expected " + f + ", got " + obj); + FileInputStream in = new FileInputStream("foo.ser"); + try { + ObjectInputStream oin = new ObjectInputStream(in); + for (Foo f : Foo.values()) { + Object obj = oin.readObject(); + if (obj != f) { + throw new Error("expected " + f + ", got " + obj); + } } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/enum/missingConstant/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/enum/missingConstant/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,19 +33,23 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("foo.ser")); - for (Foo f : Foo.values()) { - Object obj = oin.readObject(); - if (obj != f) { - throw new Error("expected " + f + ", got " + obj); + FileInputStream in = new FileInputStream("foo.ser"); + try { + ObjectInputStream oin = new ObjectInputStream(in); + for (Foo f : Foo.values()) { + Object obj = oin.readObject(); + if (obj != f) { + throw new Error("expected " + f + ", got " + obj); + } } - } - try { - Object obj = oin.readObject(); - throw new Error("read of " + obj + " should not succeed"); - } catch (InvalidObjectException e) { - System.out.println("caught expected exception: " + e); + try { + Object obj = oin.readObject(); + throw new Error("read of " + obj + " should not succeed"); + } catch (InvalidObjectException e) { + System.out.println("caught expected exception: " + e); + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/fieldTypeString/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/fieldTypeString/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,23 +44,30 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("foo.ser")); - Foo foo = (Foo) oin.readObject(); - if (! foo.obj.equals("foo")) { - throw new Error(); - } + FileInputStream in = new FileInputStream("foo.ser"); try { - oin.readObject(); - throw new Error(); - } catch (ClassCastException ex) { + ObjectInputStream oin = new ObjectInputStream(in); + Foo foo = (Foo) oin.readObject(); + if (! foo.obj.equals("foo")) { + throw new Error(); + } + try { + oin.readObject(); + throw new Error(); + } catch (ClassCastException ex) { + } + } finally { + in.close(); } - oin = new ObjectInputStream(new FileInputStream("bar.ser")); + in = new FileInputStream("bar.ser"); try { + ObjectInputStream oin = new ObjectInputStream(in); oin.readObject(); throw new Error(); } catch (InvalidClassException ex) { + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/illegalHandle/Test.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/illegalHandle/Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,21 +38,31 @@ * serialized String object followed by an illegal handle */ File f = new File(base, "negativeHandle.ser"); - ObjectInputStream oin = new ObjectInputStream(new FileInputStream(f)); - oin.readObject(); + FileInputStream in = new FileInputStream(f); try { + ObjectInputStream oin = new ObjectInputStream(in); oin.readObject(); - throw new Error("negative handle read should not succeed"); - } catch (StreamCorruptedException ex) { + try { + oin.readObject(); + throw new Error("negative handle read should not succeed"); + } catch (StreamCorruptedException ex) { + } + } finally { + in.close(); } f = new File(base, "tooHighHandle.ser"); - oin = new ObjectInputStream(new FileInputStream(f)); - oin.readObject(); + in = new FileInputStream(f); try { + ObjectInputStream oin = new ObjectInputStream(in); oin.readObject(); - throw new Error("too-high handle read should not succeed"); - } catch (StreamCorruptedException ex) { + try { + oin.readObject(); + throw new Error("too-high handle read should not succeed"); + } catch (StreamCorruptedException ex) { + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/longString/LongString.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/longString/LongString.java Thu Jul 08 11:28:01 2010 -0700 @@ -68,17 +68,25 @@ mesgf = new File(System.getProperty("test.src", "."), "mesg.ser"); fin = new FileInputStream(mesgf); bout = new ByteArrayOutputStream(); - while (fin.available() > 0) - bout.write(fin.read()); + try { + while (fin.available() > 0) + bout.write(fin.read()); + } finally { + fin.close(); + } byte[] buf2 = bout.toByteArray(); if (! Arrays.equals(buf1, buf2)) throw new Error("incompatible string format (write)"); fin = new FileInputStream(mesgf); - oin = new ObjectInputStream(fin); - String mesgcopy = (String) oin.readObject(); - if (! mesg.equals(mesgcopy)) - throw new Error("incompatible string format (read)"); + try { + oin = new ObjectInputStream(fin); + String mesgcopy = (String) oin.readObject(); + if (! mesg.equals(mesgcopy)) + throw new Error("incompatible string format (read)"); + } finally { + fin.close(); + } } }
--- a/jdk/test/java/io/Serializable/oldTests/AnnotateClass.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/oldTests/AnnotateClass.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,36 +37,43 @@ "methods \n"); try { FileOutputStream ostream = new FileOutputStream("subtest1.tmp"); - TestOutputStream p = new TestOutputStream(ostream); - - p.writeObject(System.out); - p.writeObject(System.err); - p.writeObject(new PrintStream(ostream)); - p.flush(); - ostream.close(); + try { + TestOutputStream p = new TestOutputStream(ostream); + p.writeObject(System.out); + p.writeObject(System.err); + p.writeObject(new PrintStream(ostream)); + p.flush(); + } finally { + ostream.close(); + } FileInputStream istream = new FileInputStream("subtest1.tmp"); - TestInputStream q = new TestInputStream(istream); + try { + TestInputStream q = new TestInputStream(istream); - PrintStream out = (PrintStream)q.readObject(); - PrintStream err = (PrintStream)q.readObject(); - Object other = q.readObject(); - if (out != System.out) { - System.err.println( - "\nTEST FAILED: System.out not read correctly"); - throw new Error(); + PrintStream out = (PrintStream)q.readObject(); + PrintStream err = (PrintStream)q.readObject(); + Object other = q.readObject(); + if (out != System.out) { + System.err.println( + "\nTEST FAILED: System.out not read correctly"); + throw new Error(); + } + if (err != System.err) { + System.err.println( + "\nTEST FAILED: System.err not read correctly"); + throw new Error(); + } + if (other != null) { + System.err.println( + "\nTEST FAILED: Non-system PrintStream should have " + + "been written/read as null"); + throw new Error(); + } + } finally { + istream.close(); } - if (err != System.err) { - System.err.println( - "\nTEST FAILED: System.err not read correctly"); - throw new Error(); - } - if (other != null) { - System.err.println( - "\nTEST FAILED: Non-system PrintStream should have " + - "been written/read as null"); - throw new Error(); - } + System.err.println("\nTEST PASSED"); } catch (Exception e) { System.err.print("TEST FAILED: ");
--- a/jdk/test/java/io/Serializable/oldTests/ArrayFields.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/oldTests/ArrayFields.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,20 +35,22 @@ public class ArrayFields { - public static void main (String argv[]) { + public static void main (String argv[]) throws IOException { System.err.println("\nRegression test for testing of " + "serialization/deserialization of objects with " + "fields of array type\n"); + FileOutputStream ostream = null; + FileInputStream istream = null; try { - FileOutputStream ostream = new FileOutputStream("piotest4.tmp"); + ostream = new FileOutputStream("piotest4.tmp"); ObjectOutputStream p = new ObjectOutputStream(ostream); ArrayTest array = new ArrayTest(); p.writeObject(array); p.flush(); - FileInputStream istream = new FileInputStream("piotest4.tmp"); + istream = new FileInputStream("piotest4.tmp"); ObjectInputStream q = new ObjectInputStream(istream); Object obj = null; @@ -73,6 +75,9 @@ System.err.print("TEST FAILED: "); e.printStackTrace(); throw new Error(); + } finally { + if (istream != null) istream.close(); + if (ostream != null) ostream.close(); } } }
--- a/jdk/test/java/io/Serializable/oldTests/ArraysOfArrays.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/oldTests/ArraysOfArrays.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,14 +31,15 @@ import java.io.*; public class ArraysOfArrays { - public static void main (String argv[]) { + public static void main (String argv[]) throws IOException { System.err.println("\nRegression test for testing of " + "serialization/deserialization of objects as " + "arrays of arrays \n"); FileInputStream istream = null; + FileOutputStream ostream = null; try { - FileOutputStream ostream = new FileOutputStream("piotest5.tmp"); + ostream = new FileOutputStream("piotest5.tmp"); ObjectOutputStream p = new ObjectOutputStream(ostream); byte b[][] = {{ 0, 1}, {2,3}}; @@ -207,6 +208,9 @@ throw new Error(); } throw new Error(); + } finally { + if (istream != null) istream.close(); + if (ostream != null) ostream.close(); } } }
--- a/jdk/test/java/io/Serializable/oldTests/BinaryTree.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/oldTests/BinaryTree.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,28 +37,34 @@ "with BinaryTree types \n"); try { + BinaryTreeTest base = new BinaryTreeTest(2); FileOutputStream ostream = new FileOutputStream("piotest3.tmp"); - ObjectOutputStream p = new ObjectOutputStream(ostream); - - BinaryTreeTest base = new BinaryTreeTest(2); - p.writeObject(null); - p.writeObject(base); - p.flush(); - ostream.close(); + try { + ObjectOutputStream p = new ObjectOutputStream(ostream); + p.writeObject(null); + p.writeObject(base); + p.flush(); + } finally { + ostream.close(); + } FileInputStream istream = new FileInputStream("piotest3.tmp"); - ObjectInputStream q = new ObjectInputStream(istream); - - Object n = q.readObject(); - if (n != null) { - System.err.println("\nnull read as " + n); + try { + ObjectInputStream q = new ObjectInputStream(istream); + Object n = q.readObject(); + if (n != null) { + System.err.println("\nnull read as " + n); + } + BinaryTreeTest nbase = (BinaryTreeTest)q.readObject(); + if (!base.equals(nbase)) { + System.err.println("\nTEST FAILED: BinaryTree read " + + "incorrectly."); + throw new Error(); + } + } finally { + istream.close(); } - BinaryTreeTest nbase = (BinaryTreeTest)q.readObject(); - if (!base.equals(nbase)) { - System.err.println("\nTEST FAILED: BinaryTree read " + - "incorrectly."); - throw new Error(); - } + System.err.println("\nTEST PASSED"); } catch (Exception e) { System.err.print("TEST FAILED: ");
--- a/jdk/test/java/io/Serializable/oldTests/CircularList.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/oldTests/CircularList.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,20 +31,22 @@ import java.io.*; public class CircularList { - public static void main (String argv[]) { + public static void main (String argv[]) throws IOException { System.err.println("\nRegression test for testing of " + "serialization/deserialization of " + "objects with CirculalListType types \n"); + FileInputStream istream = null; + FileOutputStream ostream = null; try { - FileOutputStream ostream = new FileOutputStream("piotest7.tmp"); + ostream = new FileOutputStream("piotest7.tmp"); ObjectOutputStream p = new ObjectOutputStream(ostream); CircularListTest.setup(); p.writeObject(CircularListTest.list); p.flush(); - FileInputStream istream = new FileInputStream("piotest7.tmp"); + istream = new FileInputStream("piotest7.tmp"); ObjectInputStream q = new ObjectInputStream(istream); CircularListTest cv = (CircularListTest)q.readObject(); @@ -58,6 +60,9 @@ System.err.print("TEST FAILED: "); e.printStackTrace(); throw new Error(); + } finally { + if (istream != null) istream.close(); + if (ostream != null) ostream.close(); } } }
--- a/jdk/test/java/io/Serializable/oldTests/SimpleArrays.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/oldTests/SimpleArrays.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,13 +35,14 @@ public class SimpleArrays { - public static void main (String argv[]) { + public static void main (String argv[]) throws IOException { System.err.println("\nRegression test for testing of " + "serialization/deserialization of objects with Arrays types\n"); FileInputStream istream = null; + FileOutputStream ostream = null; try { - FileOutputStream ostream = new FileOutputStream("piotest2.tmp"); + ostream = new FileOutputStream("piotest2.tmp"); ObjectOutputStream p = new ObjectOutputStream(ostream); byte b[] = { 0, 1}; @@ -177,6 +178,9 @@ throw new Error(); } throw new Error(); + } finally { + if (istream != null) istream.close(); + if (ostream != null) ostream.close(); } } }
--- a/jdk/test/java/io/Serializable/oldTests/WritePrimitive.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/oldTests/WritePrimitive.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,11 +34,12 @@ import java.io.*; public class WritePrimitive { - public static void main (String argv[]) { + public static void main (String argv[]) throws IOException { System.err.println("\nRegression test for testing of " + "serialization/deserialization of primitives \n"); FileInputStream istream = null; + FileOutputStream ostream = null; try { int i = 123456; byte b = 12; @@ -51,7 +52,7 @@ String string = "The String"; PrimitivesTest prim = new PrimitivesTest(); - FileOutputStream ostream = new FileOutputStream("piotest1.tmp"); + ostream = new FileOutputStream("piotest1.tmp"); ObjectOutputStream p = new ObjectOutputStream(ostream); p.writeInt(i); @@ -154,6 +155,9 @@ throw new Error(); } throw new Error(); + } finally { + if (istream != null) istream.close(); + if (ostream != null) ostream.close(); } } }
--- a/jdk/test/java/io/Serializable/packageAccess/Test.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/packageAccess/Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,7 +38,8 @@ public static void main(String[] args) throws Exception { ClassLoader ldr = - new URLClassLoader(new URL[]{ new URL("file:foo.jar") }); + new URLClassLoader(new URL[]{ new URL("file:foo.jar") }, + Test.class.getClassLoader()); bcl = Class.forName("B", true, ldr); dcl = Class.forName("D", true, ldr);
--- a/jdk/test/java/io/Serializable/parents/EvolvedClass.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/parents/EvolvedClass.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,12 @@ // Deserialize in to new class object FileInputStream fi = new FileInputStream("parents.ser"); - ObjectInputStream si = new ObjectInputStream(fi); - cnew = (ASubClass) si.readObject(); + try { + ObjectInputStream si = new ObjectInputStream(fi); + cnew = (ASubClass) si.readObject(); + } finally { + fi.close(); + } System.out.println("Printing the deserialized class: "); System.out.println();
--- a/jdk/test/java/io/Serializable/parents/OriginalClass.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/parents/OriginalClass.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,9 +43,13 @@ // Serialize the subclass FileOutputStream fo = new FileOutputStream("parents.ser"); - ObjectOutputStream so = new ObjectOutputStream(fo); - so.writeObject(corg); - so.flush(); + try { + ObjectOutputStream so = new ObjectOutputStream(fo); + so.writeObject(corg); + so.flush(); + } finally { + fo.close(); + } System.out.println("Printing the serialized class: "); System.out.println();
--- a/jdk/test/java/io/Serializable/proxy/Basic.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/proxy/Basic.java Thu Jul 08 11:28:01 2010 -0700 @@ -81,7 +81,7 @@ public class Basic { public static void main(String[] args) throws Exception { - ClassLoader loader = ClassLoader.getSystemClassLoader(); + ClassLoader loader = Basic.class.getClassLoader(); Class[] interfaces = new Class[] { Foo.class, Bar.class }; Random rand = new Random(); int foo = rand.nextInt();
--- a/jdk/test/java/io/Serializable/proxy/skipMissing/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/proxy/skipMissing/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -49,20 +49,24 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = new ObjectInputStream( - new FileInputStream("tmp.ser")); - A a = (A) oin.readObject(); - if (! (a.a.equals("a") && a.z.equals("z"))) { - throw new Error("A fields corrupted"); - } - B b = (B) oin.readObject(); - if (! b.s.equals("s")) { - throw new Error("B fields corrupted"); - } + FileInputStream in = new FileInputStream("tmp.ser"); try { - oin.readObject(); - throw new Error("proxy read should not succeed"); - } catch (ClassNotFoundException ex) { + ObjectInputStream oin = new ObjectInputStream(in); + A a = (A) oin.readObject(); + if (! (a.a.equals("a") && a.z.equals("z"))) { + throw new Error("A fields corrupted"); + } + B b = (B) oin.readObject(); + if (! b.s.equals("s")) { + throw new Error("B fields corrupted"); + } + try { + oin.readObject(); + throw new Error("proxy read should not succeed"); + } catch (ClassNotFoundException ex) { + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/proxy/skipMissing/Write.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/proxy/skipMissing/Write.java Thu Jul 08 11:28:01 2010 -0700 @@ -64,7 +64,7 @@ public class Write { public static void main(String[] args) throws Exception { Object proxy = Proxy.newProxyInstance( - ClassLoader.getSystemClassLoader(), + Write.class.getClassLoader(), new Class[] { I.class }, new Handler()); ObjectOutputStream oout = new ObjectOutputStream( new FileOutputStream("tmp.ser"));
--- a/jdk/test/java/io/Serializable/readObjectNoData/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/readObjectNoData/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -95,14 +95,18 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("tmp.ser")); - F f = (F) oin.readObject(); - if (f.aCalled || f.bCalled || f.dCalled || f.eCalled) { - throw new Error("readObjectNoData invoked erroneously"); - } - if (! f.cCalled) { - throw new Error("readObjectNoData not invoked"); + FileInputStream in = new FileInputStream("tmp.ser"); + try { + ObjectInputStream oin = new ObjectInputStream(in); + F f = (F) oin.readObject(); + if (f.aCalled || f.bCalled || f.dCalled || f.eCalled) { + throw new Error("readObjectNoData invoked erroneously"); + } + if (! f.cCalled) { + throw new Error("readObjectNoData not invoked"); + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/skipWriteObject/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/skipWriteObject/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,9 +38,13 @@ public static void main(String[] args) throws Exception { ObjectInputStream oin = new ObjectInputStream(new FileInputStream("tmp.ser")); - Object[] array = (Object[]) oin.readObject(); - if (! (array[0].equals("before") && array[2].equals("after"))) { - throw new Error(); + try { + Object[] array = (Object[]) oin.readObject(); + if (! (array[0].equals("before") && array[2].equals("after"))) { + throw new Error(); + } + } finally { + oin.close(); } } }
--- a/jdk/test/java/io/Serializable/skippedObjCNFException/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/skippedObjCNFException/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,8 +44,12 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("tmp.ser")); - oin.readObject(); + FileInputStream in = new FileInputStream("tmp.ser"); + try { + ObjectInputStream oin = new ObjectInputStream(in); + oin.readObject(); + } finally { + in.close(); + } } }
--- a/jdk/test/java/io/Serializable/stopCustomDeserialization/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/stopCustomDeserialization/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -53,16 +53,20 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("tmp.ser")); + FileInputStream in = new FileInputStream("tmp.ser"); try { - oin.readObject(); - throw new Error("readObject should not succeed"); - } catch (ClassNotFoundException e) { - // expected - } - if (!oin.readObject().equals("after")) { - throw new Error("subsequent object corrupted"); + ObjectInputStream oin = new ObjectInputStream(in); + try { + oin.readObject(); + throw new Error("readObject should not succeed"); + } catch (ClassNotFoundException e) { + // expected + } + if (!oin.readObject().equals("after")) { + throw new Error("subsequent object corrupted"); + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/unresolvedClassDesc/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/unresolvedClassDesc/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,19 +32,23 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("tmp.ser")); - oin.readObject(); - oin.readObject(); + FileInputStream in = new FileInputStream("tmp.ser"); try { + ObjectInputStream oin = new ObjectInputStream(in); + oin.readObject(); oin.readObject(); - throw new Error("read of Foo instance succeeded"); - } catch (ClassNotFoundException ex) { - } - try { - oin.readObject(); - throw new Error("indirect read of Foo instance succeeded"); - } catch (ClassNotFoundException ex) { + try { + oin.readObject(); + throw new Error("read of Foo instance succeeded"); + } catch (ClassNotFoundException ex) { + } + try { + oin.readObject(); + throw new Error("indirect read of Foo instance succeeded"); + } catch (ClassNotFoundException ex) { + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/unshared/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/unshared/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -80,20 +80,30 @@ } // read in objects written by Write.main() - oin = new ObjectInputStream(new FileInputStream("tmp.ser")); - oin.readObject(); + FileInputStream in = new FileInputStream("tmp.ser"); try { + oin = new ObjectInputStream(in); oin.readObject(); - throw new Error(); - } catch (ObjectStreamException ex) { + try { + oin.readObject(); + throw new Error(); + } catch (ObjectStreamException ex) { + } + } finally { + in.close(); } - oin = new ObjectInputStream(new FileInputStream("tmp.ser")); - oin.readObject(); + in = new FileInputStream("tmp.ser"); try { - oin.readUnshared(); - throw new Error(); - } catch (ObjectStreamException ex) { + oin = new ObjectInputStream(in); + oin.readObject(); + try { + oin.readUnshared(); + throw new Error(); + } catch (ObjectStreamException ex) { + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/Serializable/wrongReturnTypes/Read.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/Serializable/wrongReturnTypes/Read.java Thu Jul 08 11:28:01 2010 -0700 @@ -62,15 +62,19 @@ public class Read { public static void main(String[] args) throws Exception { - ObjectInputStream oin = - new ObjectInputStream(new FileInputStream("tmp.ser")); - B b = (B) oin.readObject(); - if (A.readObjectNoDataCalled) { - throw new Error("readObjectNoData with wrong return type called"); - } else if (B.readObjectCalled) { - throw new Error("readObject with wrong return type called"); - } else if (B.readResolveCalled) { - throw new Error("readResolve with wrong return type called"); + FileInputStream in = new FileInputStream("tmp.ser"); + try { + ObjectInputStream oin = new ObjectInputStream(in); + B b = (B) oin.readObject(); + if (A.readObjectNoDataCalled) { + throw new Error("readObjectNoData with wrong return type called"); + } else if (B.readObjectCalled) { + throw new Error("readObject with wrong return type called"); + } else if (B.readResolveCalled) { + throw new Error("readResolve with wrong return type called"); + } + } finally { + in.close(); } } }
--- a/jdk/test/java/io/StreamTokenizer/Comment.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/StreamTokenizer/Comment.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,40 +41,45 @@ int slashStarComment = 4; for (int i = 0; i < 8 ; i++) { - StreamTokenizer st = new StreamTokenizer(new FileReader(f)); - - /* decide the state of this run */ - boolean slashCommentFlag = ((i & slashIsCommentStart) != 0); - boolean slashSlashCommentFlag = ((i & slashSlashComment) != 0); - boolean slashStarCommentFlag = ((i & slashStarComment) != 0); + FileReader reader = new FileReader(f); + try { + StreamTokenizer st = new StreamTokenizer(reader); - /* set the initial state of the tokenizer */ - if (!slashCommentFlag) { - st.ordinaryChar('/'); - } - st.slashSlashComments(slashSlashCommentFlag); - st.slashStarComments(slashStarCommentFlag); + /* decide the state of this run */ + boolean slashCommentFlag = ((i & slashIsCommentStart) != 0); + boolean slashSlashCommentFlag = ((i & slashSlashComment) != 0); + boolean slashStarCommentFlag = ((i & slashStarComment) != 0); + + /* set the initial state of the tokenizer */ + if (!slashCommentFlag) { + st.ordinaryChar('/'); + } + st.slashSlashComments(slashSlashCommentFlag); + st.slashStarComments(slashStarCommentFlag); - /* now go throgh the input file */ - while(st.nextToken() != StreamTokenizer.TT_EOF) - { - String token = st.sval; - if (token == null) { - continue; - } else { - if ((token.compareTo("Error1") == 0) && slashStarCommentFlag) { - throw new Exception("Failed to pass one line C comments!"); - } - if ((token.compareTo("Error2") == 0) && slashStarCommentFlag) { - throw new Exception("Failed to pass multi line C comments!"); - } - if ((token.compareTo("Error3") == 0) && slashSlashCommentFlag) { - throw new Exception("Failed to pass C++ comments!"); - } - if ((token.compareTo("Error4") == 0) && slashCommentFlag) { - throw new Exception("Failed to pass / comments!"); + /* now go throgh the input file */ + while(st.nextToken() != StreamTokenizer.TT_EOF) + { + String token = st.sval; + if (token == null) { + continue; + } else { + if ((token.compareTo("Error1") == 0) && slashStarCommentFlag) { + throw new Exception("Failed to pass one line C comments!"); + } + if ((token.compareTo("Error2") == 0) && slashStarCommentFlag) { + throw new Exception("Failed to pass multi line C comments!"); + } + if ((token.compareTo("Error3") == 0) && slashSlashCommentFlag) { + throw new Exception("Failed to pass C++ comments!"); + } + if ((token.compareTo("Error4") == 0) && slashCommentFlag) { + throw new Exception("Failed to pass / comments!"); + } } } + } finally { + reader.close(); } } }
--- a/jdk/test/java/io/readBytes/ReadBytesBounds.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/io/readBytes/ReadBytesBounds.java Thu Jul 08 11:28:01 2010 -0700 @@ -57,24 +57,28 @@ } public static void main(String argv[]) throws Throwable { - byte b[] = new byte[32]; - testRead(-1, -1, false); - testRead(-1, 0, false); - testRead( 0, -1, false); - testRead( 0, 33, false); - testRead(33, 0, false); - testRead(33, 4, false); - testRead( 0, 32, true); - testRead(32, 0, true); - testRead(32, 4, false); - testRead( 4, 16, true); - testRead( 1, 31, true); - testRead( 0, 0, true); - testRead(31, Integer.MAX_VALUE, false); - testRead( 0, Integer.MAX_VALUE, false); - testRead(-1, Integer.MAX_VALUE, false); - testRead(-4, Integer.MIN_VALUE, false); - testRead( 0, Integer.MIN_VALUE, false); + try { + testRead(-1, -1, false); + testRead(-1, 0, false); + testRead( 0, -1, false); + testRead( 0, 33, false); + testRead(33, 0, false); + testRead(33, 4, false); + testRead( 0, 32, true); + testRead(32, 0, true); + testRead(32, 4, false); + testRead( 4, 16, true); + testRead( 1, 31, true); + testRead( 0, 0, true); + testRead(31, Integer.MAX_VALUE, false); + testRead( 0, Integer.MAX_VALUE, false); + testRead(-1, Integer.MAX_VALUE, false); + testRead(-4, Integer.MIN_VALUE, false); + testRead( 0, Integer.MIN_VALUE, false); + } finally { + fis.close(); + raf.close(); + } } static void testRead(int off, int len, boolean expected) throws Throwable {
--- a/jdk/test/java/lang/ClassLoader/UninitializedParent.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/ClassLoader/UninitializedParent.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,6 +26,7 @@ * @bug 6636650 * @summary Uninitialized class loaders should not be a parent of other * class loaders. + * @run main/othervm UninitializedParent */
--- a/jdk/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,14 +38,17 @@ public class DefineClassByteBuffer { static void test(ClassLoader cl) throws Exception { - Class c = Class.forName("TestClass", true, cl); + Class<?> c = Class.forName("TestClass", true, cl); if (!"TestClass".equals(c.getName())) { throw new RuntimeException("Got wrong class: " + c); } + if (c.getClassLoader() != cl) { + throw new RuntimeException("TestClass defined by wrong classloader: " + c.getClassLoader()); + } } public static void main(String arg[]) throws Exception { - ClassLoader[] cls = new ClassLoader[DummyClassLoader.MAX_TYPE]; + DummyClassLoader[] cls = new DummyClassLoader[DummyClassLoader.MAX_TYPE]; for (int i = 0; i < cls.length; i++) { cls[i] = new DummyClassLoader(i); } @@ -53,7 +56,7 @@ /* Create several instances of the class using different classloaders, which are using different types of ByteBuffer. */ for (int i = 0; i < cls.length; i++) { - test(cls[i]); + test(cls[i]); } } @@ -100,12 +103,13 @@ buffers. */ buffers[MAPPED_BUFFER] = readClassFile(CLASS_NAME + ".class"); byte[] array = new byte[buffers[MAPPED_BUFFER].limit()]; + buffers[MAPPED_BUFFER].get(array).flip(); buffers[DIRECT_BUFFER] = ByteBuffer.allocateDirect(array.length); - buffers[DIRECT_BUFFER].put(array); + buffers[DIRECT_BUFFER].put(array).flip(); buffers[ARRAY_BUFFER] = ByteBuffer.allocate(array.length); - buffers[ARRAY_BUFFER].put(array); + buffers[ARRAY_BUFFER].put(array).flip(); buffers[WRAPPED_BUFFER] = ByteBuffer.wrap(array); @@ -118,9 +122,30 @@ buffers[DUP_DIRECT_BUFFER] = buffers[DIRECT_BUFFER].duplicate(); } - public Class findClass(String name) { - return defineClass(name, buffers[loaderType], null); - } + protected Class<?> loadClass(String name, boolean resolve) + throws ClassNotFoundException + { + Class<?> c; + if (!"TestClass".equals(name)) { + c = super.loadClass(name, resolve); + } else { + // should not delegate to the system class loader + c = findClass(name); + if (resolve) { + resolveClass(c); + } + } + return c; + } + + protected Class<?> findClass(String name) + throws ClassNotFoundException + { + if (!"TestClass".equals(name)) { + throw new ClassNotFoundException("Unexpected class: " + name); + } + return defineClass(name, buffers[loaderType], null); + } } /* DummyClassLoader */ } /* DefineClassByteBuffer */
--- a/jdk/test/java/lang/ClassLoader/findSystemClass/Loader.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/ClassLoader/findSystemClass/Loader.java Thu Jul 08 11:28:01 2010 -0700 @@ -21,10 +21,16 @@ * questions. */ +/* + * This test runs in othervm mode as it tests ClassLoader.findSystemClass + * and getSystemResource methods. + */ + /* @test @bug 4147599 4478150 @summary In 1.2beta4-I ClassLoader loaded classes can not link against application classes. + @run main/othervm Loader */ /*
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/ProcessBuilder/Basic.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,6 +37,7 @@ import java.io.*; import java.util.*; +import java.util.concurrent.CountDownLatch; import java.security.*; import java.util.regex.Pattern; import static java.lang.System.getenv; @@ -252,9 +253,9 @@ return sb.toString(); } - static void print4095(OutputStream s) throws Throwable { + static void print4095(OutputStream s, byte b) throws Throwable { byte[] bytes = new byte[4095]; - Arrays.fill(bytes, (byte) '!'); + Arrays.fill(bytes, b); s.write(bytes); // Might hang! } @@ -273,7 +274,9 @@ public static class JavaChild { public static void main(String args[]) throws Throwable { String action = args[0]; - if (action.equals("testIO")) { + if (action.equals("sleep")) { + Thread.sleep(10 * 60 * 1000L); + } else if (action.equals("testIO")) { String expected = "standard input"; char[] buf = new char[expected.length()+1]; int n = new InputStreamReader(System.in).read(buf,0,buf.length); @@ -315,7 +318,8 @@ printUTF8(new File(System.getProperty("user.dir")) .getCanonicalPath()); } else if (action.equals("print4095")) { - print4095(System.out); + print4095(System.out, (byte) '!'); + print4095(System.err, (byte) 'E'); System.exit(5); } else if (action.equals("OutErr")) { // You might think the system streams would be @@ -1717,16 +1721,107 @@ } catch (Throwable t) { unexpected(t); } //---------------------------------------------------------------- - // This would deadlock, if not for the fact that + // Attempt to write 4095 bytes to the pipe buffer without a + // reader to drain it would deadlock, if not for the fact that // interprocess pipe buffers are at least 4096 bytes. + // + // Also, check that available reports all the bytes expected + // in the pipe buffer, and that I/O operations do the expected + // things. //---------------------------------------------------------------- try { List<String> childArgs = new ArrayList<String>(javaChildArgs); childArgs.add("print4095"); - Process p = new ProcessBuilder(childArgs).start(); - print4095(p.getOutputStream()); // Might hang! - p.waitFor(); // Might hang! + final int SIZE = 4095; + final Process p = new ProcessBuilder(childArgs).start(); + print4095(p.getOutputStream(), (byte) '!'); // Might hang! + p.waitFor(); // Might hang! + equal(SIZE, p.getInputStream().available()); + equal(SIZE, p.getErrorStream().available()); + THROWS(IOException.class, + new Fun(){void f() throws IOException { + p.getOutputStream().write((byte) '!'); + p.getOutputStream().flush(); + }}); + + final byte[] bytes = new byte[SIZE + 1]; + equal(SIZE, p.getInputStream().read(bytes)); + for (int i = 0; i < SIZE; i++) + equal((byte) '!', bytes[i]); + equal((byte) 0, bytes[SIZE]); + + equal(SIZE, p.getErrorStream().read(bytes)); + for (int i = 0; i < SIZE; i++) + equal((byte) 'E', bytes[i]); + equal((byte) 0, bytes[SIZE]); + + equal(0, p.getInputStream().available()); + equal(0, p.getErrorStream().available()); + equal(-1, p.getErrorStream().read()); + equal(-1, p.getInputStream().read()); + equal(p.exitValue(), 5); + + p.getInputStream().close(); + p.getErrorStream().close(); + p.getOutputStream().close(); + + InputStream[] streams = { p.getInputStream(), p.getErrorStream() }; + for (final InputStream in : streams) { + Fun[] ops = { + new Fun(){void f() throws IOException { + in.read(); }}, + new Fun(){void f() throws IOException { + in.read(bytes); }}, + new Fun(){void f() throws IOException { + in.available(); }} + }; + for (Fun op : ops) { + try { + op.f(); + fail(); + } catch (IOException expected) { + check(expected.getMessage() + .matches("[Ss]tream [Cc]losed")); + } + } + } + } catch (Throwable t) { unexpected(t); } + + //---------------------------------------------------------------- + // Check that reads which are pending when Process.destroy is + // called, get EOF, not IOException("Stream closed"). + //---------------------------------------------------------------- + try { + final int cases = 4; + for (int i = 0; i < cases; i++) { + final int action = i; + List<String> childArgs = new ArrayList<String>(javaChildArgs); + childArgs.add("sleep"); + final byte[] bytes = new byte[10]; + final Process p = new ProcessBuilder(childArgs).start(); + final CountDownLatch latch = new CountDownLatch(1); + final Thread thread = new Thread() { + public void run() { + try { + latch.countDown(); + int r; + switch (action) { + case 0: r = p.getInputStream().read(); break; + case 1: r = p.getErrorStream().read(); break; + case 2: r = p.getInputStream().read(bytes); break; + case 3: r = p.getErrorStream().read(bytes); break; + default: throw new Error(); + } + equal(-1, r); + } catch (Throwable t) { unexpected(t); }}}; + + thread.start(); + latch.await(); + Thread.sleep(10); + p.destroy(); + thread.join(); + } } catch (Throwable t) { unexpected(t); } //---------------------------------------------------------------- @@ -1741,7 +1836,6 @@ } catch (IOException e) { new File("./emptyCommand").delete(); String m = e.getMessage(); - //e.printStackTrace(); if (EnglishUnix.is() && ! matches(m, "Permission denied")) unexpected(e);
--- a/jdk/test/java/lang/System/ExitFinalizersAndJIT.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/System/ExitFinalizersAndJIT.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,6 +26,7 @@ @summary runFinalizersOnExit(true) causes JIT to be unloaded and crashes the VM. Interim fix for 1.2 beta4 -- don't unload native libraries loaded by system classes. + @run main/othervm ExitFinalizersAndJIT */ public class ExitFinalizersAndJIT {
--- a/jdk/test/java/lang/System/IgnoreNullSecurityManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/System/IgnoreNullSecurityManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,6 +26,7 @@ * @bug 4213876 * @summary Make sure "null" security manager is ignored, as specified in the * javadocs + * @run main/othervm IgnoreNullSecurityManager */ public class IgnoreNullSecurityManager {
--- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java Thu Jul 08 11:28:01 2010 -0700 @@ -155,7 +155,7 @@ printStack(t, stack); } int frame = stack.length - 1; - for (int i = 0; i < depth; i++) { + for (int i = 0; i < depth && frame >= 0; i++) { if (! stack[frame].getMethodName().equals(methodNames[i])) { throw new RuntimeException("Expected " + methodNames[i] + " in frame " + frame + " but got " +
--- a/jdk/test/java/lang/Thread/StackTraces.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/Thread/StackTraces.java Thu Jul 08 11:28:01 2010 -0700 @@ -159,7 +159,7 @@ printStack(t, stack); } int frame = stack.length - 1; - for (int i = 0; i < depth; i++) { + for (int i = 0; i < depth && frame >= 0; i++) { if (! stack[frame].getMethodName().equals(methodNames[i])) { throw new RuntimeException("Expected " + methodNames[i] + " in frame " + frame + " but got " +
--- a/jdk/test/java/lang/annotation/ParameterAnnotations.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/annotation/ParameterAnnotations.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,6 +27,7 @@ * @summary Check properties of Annotations returned from * getParameterAnnotations, including freedom from security * exceptions. + * @run main/othervm ParameterAnnotations * @author Martin Buchholz */
--- a/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java Thu Jul 08 11:28:01 2010 -0700 @@ -118,9 +118,21 @@ } class Slave {} -class LeftHand extends ClassLoader {} -class RightHand extends ClassLoader {} +class LeftHand extends ClassLoader { + public LeftHand() { + super(LeftHand.class.getClassLoader()); + } +} +class RightHand extends ClassLoader { + public RightHand() { + super(RightHand.class.getClassLoader()); + } +} class Body {} -class LoaderForTwoInstances extends ClassLoader {} +class LoaderForTwoInstances extends ClassLoader { + public LoaderForTwoInstances() { + super(LoaderForTwoInstances.class.getClassLoader()); + } +} class TheSameClass {}
--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,6 +25,7 @@ * @test * @bug 5024531 * @summary Basic Test for ManagementFactory.newPlatformMXBean(). + * @run main/othervm MXBeanProxyTest * @author Mandy Chung */ import javax.management.*;
--- a/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,9 +41,9 @@ public class CollectionUsageThreshold { private static MemoryMXBean mm = ManagementFactory.getMemoryMXBean(); - private static List pools = ManagementFactory.getMemoryPoolMXBeans(); - private static List managers = ManagementFactory.getMemoryManagerMXBeans(); - private static Map result = new HashMap(); + private static List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans(); + private static List<MemoryManagerMXBean> managers = ManagementFactory.getMemoryManagerMXBeans(); + private static Map<String, PoolRecord> result = new HashMap<>(); private static boolean trace = false; private static boolean testFailed = false; private static final int EXPECTED_NUM_POOLS = 2; @@ -119,8 +119,7 @@ } // Find the Old generation which supports low memory detection - for (ListIterator iter = pools.listIterator(); iter.hasNext(); ) { - MemoryPoolMXBean p = (MemoryPoolMXBean) iter.next(); + for (MemoryPoolMXBean p : pools) { MemoryUsage u = p.getUsage(); if (p.isUsageThresholdSupported() && p.isCollectionUsageThresholdSupported()) { PoolRecord pr = new PoolRecord(p); @@ -134,25 +133,30 @@ throw new RuntimeException("Unexpected number of selected pools"); } - checker = new Checker("Checker thread"); - checker.setDaemon(true); - checker.start(); + try { + checker = new Checker("Checker thread"); + checker.setDaemon(true); + checker.start(); + + for (PoolRecord pr : result.values()) { + pr.getPool().setCollectionUsageThreshold(THRESHOLD); + System.out.println("Collection usage threshold of " + + pr.getPool().getName() + " set to " + THRESHOLD); + } - for (Iterator iter = result.values().iterator(); iter.hasNext();) { - PoolRecord pr = (PoolRecord) iter.next(); - pr.getPool().setCollectionUsageThreshold(THRESHOLD); - System.out.println("Collection usage threshold of " + - pr.getPool().getName() + " set to " + THRESHOLD); - } + SensorListener listener = new SensorListener(); + NotificationEmitter emitter = (NotificationEmitter) mm; + emitter.addNotificationListener(listener, null, null); - SensorListener listener = new SensorListener(); - NotificationEmitter emitter = (NotificationEmitter) mm; - emitter.addNotificationListener(listener, null, null); - - mm.setVerbose(true); - for (int i = 0; i < NUM_GCS; i++) { - invokeGC(); - checker.waitForCheckResult(); + for (int i = 0; i < NUM_GCS; i++) { + invokeGC(); + checker.waitForCheckResult(); + } + } finally { + // restore the default + for (PoolRecord pr : result.values()) { + pr.getPool().setCollectionUsageThreshold(0); + } } if (testFailed) @@ -168,8 +172,7 @@ mm.gc(); if (trace) { - for (Iterator iter = result.values().iterator(); iter.hasNext();) { - PoolRecord pr = (PoolRecord) iter.next(); + for (PoolRecord pr : result.values()) { System.out.println("Usage after GC for: " + pr.getPool().getName()); MemoryUtil.printMemoryUsage(pr.getPool().getUsage()); } @@ -200,8 +203,7 @@ } } private void checkResult() { - for (Iterator iter = result.values().iterator(); iter.hasNext();) { - PoolRecord pr = (PoolRecord) iter.next(); + for (PoolRecord pr : result.values()) { if (pr.getListenerInvokedCount() != numGCs) { throw new RuntimeException("Listeners invoked count = " + pr.getListenerInvokedCount() + " expected to be " +
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ * @author Mandy Chung * * @build LowMemoryTest MemoryUtil - * @run main/timeout=600 LowMemoryTest + * @run main/othervm/timeout=600 LowMemoryTest */ import java.lang.management.*;
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagement.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ * @author Mandy Chung * * @build MemoryManagement MemoryUtil - * @run main/timeout=600 MemoryManagement + * @run main/othervm/timeout=600 MemoryManagement */ import java.lang.management.*;
--- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java Thu Jul 08 11:28:01 2010 -0700 @@ -62,9 +62,21 @@ trace = true; } - // Turn on verbose:gc to track GC - mbean.setVerbose(true); + try { + if (trace) { + // Turn on verbose:gc to track GC + mbean.setVerbose(true); + } + test(); + } finally { + if (trace) { + mbean.setVerbose(false); + } + } + System.out.println("Test passed."); + } + private static void test() throws Exception { // Clean the memory and remove all objects that are pending // finalization System.gc(); @@ -130,7 +142,6 @@ + " end = " + snapshot); } - System.out.println("Test passed."); } private static void checkFinalizerCount(int expectedTotal, int curFinalized)
--- a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,7 +28,7 @@ * @author Mandy Chung * * @build ResetPeakMemoryUsage MemoryUtil - * @run main ResetPeakMemoryUsage + * @run main/othervm ResetPeakMemoryUsage */ import java.lang.management.*;
--- a/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,11 +37,23 @@ public class ThresholdTest { public static void main(String args[]) throws Exception { List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans(); - for (MemoryPoolMXBean p : pools) { - // verify if isUsageThresholdExceeded() returns correct value - checkUsageThreshold(p); - // verify if isCollectionUsageThresholdExceeded() returns correct value - checkCollectionUsageThreshold(p); + try { + for (MemoryPoolMXBean p : pools) { + // verify if isUsageThresholdExceeded() returns correct value + checkUsageThreshold(p); + // verify if isCollectionUsageThresholdExceeded() returns correct value + checkCollectionUsageThreshold(p); + } + } finally { + // restore the default + for (MemoryPoolMXBean p : pools) { + if (p.isUsageThresholdSupported()) { + p.setUsageThreshold(0); + } + if (p.isCollectionUsageThresholdSupported()) { + p.setCollectionUsageThreshold(0); + } + } } System.out.println("Test passed.");
--- a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,13 +37,18 @@ = ManagementFactory.getRuntimeMXBean(); public static void main(String argv[]) throws Exception { + long jvmStartTime = metrics.getStartTime(); long systemStartOuter = System.currentTimeMillis(); long metricsStart = metrics.getUptime(); long systemStartInner = System.currentTimeMillis(); + // This JVM might have been running for some time if this test runs + // in samevm mode. The sanity check should apply to the test uptime. + long testUptime = metricsStart - (systemStartOuter - jvmStartTime); + // If uptime is more than 30 minutes then it looks like a bug in // the method - if (metricsStart > TIMEOUT * 60 * 1000) + if (testUptime > TIMEOUT * 60 * 1000) throw new RuntimeException("Uptime of the JVM is more than 30 " + "minutes (" + (metricsStart / 60 / 1000)
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,7 +28,7 @@ * @author Alexei Guibadoulline and Mandy Chung * * @run build Barrier - * @run main AllThreadIds + * @run main/othervm AllThreadIds */ import java.lang.management.*; @@ -70,6 +70,12 @@ } } + private static void fail(String msg) { + trace = true; + printThreadList(); + throw new RuntimeException(msg); + } + private static void checkThreadCount(int numNewThreads, int numTerminatedThreads) throws Exception { @@ -82,27 +88,27 @@ if ((curLiveThreadCount - prevLiveThreadCount) != (numNewThreads - numTerminatedThreads)) { - throw new RuntimeException("Unexpected number of live threads: " + - " Prev Total = " + prevTotalThreadCount + - " Current Total = " + curTotalThreadCount + + fail("Unexpected number of live threads: " + + " Prev live = " + prevLiveThreadCount + + " Current live = " + curLiveThreadCount + " Threads added = " + numNewThreads + " Threads terminated = " + numTerminatedThreads); } if (curPeakThreadCount - prevPeakThreadCount != numNewThreads) { - throw new RuntimeException("Unexpected number of peak threads: " + - " Prev Total = " + prevTotalThreadCount + - " Current Total = " + curTotalThreadCount + + fail("Unexpected number of peak threads: " + + " Prev peak = " + prevPeakThreadCount + + " Current peak = " + curPeakThreadCount + " Threads added = " + numNewThreads); } if (curTotalThreadCount - prevTotalThreadCount != numNewThreads) { - throw new RuntimeException("Unexpected number of total threads: " + + fail("Unexpected number of total threads: " + " Prev Total = " + prevTotalThreadCount + " Current Total = " + curTotalThreadCount + " Threads added = " + numNewThreads); } long[] list = mbean.getAllThreadIds(); if (list.length != curLiveThreadCount) { - throw new RuntimeException("Array length returned by " + + fail("Array length returned by " + "getAllThreadIds() = " + list.length + " not matched count = " + curLiveThreadCount); }
--- a/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,18 @@ private static ThreadMXBean tm = ManagementFactory.getThreadMXBean(); public static void main(String args[]) throws Exception { - testThreadContentionMonitoring(); - testThreadCpuMonitoring(); + try { + testThreadContentionMonitoring(); + testThreadCpuMonitoring(); + } finally { + // restore the default + if (tm.isThreadContentionMonitoringSupported()) { + tm.setThreadContentionMonitoringEnabled(false); + } + if (tm.isThreadCpuTimeSupported()) { + tm.setThreadCpuTimeEnabled(false); + } + } System.out.println("Test passed."); }
--- a/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -119,8 +119,19 @@ } public static void main(String args[]) throws Exception { - testThreadContentionMonitoring(); - testThreadCpuTime(); + try { + testThreadContentionMonitoring(); + testThreadCpuTime(); + } finally { + // restore the default + if (tm.isThreadContentionMonitoringSupported()) { + tm.setThreadContentionMonitoringEnabled(false); + } + if (tm.isThreadCpuTimeSupported()) { + tm.setThreadCpuTimeEnabled(false); + } + } + System.out.println("Test passed."); }
--- a/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,7 +33,7 @@ * @build MonitorDeadlock * @build SynchronizerDeadlock * @build ThreadDump - * @run main FindDeadlocks + * @run main/othervm FindDeadlocks */ import java.lang.management.*;
--- a/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,7 @@ * * @build MonitorDeadlock * @build ThreadDump - * @run main FindMonitorDeadlock + * @run main/othervm FindMonitorDeadlock */ import java.lang.management.*;
--- a/jdk/test/java/lang/management/ThreadMXBean/Locks.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/management/ThreadMXBean/Locks.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,7 @@ * @author Mandy Chung * * @build ThreadExecutionSynchronizer - * @run main Locks + * @run main/othervm Locks */ import java.lang.management.*;
--- a/jdk/test/java/lang/reflect/Proxy/Boxing.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/reflect/Proxy/Boxing.java Thu Jul 08 11:28:01 2010 -0700 @@ -71,8 +71,8 @@ Random random = new Random(42); // ensure consistent test domain Test proxy = (Test) Proxy.newProxyInstance( - ClassLoader.getSystemClassLoader(), - new Class[] { Test.class }, + Test.class.getClassLoader(), + new Class<?>[] { Test.class }, new TestHandler()); for (int rep = 0; rep < REPS; rep++) {
--- a/jdk/test/java/lang/reflect/Proxy/ClassRestrictions.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/reflect/Proxy/ClassRestrictions.java Thu Jul 08 11:28:01 2010 -0700 @@ -54,16 +54,16 @@ "\nTest of restrictions on parameters to Proxy.getProxyClass\n"); try { - ClassLoader loader = ClassLoader.getSystemClassLoader(); - Class[] interfaces; - Class proxyClass; + ClassLoader loader = ClassRestrictions.class.getClassLoader(); + Class<?>[] interfaces; + Class<?> proxyClass; /* * All of the Class objects in the interfaces array must represent * interfaces, not classes or primitive types. */ try { - interfaces = new Class[] { Object.class }; + interfaces = new Class<?>[] { Object.class }; proxyClass = Proxy.getProxyClass(loader, interfaces); throw new RuntimeException( "proxy class created with java.lang.Object as interface"); @@ -73,7 +73,7 @@ // assume exception is for intended failure } try { - interfaces = new Class[] { Integer.TYPE }; + interfaces = new Class<?>[] { Integer.TYPE }; proxyClass = Proxy.getProxyClass(loader, interfaces); throw new RuntimeException( "proxy class created with int.class as interface"); @@ -88,7 +88,7 @@ * Class objects. */ try { - interfaces = new Class[] { Bar.class, Bar.class }; + interfaces = new Class<?>[] { Bar.class, Bar.class }; proxyClass = Proxy.getProxyClass(loader, interfaces); throw new RuntimeException( "proxy class created with repeated interfaces"); @@ -107,7 +107,7 @@ Class altBarClass; altBarClass = Class.forName(Bar.class.getName(), false, altLoader); try { - interfaces = new Class[] { altBarClass }; + interfaces = new Class<?>[] { altBarClass }; proxyClass = Proxy.getProxyClass(loader, interfaces); throw new RuntimeException( "proxy class created with interface " + @@ -121,8 +121,8 @@ /* * All non-public interfaces must be in the same package. */ - Class nonPublic1 = Bashful.class; - Class nonPublic2 = null; + Class<?> nonPublic1 = Bashful.class; + Class<?> nonPublic2 = null; String[] nonPublicInterfaces = new String[] { "java.awt.Conditional", "java.util.zip.ZipConstants", @@ -147,7 +147,7 @@ "no second non-public interface found for test"); } try { - interfaces = new Class[] { nonPublic1, nonPublic2 }; + interfaces = new Class<?>[] { nonPublic1, nonPublic2 }; proxyClass = Proxy.getProxyClass(loader, interfaces); throw new RuntimeException( "proxy class created with two non-public interfaces " + @@ -163,7 +163,7 @@ * parameter signature but different return type. */ try { - interfaces = new Class[] { Bar.class, Baz.class }; + interfaces = new Class<?>[] { Bar.class, Baz.class }; proxyClass = Proxy.getProxyClass(loader, interfaces); throw new RuntimeException( "proxy class created with conflicting methods");
--- a/jdk/test/java/lang/reflect/Proxy/returnTypes/Test.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/lang/reflect/Proxy/returnTypes/Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,7 @@ // additional test cases may be added to both of these lists: - private static final Class[][] GOOD = { + private static final Class<?>[][] GOOD = { { Collection.class }, { Iterable.class, Collection.class }, { Iterable.class, Collection.class, List.class }, @@ -51,7 +51,7 @@ GetArray.class } }; - private static final Class[][] BAD = { + private static final Class<?>[][] BAD = { { Runnable.class, PrivilegedAction.class }, { GetSerializable.class, GetCloneable.class }, { GetObject.class, GetSerializable.class, GetCloneable.class } @@ -60,12 +60,12 @@ public static void main(String[] args) throws Exception { System.err.println("\nRegression test for bug 4838310\n"); - ClassLoader loader = ClassLoader.getSystemClassLoader(); + ClassLoader loader = Test.class.getClassLoader(); System.err.println("Testing GOOD combinations:"); for (int i = 0; i < GOOD.length; i++) { - Class[] interfaces = GOOD[i]; + Class<?>[] interfaces = GOOD[i]; System.err.println(Arrays.asList(interfaces)); Proxy.getProxyClass(loader, interfaces); System.err.println("--- OK."); @@ -74,7 +74,7 @@ System.err.println("Testing BAD combinations:"); for (int i = 0; i < BAD.length; i++) { - Class[] interfaces = BAD[i]; + Class<?>[] interfaces = BAD[i]; System.err.println(Arrays.asList(interfaces)); try { Proxy.getProxyClass(loader, interfaces);
--- a/jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java Thu Jul 08 11:28:01 2010 -0700 @@ -22,7 +22,7 @@ */ /* @test - * @bug 4460583 4470470 4840199 6419424 6710579 6596323 6824135 + * @bug 4460583 4470470 4840199 6419424 6710579 6596323 6824135 6395224 * @summary Comprehensive test of asynchronous closing and interruption * @author Mark Reinhold */ @@ -88,6 +88,9 @@ } private static void pumpRefuser(String msg) throws IOException { + // Can't reliably saturate connection backlog on Windows Server editions + assert !TestUtil.onWindows(); + log.print(msg); int n = refuserClients.size(); @@ -203,9 +206,9 @@ = new ChannelFactory("DatagramChannel") { InterruptibleChannel create() throws IOException { DatagramChannel dc = DatagramChannel.open(); - dc.socket().bind(wildcardAddress); - InetAddress ia = InetAddress.getByName("127.0.0.1"); - dc.connect(new InetSocketAddress(ia, 80)); + InetAddress lb = InetAddress.getByName("127.0.0.1"); + dc.bind(new InetSocketAddress(lb, 0)); + dc.connect(new InetSocketAddress(lb, 80)); return dc; } }; @@ -636,7 +639,8 @@ wildcardAddress = new InetSocketAddress(InetAddress.getLocalHost(), 0); initAcceptor(); - initRefuser(); + if (!TestUtil.onWindows()) + initRefuser(); initPipes(); initFile(); @@ -658,8 +662,15 @@ // unclear under what conditions mmap(2) will actually block. test(connectedSocketChannelFactory); - test(socketChannelFactory, CONNECT); - test(socketChannelFactory, FINISH_CONNECT); + + if (TestUtil.onWindows()) { + log.println("WARNING Cannot reliably test connect/finishConnect" + + " operations on Windows"); + } else { + test(socketChannelFactory, CONNECT); + test(socketChannelFactory, FINISH_CONNECT); + } + test(serverSocketChannelFactory, ACCEPT); test(datagramChannelFactory); test(pipeSourceChannelFactory);
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java Thu Jul 08 11:28:01 2010 -0700 @@ -196,18 +196,16 @@ System.out.println("-- connect to non-existent host --"); - // test failure - InetAddress badHost = InetAddress.getByName("1.2.3.4"); - if (!badHost.isReachable(10*1000)) { - - ch = AsynchronousSocketChannel.open(); - try { - ch.connect(new InetSocketAddress(badHost, 9876)).get(); - throw new RuntimeException("Connection should not be established"); - } catch (ExecutionException x) { - } + // test that failure to connect closes the channel + ch = AsynchronousSocketChannel.open(); + try { + ch.connect(genSocketAddress()).get(); + } catch (ExecutionException x) { + // failed to establish connection if (ch.isOpen()) throw new RuntimeException("Channel should be closed"); + } finally { + ch.close(); } server.close(); @@ -219,27 +217,22 @@ AsynchronousSocketChannel ch; // asynchronous close while connecting - InetAddress rh = InetAddress.getByName("1.2.3.4"); - if (!rh.isReachable(3000)) { - InetSocketAddress isa = new InetSocketAddress(rh, 1234); + ch = AsynchronousSocketChannel.open(); + Future<Void> connectResult = ch.connect(genSocketAddress()); - ch = AsynchronousSocketChannel.open(); - Future<Void> result = ch.connect(isa); - - // give time to initiate the connect (SYN) - Thread.sleep(50); + // give time to initiate the connect (SYN) + Thread.sleep(50); - // close - ch.close(); + // close + ch.close(); - // check that AsynchronousCloseException is thrown - try { - result.get(); - throw new RuntimeException("Should not connect"); - } catch (ExecutionException x) { - if (!(x.getCause() instanceof AsynchronousCloseException)) - throw new RuntimeException(x); - } + // check that exception is thrown in timely manner + try { + connectResult.get(5, TimeUnit.SECONDS); + } catch (TimeoutException x) { + throw new RuntimeException("AsynchronousCloseException not thrown"); + } catch (ExecutionException x) { + // expected } System.out.println("-- asynchronous close when reading --"); @@ -785,30 +778,47 @@ ch.close(); } - // returns ByteBuffer with random bytes - static ByteBuffer genBuffer() { - int size = 1024 + rand.nextInt(16000); - byte[] buf = new byte[size]; - rand.nextBytes(buf); - boolean useDirect = rand.nextBoolean(); - if (useDirect) { - ByteBuffer bb = ByteBuffer.allocateDirect(buf.length); - bb.put(buf); - bb.flip(); - return bb; - } else { - return ByteBuffer.wrap(buf); - } - } + // returns ByteBuffer with random bytes + static ByteBuffer genBuffer() { + int size = 1024 + rand.nextInt(16000); + byte[] buf = new byte[size]; + rand.nextBytes(buf); + boolean useDirect = rand.nextBoolean(); + if (useDirect) { + ByteBuffer bb = ByteBuffer.allocateDirect(buf.length); + bb.put(buf); + bb.flip(); + return bb; + } else { + return ByteBuffer.wrap(buf); + } + } - // return ByteBuffer[] with random bytes - static ByteBuffer[] genBuffers(int max) { - int len = 1; - if (max > 1) - len += rand.nextInt(max); - ByteBuffer[] bufs = new ByteBuffer[len]; - for (int i=0; i<len; i++) - bufs[i] = genBuffer(); - return bufs; - } + // return ByteBuffer[] with random bytes + static ByteBuffer[] genBuffers(int max) { + int len = 1; + if (max > 1) + len += rand.nextInt(max); + ByteBuffer[] bufs = new ByteBuffer[len]; + for (int i=0; i<len; i++) + bufs[i] = genBuffer(); + return bufs; + } + + // return random SocketAddress + static SocketAddress genSocketAddress() { + StringBuilder sb = new StringBuilder("10."); + sb.append(rand.nextInt(256)); + sb.append('.'); + sb.append(rand.nextInt(256)); + sb.append('.'); + sb.append(rand.nextInt(256)); + InetAddress rh; + try { + rh = InetAddress.getByName(sb.toString()); + } catch (UnknownHostException x) { + throw new InternalError("Should not happen"); + } + return new InetSocketAddress(rh, rand.nextInt(65535)+1); + } }
--- a/jdk/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java Thu Jul 08 11:28:01 2010 -0700 @@ -22,6 +22,7 @@ */ /* @test + * @bug 4313882 4981129 * @summary Unit test for datagram-socket-channel adaptors * @library .. */ @@ -93,6 +94,11 @@ if (ip.getData()[ip.getOffset() + i] != op.getData()[op.getOffset() + i]) throw new Exception("Incorrect data received"); + + if (!(ip.getSocketAddress().equals(dst))) { + throw new Exception("Incorrect sender address, expected: " + dst + + " actual: " + ip.getSocketAddress()); + } } static void test(InetSocketAddress dst,
--- a/jdk/test/java/nio/channels/DatagramChannel/Connect.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/DatagramChannel/Connect.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,15 +42,15 @@ } static void test() throws Exception { - invoke(new Actor(), new Reactor()); + Reactor r = new Reactor(); + Actor a = new Actor(r.port()); + invoke(a, r); } static void invoke(Sprintable reader, Sprintable writer) throws Exception { Thread writerThread = new Thread(writer); writerThread.start(); - while (!writer.ready()) - Thread.sleep(50); Thread readerThread = new Thread(reader); readerThread.start(); @@ -64,34 +64,31 @@ public interface Sprintable extends Runnable { public void throwException() throws Exception; - public boolean ready(); } public static class Actor implements Sprintable { + final int port; Exception e = null; + Actor(int port) { + this.port = port; + } + public void throwException() throws Exception { if (e != null) throw e; } - private volatile boolean ready = false; - - public boolean ready() { - return ready; - } - public void run() { try { DatagramChannel dc = DatagramChannel.open(); - ready = true; // Send a message ByteBuffer bb = ByteBuffer.allocateDirect(256); bb.put("hello".getBytes()); bb.flip(); InetAddress address = InetAddress.getLocalHost(); - InetSocketAddress isa = new InetSocketAddress(address, 8888); + InetSocketAddress isa = new InetSocketAddress(address, port); dc.connect(isa); dc.write(bb); @@ -123,26 +120,26 @@ } public static class Reactor implements Sprintable { + final DatagramChannel dc; Exception e = null; + Reactor() throws IOException { + dc = DatagramChannel.open().bind(new InetSocketAddress(0)); + } + + int port() { + return dc.socket().getLocalPort(); + } + public void throwException() throws Exception { if (e != null) throw e; } - private volatile boolean ready = false; - - public boolean ready() { - return ready; - } - public void run() { try { // Listen for a message - DatagramChannel dc = DatagramChannel.open(); - dc.socket().bind(new InetSocketAddress(8888)); ByteBuffer bb = ByteBuffer.allocateDirect(100); - ready = true; SocketAddress sa = dc.receive(bb); bb.flip(); CharBuffer cb = Charset.forName("US-ASCII").
--- a/jdk/test/java/nio/channels/DatagramChannel/EmptyBuffer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/DatagramChannel/EmptyBuffer.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,18 +42,16 @@ } static void test() throws Exception { - Sprintable server = new Server(); + Server server = new Server(); Thread serverThread = new Thread(server); serverThread.start(); - while (!server.ready()) - Thread.sleep(50); DatagramChannel dc = DatagramChannel.open(); ByteBuffer bb = ByteBuffer.allocateDirect(12); bb.order(ByteOrder.BIG_ENDIAN); bb.putInt(1).putLong(1); bb.flip(); InetAddress address = InetAddress.getLocalHost(); - InetSocketAddress isa = new InetSocketAddress(address, 8888); + InetSocketAddress isa = new InetSocketAddress(address, server.port()); dc.connect(isa); dc.write(bb); bb.rewind(); @@ -65,24 +63,23 @@ server.throwException(); } - public interface Sprintable extends Runnable { - public void throwException() throws Exception; - public boolean ready(); - } + public static class Server implements Runnable { + final DatagramChannel dc; + Exception e = null; - public static class Server implements Sprintable { - Exception e = null; - private volatile boolean ready = false; + Server() throws IOException { + this.dc = DatagramChannel.open().bind(new InetSocketAddress(0)); + } - public void throwException() throws Exception { + int port() { + return dc.socket().getLocalPort(); + } + + void throwException() throws Exception { if (e != null) throw e; } - public boolean ready() { - return ready; - } - void showBuffer(String s, ByteBuffer bb) { log.println(s); bb.rewind(); @@ -97,9 +94,6 @@ SocketAddress sa = null; int numberReceived = 0; try { - DatagramChannel dc = DatagramChannel.open(); - dc.socket().bind(new InetSocketAddress(8888)); - ready = true; ByteBuffer bb = ByteBuffer.allocateDirect(12); bb.clear(); // Only one clear. The buffer will be full after
--- a/jdk/test/java/nio/channels/DatagramChannel/NoSender.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/DatagramChannel/NoSender.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,7 +33,7 @@ public class NoSender { public static void main(String argv[]) throws Exception { DatagramChannel dc = DatagramChannel.open(); - dc.socket().bind(new InetSocketAddress(5441)); + dc.socket().bind(new InetSocketAddress(0)); dc.configureBlocking(false); ByteBuffer buf1 = ByteBuffer.allocateDirect(256); SocketAddress sa1 = dc.receive(buf1);
--- a/jdk/test/java/nio/channels/DatagramChannel/SRTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/DatagramChannel/SRTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,16 +42,23 @@ } static void test() throws Exception { - invoke(new ClassicReader(), new ClassicWriter()); + ClassicReader classicReader; + NioReader nioReader; + + classicReader = new ClassicReader(); + invoke(classicReader, new ClassicWriter(classicReader.port())); log.println("Classic RW: OK"); - invoke(new ClassicReader(), new NioWriter()); + classicReader = new ClassicReader(); + invoke(classicReader, new NioWriter(classicReader.port())); log.println("Classic R, Nio W: OK"); - invoke(new NioReader(), new ClassicWriter()); + nioReader = new NioReader(); + invoke(nioReader, new ClassicWriter(nioReader.port())); log.println("Classic W, Nio R: OK"); - invoke(new NioReader(), new NioWriter()); + nioReader = new NioReader(); + invoke(nioReader, new NioWriter(nioReader.port())); log.println("Nio RW: OK"); } @@ -75,8 +82,13 @@ } public static class ClassicWriter implements Sprintable { + final int port; Exception e = null; + ClassicWriter(int port) { + this.port = port; + } + public void throwException() throws Exception { if (e != null) throw e; @@ -89,7 +101,7 @@ byte[] data = dataString.getBytes(); InetAddress address = InetAddress.getLocalHost(); DatagramPacket dp = new DatagramPacket(data, data.length, - address, 8888); + address, port); ds.send(dp); Thread.sleep(50); ds.send(dp); @@ -100,8 +112,13 @@ } public static class NioWriter implements Sprintable { + final int port; Exception e = null; + NioWriter(int port) { + this.port = port; + } + public void throwException() throws Exception { if (e != null) throw e; @@ -114,7 +131,7 @@ bb.put("hello".getBytes()); bb.flip(); InetAddress address = InetAddress.getLocalHost(); - InetSocketAddress isa = new InetSocketAddress(address, 8888); + InetSocketAddress isa = new InetSocketAddress(address, port); dc.send(bb, isa); Thread.sleep(50); dc.send(bb, isa); @@ -125,8 +142,17 @@ } public static class ClassicReader implements Sprintable { + final DatagramSocket ds; Exception e = null; + ClassicReader() throws IOException { + this.ds = new DatagramSocket(); + } + + int port() { + return ds.getLocalPort(); + } + public void throwException() throws Exception { if (e != null) throw e; @@ -136,7 +162,6 @@ try { byte[] buf = new byte[256]; DatagramPacket dp = new DatagramPacket(buf, buf.length); - DatagramSocket ds = new DatagramSocket(8888); ds.receive(dp); String received = new String(dp.getData()); log.println(received); @@ -148,8 +173,17 @@ } public static class NioReader implements Sprintable { + final DatagramChannel dc; Exception e = null; + NioReader() throws IOException { + this.dc = DatagramChannel.open().bind(new InetSocketAddress(0)); + } + + int port() { + return dc.socket().getLocalPort(); + } + public void throwException() throws Exception { if (e != null) throw e; @@ -157,8 +191,6 @@ public void run() { try { - DatagramChannel dc = DatagramChannel.open(); - dc.socket().bind(new InetSocketAddress(8888)); ByteBuffer bb = ByteBuffer.allocateDirect(100); SocketAddress sa = dc.receive(bb); bb.flip();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/nio/channels/DatagramChannel/SelectWhenRefused.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/* @test + * @bug 6935563 + * @summary Test that Selector does not select an unconnected DatagramChannel when + * ICMP port unreachable received + */ + +import java.nio.ByteBuffer; +import java.nio.channels.*; +import java.net.*; +import java.io.IOException; + +public class SelectWhenRefused { + + public static void main(String[] args) throws IOException { + DatagramChannel dc = DatagramChannel.open().bind(new InetSocketAddress(0)); + int port = dc.socket().getLocalPort(); + dc.close(); + + // datagram sent to this address should be refused + SocketAddress refuser = new InetSocketAddress(InetAddress.getLocalHost(), port); + + dc = DatagramChannel.open().bind(new InetSocketAddress(0)); + try { + dc.configureBlocking(false); + Selector sel = Selector.open(); + dc.register(sel, SelectionKey.OP_READ); + + /* Test 1: not connected so ICMP port unreachable should not be received */ + sendDatagram(dc, refuser); + int n = sel.select(2000); + if (n > 0) { + throw new RuntimeException("Unexpected wakeup"); + } + + /* Test 2: connected so ICMP port unreachable may be received */ + dc.connect(refuser); + try { + sendDatagram(dc, refuser); + n = sel.select(2000); + if (n > 0) { + sel.selectedKeys().clear(); + try { + n = dc.read(ByteBuffer.allocate(100)); + throw new RuntimeException("Unexpected datagram received"); + } catch (PortUnreachableException pue) { + // expected + } + } + } finally { + dc.disconnect(); + } + + /* Test 3: not connected so ICMP port unreachable should not be received */ + sendDatagram(dc, refuser); + n = sel.select(2000); + if (n > 0) { + throw new RuntimeException("Unexpected wakeup after disconnect"); + } + + } finally { + dc.close(); + } + } + + static void sendDatagram(DatagramChannel dc, SocketAddress remote) + throws IOException + { + ByteBuffer bb = ByteBuffer.wrap("Greetings!".getBytes()); + dc.send(bb, remote); + } +}
--- a/jdk/test/java/nio/channels/DatagramChannel/Sender.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/DatagramChannel/Sender.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,13 +42,11 @@ } static void test() throws Exception { - Sprintable server = new Server(); - Sprintable client = new Client(); + Server server = new Server(); + Client client = new Client(server.port()); Thread serverThread = new Thread(server); serverThread.start(); - while (!server.ready()) - Thread.sleep(50); Thread clientThread = new Thread(client); clientThread.start(); @@ -60,23 +58,17 @@ client.throwException(); } - public interface Sprintable extends Runnable { - public void throwException() throws Exception; - public boolean ready(); - } - - public static class Client implements Sprintable { + public static class Client implements Runnable { + final int port; Exception e = null; - public void throwException() throws Exception { - if (e != null) - throw e; + Client(int port) { + this.port = port; } - private volatile boolean ready = false; - - public boolean ready() { - return ready; + void throwException() throws Exception { + if (e != null) + throw e; } public void run() { @@ -87,7 +79,7 @@ bb.putInt(1).putLong(1); bb.flip(); InetAddress address = InetAddress.getLocalHost(); - InetSocketAddress isa = new InetSocketAddress(address, 8888); + InetSocketAddress isa = new InetSocketAddress(address, port); dc.connect(isa); dc.write(bb); } catch (Exception ex) { @@ -96,19 +88,23 @@ } } - public static class Server implements Sprintable { + public static class Server implements Runnable { + final DatagramChannel dc; Exception e = null; - private volatile boolean ready = false; + + Server() throws IOException { + dc = DatagramChannel.open().bind(new InetSocketAddress(0)); + } - public void throwException() throws Exception { + int port() { + return dc.socket().getLocalPort(); + } + + void throwException() throws Exception { if (e != null) throw e; } - public boolean ready() { - return ready; - } - void showBuffer(String s, ByteBuffer bb) { log.println(s); bb.rewind(); @@ -123,13 +119,10 @@ SocketAddress sa = null; try { - DatagramChannel dc = DatagramChannel.open(); - dc.socket().bind(new InetSocketAddress(8888)); - dc.configureBlocking(false); - ready = true; ByteBuffer bb = ByteBuffer.allocateDirect(12); bb.clear(); // Get the one valid datagram + dc.configureBlocking(false); while (sa == null) sa = dc.receive(bb); sa = null;
--- a/jdk/test/java/nio/channels/Selector/ByteServer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/Selector/ByteServer.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,7 +33,6 @@ public class ByteServer { - public static final int PORT = 31415; public static final String LOCALHOST = "localhost"; private int bytecount; private Socket socket; @@ -43,7 +42,11 @@ public ByteServer(int bytecount) throws Exception{ this.bytecount = bytecount; - serversocket = new ServerSocket(PORT); + serversocket = new ServerSocket(0); + } + + public int port() { + return serversocket.getLocalPort(); } public void start() {
--- a/jdk/test/java/nio/channels/Selector/CloseThenRegister.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/Selector/CloseThenRegister.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,17 +32,19 @@ public class CloseThenRegister { public static void main (String [] args) throws Exception { + Selector sel = Selector.open(); + sel.close(); + ServerSocketChannel ssc = ServerSocketChannel.open(); try { - Selector s = Selector.open(); - s.close(); - ServerSocketChannel c = ServerSocketChannel.open(); - c.socket().bind(new InetSocketAddress(40000)); - c.configureBlocking(false); - c.register(s, SelectionKey.OP_ACCEPT); + ssc.bind(new InetSocketAddress(0)); + ssc.configureBlocking(false); + ssc.register(sel, SelectionKey.OP_ACCEPT); + throw new RuntimeException("register after close does not cause CSE!"); } catch (ClosedSelectorException cse) { - return; + // expected + } finally { + ssc.close(); } - throw new RuntimeException("register after close does not cause CSE!"); } }
--- a/jdk/test/java/nio/channels/Selector/OpRead.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/Selector/OpRead.java Thu Jul 08 11:28:01 2010 -0700 @@ -24,59 +24,63 @@ /* @test * @bug 4755720 * @summary Test if OP_READ is detected with OP_WRITE in interestOps - * @library .. */ import java.net.*; -import java.io.*; import java.nio.*; import java.nio.channels.*; -import java.nio.channels.spi.SelectorProvider; import java.util.*; public class OpRead { - static final int DAYTIME_PORT = 13; - static final String DAYTIME_HOST = TestUtil.HOST; + static void test() throws Exception { + ServerSocketChannel ssc = null; + SocketChannel sc = null; + SocketChannel peer = null; + try { + ssc = ServerSocketChannel.open().bind(new InetSocketAddress(0)); - static void test() throws Exception { - InetSocketAddress isa - = new InetSocketAddress(InetAddress.getByName(DAYTIME_HOST), - DAYTIME_PORT); - SocketChannel sc = SocketChannel.open(); + // loopback connection + InetAddress lh = InetAddress.getLocalHost(); + sc = SocketChannel.open(new InetSocketAddress(lh, ssc.socket().getLocalPort())); + peer = ssc.accept(); - sc.connect(isa); - - sc.configureBlocking(false); + // peer sends message so that "sc" will be readable + int n = peer.write(ByteBuffer.wrap("Hello".getBytes())); + assert n > 0; - Selector selector = SelectorProvider.provider().openSelector(); - SelectionKey key = sc.register(selector, SelectionKey.OP_READ | - SelectionKey.OP_WRITE); + sc.configureBlocking(false); - boolean done = false; - int failCount = 0; - while (!done) { - if (selector.select() > 0) { - Set keys = selector.selectedKeys(); - Iterator iterator = keys.iterator(); - while (iterator.hasNext()) { - key = (SelectionKey)iterator.next(); - iterator.remove(); - if (key.isWritable()) { - failCount++; - if (failCount > 10) - throw new RuntimeException("Test failed"); - Thread.sleep(100); - } - if (key.isReadable()) { - done = true; + Selector selector = Selector.open(); + SelectionKey key = sc.register(selector, SelectionKey.OP_READ | + SelectionKey.OP_WRITE); + + boolean done = false; + int failCount = 0; + while (!done) { + if (selector.select() > 0) { + Set<SelectionKey> keys = selector.selectedKeys(); + Iterator<SelectionKey> iterator = keys.iterator(); + while (iterator.hasNext()) { + key = iterator.next(); + iterator.remove(); + if (key.isWritable()) { + failCount++; + if (failCount > 10) + throw new RuntimeException("Test failed"); + Thread.sleep(250); + } + if (key.isReadable()) { + done = true; + } } } } + } finally { + if (peer != null) peer.close(); + if (sc != null) sc.close(); + if (ssc != null) ssc.close(); } - - - sc.close(); } public static void main(String[] args) throws Exception {
--- a/jdk/test/java/nio/channels/Selector/ReadAfterConnect.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/Selector/ReadAfterConnect.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,7 +37,7 @@ ByteServer server = new ByteServer(0); // server: accept connection and do nothing server.start(); InetSocketAddress isa = new InetSocketAddress( - InetAddress.getByName(ByteServer.LOCALHOST), ByteServer.PORT); + InetAddress.getByName(ByteServer.LOCALHOST), server.port()); Selector sel = Selector.open(); SocketChannel sc = SocketChannel.open(); sc.connect(isa);
--- a/jdk/test/java/nio/channels/Selector/SelectAfterRead.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/Selector/SelectAfterRead.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,14 +37,14 @@ final static int TIMEOUT = 1000; public static void main(String[] argv) throws Exception { + InetAddress lh = InetAddress.getByName(ByteServer.LOCALHOST); + // server: accept connection and write one byte ByteServer server = new ByteServer(1); server.start(); - InetSocketAddress isa = new InetSocketAddress( - InetAddress.getByName(ByteServer.LOCALHOST), ByteServer.PORT); Selector sel = Selector.open(); SocketChannel sc = SocketChannel.open(); - sc.connect(isa); + sc.connect(new InetSocketAddress(lh, server.port())); sc.read(ByteBuffer.allocate(1)); sc.configureBlocking(false); sc.register(sel, SelectionKey.OP_READ); @@ -61,7 +61,7 @@ server = new ByteServer(2); server.start(); sc = SocketChannel.open(); - sc.connect(isa); + sc.connect(new InetSocketAddress(lh, server.port())); sc.configureBlocking(false); sel = Selector.open(); sc.register(sel, SelectionKey.OP_READ);
--- a/jdk/test/java/nio/channels/Selector/SelectWrite.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/Selector/SelectWrite.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,7 +39,7 @@ // server: accept connection and do nothing server.start(); InetSocketAddress isa = new InetSocketAddress( - InetAddress.getByName(ByteServer.LOCALHOST), ByteServer.PORT); + InetAddress.getByName(ByteServer.LOCALHOST), server.port()); Selector sel = Selector.open(); SocketChannel sc = SocketChannel.open(); sc.connect(isa);
--- a/jdk/test/java/nio/channels/SocketChannel/BigReadWrite.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/SocketChannel/BigReadWrite.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,7 +32,6 @@ public class BigReadWrite { - static int port = 40170; static int testSize = 15; public static void main(String[] args) throws Exception {
--- a/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/SocketChannel/OpenLeak.java Thu Jul 08 11:28:01 2010 -0700 @@ -25,6 +25,8 @@ * @bug 6548464 * @summary SocketChannel.open(SocketAddress) leaks file descriptor if * connection cannot be established + * @build OpenLeak + * @run main/othervm OpenLeak */ import java.net.InetAddress;
--- a/jdk/test/java/nio/channels/SocketChannel/VectorIO.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/SocketChannel/VectorIO.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,6 @@ public class VectorIO { - static int port = 40170; - static Random generator = new Random(); static int testSize; @@ -55,20 +53,12 @@ System.err.println("Length " + testSize); Server sv = new Server(testSize); sv.start(); - do { - try { - Thread.currentThread().sleep(200); - } catch (InterruptedException x) { - if (sv.finish(8000) == 0) - throw new Exception("Failed: Error in server thread"); - } - } while (!sv.ready); - bufferTest(); + bufferTest(sv.port()); if (sv.finish(8000) == 0) throw new Exception("Failed: Length = " + testSize); } - static void bufferTest() throws Exception { + static void bufferTest(int port) throws Exception { ByteBuffer[] bufs = new ByteBuffer[testSize]; for(int i=0; i<testSize; i++) { String source = "buffer" + i; @@ -105,17 +95,19 @@ static class Server extends TestThread { - static int port = 40170; - static Random generator = new Random(); - int testSize; + final int testSize; + final ServerSocketChannel ssc; - volatile boolean ready = false; - - Server(int testSize) { + Server(int testSize) throws IOException { super("Server " + testSize); this.testSize = testSize; + this.ssc = ServerSocketChannel.open().bind(new InetSocketAddress(0)); + } + + int port() { + return ssc.socket().getLocalPort(); } void go() throws Exception { @@ -133,16 +125,11 @@ } // Get a connection from client - ServerSocketChannel ssc = ServerSocketChannel.open(); SocketChannel sc = null; try { ssc.configureBlocking(false); - InetAddress lh = InetAddress.getLocalHost(); - InetSocketAddress isa = new InetSocketAddress(lh, port); - ssc.socket().bind(isa); - ready = true; for (;;) { sc = ssc.accept();
--- a/jdk/test/java/nio/channels/SocketChannel/Write.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/SocketChannel/Write.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,6 @@ public class Write { - static int port = 40170; - static Random generator = new Random(); static int testSize = 15; @@ -46,20 +44,12 @@ public static void main(String[] args) throws Exception { WriteServer sv = new WriteServer(); sv.start(); - do { - try { - Thread.currentThread().sleep(200); - } catch (InterruptedException x) { - if (sv.finish(8000) == 0) - throw new Exception("Failed: Error in server thread"); - } - } while (!sv.ready); - bufferTest(); + bufferTest(sv.port()); if (sv.finish(8000) == 0) throw new Exception("Failed" ); } - static void bufferTest() throws Exception { + static void bufferTest(int port) throws Exception { ByteBuffer[] bufs = new ByteBuffer[testSize]; for(int i=0; i<testSize; i++) { String source = @@ -94,14 +84,18 @@ class WriteServer extends TestThread { - static int port = 40170; - static Random generator = new Random(); - volatile boolean ready = false; + + final ServerSocketChannel ssc; - WriteServer() { + WriteServer() throws IOException { super("WriteServer"); + this.ssc = ServerSocketChannel.open().bind(new InetSocketAddress(0)); + } + + int port() { + return ssc.socket().getLocalPort(); } void go() throws Exception { @@ -112,15 +106,10 @@ ByteBuffer buf = ByteBuffer.allocateDirect(5); // Get a connection from client - ServerSocketChannel ssc = ServerSocketChannel.open(); SocketChannel sc = null; try { ssc.configureBlocking(false); - InetAddress lh = InetAddress.getLocalHost(); - InetSocketAddress isa = new InetSocketAddress(lh, port); - ssc.socket().bind(isa); - ready = true; for (;;) { sc = ssc.accept();
--- a/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -141,7 +141,7 @@ // and receive the echo byte b[] = new byte[msg.length() + 100]; DatagramPacket pkt2 = new DatagramPacket(b, b.length); - dc.socket().setSoTimeout(2000); + dc.socket().setSoTimeout(5000); dc.socket().receive(pkt2); if (pkt2.getLength() != msg.length()) {
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Test.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/ResourceBundle/Bug4168625Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -427,9 +427,11 @@ private boolean network = false; public SimpleLoader() { + super(SimpleLoader.class.getClassLoader()); this.network = false; } public SimpleLoader(boolean simulateNetworkLoad) { + super(SimpleLoader.class.getClassLoader()); this.network = simulateNetworkLoad; } public Class loadClass(final String className, final boolean resolveIt) @@ -444,7 +446,7 @@ } catch (java.lang.InterruptedException e) { } } - result = super.findSystemClass(className); + result = getParent().loadClass(className); if ((result != null) && resolveIt) { resolveClass(result); } @@ -460,11 +462,13 @@ private String[] classesToWaitFor; public Loader() { + super(Loader.class.getClassLoader()); classesToLoad = new String[0]; classesToWaitFor = new String[0]; } public Loader(final String[] classesToLoadIn, final String[] classesToWaitForIn) { + super(Loader.class.getClassLoader()); classesToLoad = classesToLoadIn; classesToWaitFor = classesToWaitForIn; } @@ -540,10 +544,12 @@ } /** - * Delegate loading to the system loader + * Delegate loading to its parent class loader that loads the test classes. + * In othervm mode, the parent class loader is the system class loader; + * in samevm mode, the parent class loader is the jtreg URLClassLoader. */ private Class loadFromSystem(String className) throws ClassNotFoundException { - return super.findSystemClass(className); + return getParent().loadClass(className); } public void logClasses(String title) {
--- a/jdk/test/java/util/ResourceBundle/Bug6359330.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/ResourceBundle/Bug6359330.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,6 +26,7 @@ * @summary Make sure that getBundle doesn't cause a security error * with a security manager when instantialing RBClassLoader (internal * classloader). + * @run main/othervm Bug6359330 */ import javax.xml.parsers.SAXParser;
--- a/jdk/test/java/util/ResourceBundle/Test4300693.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/ResourceBundle/Test4300693.java Thu Jul 08 11:28:01 2010 -0700 @@ -22,6 +22,7 @@ */ /* @test + @ignore 6876961 @summary test that ResourceBundle.getBundle can be called recursively @build Test4300693RB @run main Test4300693
--- a/jdk/test/java/util/ResourceBundle/TestBug4179766.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/ResourceBundle/TestBug4179766.java Thu Jul 08 11:28:01 2010 -0700 @@ -209,6 +209,7 @@ * Create a new loader */ public Loader(boolean sameHash) { + super(Loader.class.getClassLoader()); if (sameHash) { thisHashCode = SAME_HASH_CODE; } else { @@ -287,7 +288,7 @@ */ private Class loadFromSystem(String className) throws ClassNotFoundException { try { - Class result = super.findSystemClass(className); + Class result = getParent().loadClass(className); printInfo(" ***Returning system class: "+className, result); return result; } catch (ClassNotFoundException e) {
--- a/jdk/test/java/util/logging/ParentLoggersTest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/logging/ParentLoggersTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,7 +40,19 @@ static final String LOGGER_NAME_1 = PARENT_NAME_1 + ".myLogger"; static final String LOGGER_NAME_2 = PARENT_NAME_2 + ".myBar.myLogger"; + static final List<String> initialLoggerNames = new ArrayList<String>(); public static void main(String args[]) throws Exception { + // cache the initial set of loggers before this test begins + // to add any loggers + Enumeration<String> e = logMgr.getLoggerNames(); + List<String> defaultLoggers = getDefaultLoggerNames(); + while (e.hasMoreElements()) { + String logger = e.nextElement(); + if (!defaultLoggers.contains(logger)) { + initialLoggerNames.add(logger); + } + }; + String tstSrc = System.getProperty(TST_SRC_PROP); File fname = new File(tstSrc, LM_PROP_FNAME); String prop = fname.getCanonicalPath(); @@ -56,12 +68,12 @@ } } - public static Vector getDefaultLoggerNames() { - Vector expectedLoggerNames = new Vector(0); + public static List<String> getDefaultLoggerNames() { + List<String> expectedLoggerNames = new ArrayList<String>(); // LogManager always creates two loggers: - expectedLoggerNames.addElement(""); // root logger: "" - expectedLoggerNames.addElement("global"); // global logger: "global" + expectedLoggerNames.add(""); // root logger: "" + expectedLoggerNames.add("global"); // global logger: "global" return expectedLoggerNames; } @@ -71,7 +83,7 @@ */ public static boolean checkLoggers() { String failMsg = "# checkLoggers: getLoggerNames() returned unexpected loggers"; - Vector expectedLoggerNames = getDefaultLoggerNames(); + Vector<String> expectedLoggerNames = new Vector<String>(getDefaultLoggerNames()); // Create the logger LOGGER_NAME_1 Logger logger1 = Logger.getLogger(LOGGER_NAME_1); @@ -83,18 +95,23 @@ expectedLoggerNames.addElement(PARENT_NAME_2); expectedLoggerNames.addElement(LOGGER_NAME_2); - Enumeration returnedLoggersEnum = logMgr.getLoggerNames(); - Vector returnedLoggerNames = new Vector(0); + Enumeration<String> returnedLoggersEnum = logMgr.getLoggerNames(); + Vector<String> returnedLoggerNames = new Vector<String>(0); while (returnedLoggersEnum.hasMoreElements()) { - returnedLoggerNames.addElement(returnedLoggersEnum.nextElement()); + String logger = returnedLoggersEnum.nextElement(); + if (!initialLoggerNames.contains(logger)) { + // filter out the loggers that have been added before this test runs + returnedLoggerNames.addElement(logger); + } + }; return checkNames(expectedLoggerNames, returnedLoggerNames, failMsg); } // Returns boolean values: PASSED or FAILED - private static boolean checkNames(Vector expNames, - Vector retNames, + private static boolean checkNames(Vector<String> expNames, + Vector<String> retNames, String failMsg) { boolean status = PASSED; @@ -123,8 +140,8 @@ return status; } - private static void printFailMsg(Vector expNames, - Vector retNames, + private static void printFailMsg(Vector<String> expNames, + Vector<String> retNames, String failMsg) { out.println(); out.println(failMsg);
--- a/jdk/test/java/util/zip/InfoZip.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/zip/InfoZip.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -103,19 +103,25 @@ os.close(); ZipFile zf = new ZipFile(f); - Enumeration<? extends ZipEntry> entries = zf.entries(); - ZipEntry ze = entries.nextElement(); - check(! entries.hasMoreElements()); - checkZipEntry(ze, contents(zf, ze)); - zf.close(); + ZipEntry ze = null; + try { + Enumeration<? extends ZipEntry> entries = zf.entries(); + ze = entries.nextElement(); + check(! entries.hasMoreElements()); + checkZipEntry(ze, contents(zf, ze)); + } finally { + zf.close(); + } ZipInputStream is = new ZipInputStream(new FileInputStream(f)); - ze = is.getNextEntry(); - checkZipEntry(ze, contents(is)); - check(is.getNextEntry() == null); - + try { + ze = is.getNextEntry(); + checkZipEntry(ze, contents(is)); + check(is.getNextEntry() == null); + } finally { + is.close(); + } f.delete(); - System.out.printf("passed = %d, failed = %d%n", passed, failed); if (failed > 0) throw new Exception("Some tests failed"); }
--- a/jdk/test/java/util/zip/ZipFile/Comment.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/zip/ZipFile/Comment.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -58,13 +58,16 @@ throws IOException { ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(name)); - zos.setComment(comment); - ZipEntry ze = new ZipEntry(entryName); - ze.setMethod(ZipEntry.DEFLATED); - zos.putNextEntry(ze); - new DataOutputStream(zos).writeUTF(entryContents); - zos.closeEntry(); - zos.close(); + try { + zos.setComment(comment); + ZipEntry ze = new ZipEntry(entryName); + ze.setMethod(ZipEntry.DEFLATED); + zos.putNextEntry(ze); + new DataOutputStream(zos).writeUTF(entryContents); + zos.closeEntry(); + } finally { + zos.close(); + } } private static void verifyZipFile(String name, String comment) @@ -91,6 +94,8 @@ file.seek(file.length() - comment.length()); byte [] bytes = new byte [comment.length()]; file.readFully(bytes); + zipFile.close(); + file.close(); if (! comment.equals(new String(bytes, "UTF8"))) throw new Exception("Zip file comment corrupted"); }
--- a/jdk/test/java/util/zip/ZipFile/CorruptedZipFiles.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/zip/ZipFile/CorruptedZipFiles.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -47,13 +47,14 @@ } public static void main(String[] args) throws Exception { - ZipOutputStream zos = new ZipOutputStream( - new FileOutputStream("x.zip")); - ZipEntry e = new ZipEntry("x"); - zos.putNextEntry(e); - zos.write((int)'x'); - zos.close(); - zos = null; + ZipOutputStream zos = new ZipOutputStream(new FileOutputStream("x.zip")); + try { + ZipEntry e = new ZipEntry("x"); + zos.putNextEntry(e); + zos.write((int)'x'); + } finally { + zos.close(); + } int len = (int)(new File("x.zip").length()); byte[] good = new byte[len]; @@ -153,12 +154,15 @@ fos.write(data); fos.close(); ZipFile zf = new ZipFile(zipName); - if (getInputStream) { - InputStream is = zf.getInputStream(new ZipEntry("x")); - is.read(); + try { + if (getInputStream) { + InputStream is = zf.getInputStream(new ZipEntry("x")); + is.read(); + } + } finally { + zf.close(); } fail("Failed to throw expected ZipException"); - zf.close(); } catch (ZipException e) { if (e.getMessage().matches(msgPattern)) passed++;
--- a/jdk/test/java/util/zip/ZipFile/ManyEntries.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/java/util/zip/ZipFile/ManyEntries.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -55,52 +55,58 @@ File zipFile = new File(++uniquifier + ".zip"); try { zipFile.delete(); - ZipOutputStream zos = - new ZipOutputStream( - new BufferedOutputStream( - new FileOutputStream(zipFile))); - for (int i = 0; i < N; i++) { - ZipEntry e = new ZipEntry("DIR/"+i); - e.setMethod(method); - e.setTime(time); - if (method == ZipEntry.STORED) { - e.setSize(1); - crc32.reset(); - crc32.update((byte)i); - e.setCrc(crc32.getValue()); - } else { - e.setSize(0); - e.setCrc(0); + ZipOutputStream zos = new ZipOutputStream( + new BufferedOutputStream( + new FileOutputStream(zipFile))); + try { + for (int i = 0; i < N; i++) { + ZipEntry e = new ZipEntry("DIR/"+i); + e.setMethod(method); + e.setTime(time); + if (method == ZipEntry.STORED) { + e.setSize(1); + crc32.reset(); + crc32.update((byte)i); + e.setCrc(crc32.getValue()); + } else { + e.setSize(0); + e.setCrc(0); + } + zos.putNextEntry(e); + zos.write(i); } - zos.putNextEntry(e); - zos.write(i); + } finally { + zos.close(); + zos = null; } - zos.close(); - zos = null; - ZipFile zip = new ZipFile(zipFile); - if (! (zip.size() == N)) - throw new Exception("Bad ZipFile size: " + zip.size()); - Enumeration entries = zip.entries(); + ZipFile zip = zip = new ZipFile(zipFile); + try { + if (! (zip.size() == N)) + throw new Exception("Bad ZipFile size: " + zip.size()); + Enumeration entries = zip.entries(); - for (int i = 0; i < N; i++) { - if (i % 1000 == 0) {System.gc(); System.runFinalization();} - if (! (entries.hasMoreElements())) - throw new Exception("only " + i + " elements"); - ZipEntry e = (ZipEntry)entries.nextElement(); - if (! (e.getSize() == 1)) - throw new Exception("bad size: " + e.getSize()); - if (! (e.getName().equals("DIR/" + i))) - throw new Exception("bad name: " + i); - if (! (e.getMethod() == method)) - throw new Exception("getMethod="+e.getMethod()+", method=" + method); - if (! (e.getTime() == time)) - throw new Exception("getTime="+e.getTime()+", time=" + time); - if (! (zip.getInputStream(e).read() == (i & 0xff))) - throw new Exception("Bad file contents: " + i); + for (int i = 0; i < N; i++) { + if (i % 1000 == 0) {System.gc(); System.runFinalization();} + if (! (entries.hasMoreElements())) + throw new Exception("only " + i + " elements"); + ZipEntry e = (ZipEntry)entries.nextElement(); + if (! (e.getSize() == 1)) + throw new Exception("bad size: " + e.getSize()); + if (! (e.getName().equals("DIR/" + i))) + throw new Exception("bad name: " + i); + if (! (e.getMethod() == method)) + throw new Exception("getMethod="+e.getMethod()+", method=" + method); + if (! (e.getTime() == time)) + throw new Exception("getTime="+e.getTime()+", time=" + time); + if (! (zip.getInputStream(e).read() == (i & 0xff))) + throw new Exception("Bad file contents: " + i); + } + if (entries.hasMoreElements()) + throw new Exception("too many elements"); + } finally { + zip.close(); } - if (entries.hasMoreElements()) - throw new Exception("too many elements"); } finally { zipFile.delete();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/JTable/6788484/bug6788484.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* @test + @bug 6788484 + @summary NPE in DefaultTableCellHeaderRenderer.getColumnSortOrder() with null table + @author Alexander Potochkin + @run main bug6788484 +*/ +import sun.swing.table.DefaultTableCellHeaderRenderer; + +import javax.swing.*; + +public class bug6788484 { + + public static void main(String[] args) throws Exception { + DefaultTableCellHeaderRenderer.getColumnSortOrder(null, 0); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/plaf/synth/6771547/SynthTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/** + * @test + * @bug 6771547 + * @author Alexander Potochkin + * @summary SynthParser throws StringIndexOutOfBoundsException parsing custom ColorTypes + */ + +import javax.swing.plaf.synth.SynthLookAndFeel; +import javax.swing.*; +import java.io.InputStream; +import java.awt.*; + +public class SynthTest { + + public static void main(String[] args) throws Exception { + SynthLookAndFeel laf = new SynthLookAndFeel(); + InputStream in = SynthTest.class.getResourceAsStream( + "synthconfig.xml"); + laf.load(in, SynthTest.class); + + UIManager.setLookAndFeel(laf); + + if (!Color.RED.equals(new JButton().getForeground())) { + throw new RuntimeException("The wrong foreground color!"); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/plaf/synth/6771547/synthconfig.xml Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,10 @@ +<synth> + <style id="button"> + <font name="Verdana" size="16"/> + <state> + <color value="RED" + type="javax.swing.plaf.synth.ColorType.FOREGROUND"/> + </state> + </style> + <bind style="button" type="region" key="button"/> +</synth>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,59 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/** + * @test + * @bug 6739756 + * @author Alexander Potochkin + * @summary JToolBar leaves space for non-visible items under Nimbus L&F + * @run main bug6739756 + */ + +import javax.swing.*; +import java.awt.*; + +public class bug6739756 { + + public static void main(String[] args) throws Exception { + try { + UIManager.setLookAndFeel( + "com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel"); + } + catch (Exception e) { + e.printStackTrace(); + return; + } + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + JToolBar tb = new JToolBar(); + Dimension preferredSize = tb.getPreferredSize(); + JButton button = new JButton("Test"); + button.setVisible(false); + tb.add(button); + if (!preferredSize.equals(tb.getPreferredSize())) { + throw new RuntimeException("Toolbar's preferredSize is wrong"); + } + } + }); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,152 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/* + * @test + * @bug 6636983 + * @summary test that composed text at the line starts is handled correctly + * @author Sergey Groznyh + * @run main bug6636983 + */ + +import sun.swing.SwingUtilities2; + +import javax.swing.*; +import javax.swing.text.*; +import javax.swing.text.html.HTMLDocument; +import java.awt.*; +import java.awt.event.InputMethodEvent; +import java.awt.event.KeyEvent; +import java.text.AttributedString; + +public class bug6636983 { + private Robot robot; + + private final AttributedString Hiragana_A = new AttributedString("\u3042"); + + void sendInputMethodEvent() { + InputMethodEvent ime = new InputMethodEvent( + ep, + InputMethodEvent.INPUT_METHOD_TEXT_CHANGED, + Hiragana_A.getIterator(), + 0, + null, + null); + ep.dispatchEvent(ime); + } + + void checkComposedTextRun() { + HTMLDocument d = (HTMLDocument) ep.getDocument(); + ElementIterator it = new ElementIterator(d.getDefaultRootElement()); + + while (true) { + Element e = it.next(); + if (e == null) { + throw new RuntimeException("no composed text found"); + } + AttributeSet a = e.getAttributes(); + if (a.isDefined(StyleConstants.ComposedTextAttribute)) { + if (!AbstractDocument.ContentElementName.equals(a.getAttribute(StyleConstants.NameAttribute))) { + throw new RuntimeException("AbstractDocument.ContentElementName.equals(a.getAttribute(StyleConstants.NameAttribute)) is false"); + } + + if (a.isDefined(SwingUtilities2.IMPLIED_CR)) { + throw new RuntimeException("a.isDefined(SwingUtilities2.IMPLIED_CR) is true"); + } + + return; + } + } + + } + + JEditorPane ep; + + void initAtParagraphStart() { + ep.setText("A<p>B"); + hitKey(KeyEvent.VK_LEFT); + } + + void sendAtParagraphStart() { + sendInputMethodEvent(); + } + + void checkAtParagraphStart() { + checkComposedTextRun(); + } + + void initAfterBRElement() { + ep.setText("A<br>B"); + hitKey(KeyEvent.VK_LEFT); + } + + void sendAtBRElement() { + sendInputMethodEvent(); + } + + void checkAtBrElement() { + checkComposedTextRun(); + } + + private void hitKey(int keycode) { + robot.keyPress(keycode); + robot.keyRelease(keycode); + robot.delay(550); // The magic number equals JRobot.DEFAULT_DELAY + } + + private void run() throws Exception { + robot = new Robot(); + + ep = new JEditorPane(); + ep.setContentType("text/html"); + ep.setPreferredSize(new Dimension(100, 100)); + + JFrame frame = new JFrame("Test: " + getClass().getName()); + + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.add(ep); + frame.setVisible(true); + } + + public static void main(String[] args) throws Throwable { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + try { + bug6636983 bug6636983 = new bug6636983(); + + bug6636983.run(); + bug6636983.initAtParagraphStart(); + bug6636983.sendAtParagraphStart(); + bug6636983.checkAtParagraphStart(); + bug6636983.initAfterBRElement(); + bug6636983.sendAtBRElement(); + bug6636983.checkAtBrElement(); + + System.out.println("OK"); + } catch (Exception e) { + throw new RuntimeException("The test failed", e); + } + } + }); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,87 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +import javax.swing.text.*; + +class StubBranchElement implements Element { + Document document = new DefaultStyledDocument(); + String context; + Element[] children = new StubLeafElement[3]; + + public StubBranchElement(String context) { + this.context = context; + int len = context.length() / 3; + for (int i = 0; i < 3; i++) { + children[i] = new StubLeafElement( + context.substring(len * i, len * (i + 1)), this, len * i); + } + try { + document.insertString(0, context, new SimpleAttributeSet()); + } catch (BadLocationException e) { + } + } + + public Document getDocument() { + return document; + } + + public Element getParentElement() { + return null; + } + + public String getName() { + return "StubBranchElement"; + } + + public AttributeSet getAttributes() { + return new SimpleAttributeSet(); + } + + public int getStartOffset() { + return 0; + } + + public int getEndOffset() { + return document.getLength(); + } + + public int getElementIndex(int offset) { + return offset / 3; + } + + public int getElementCount() { + return 3; + } + + public Element getElement(int index) { + return children[index]; + } + + public boolean isLeaf() { + return false; + } + + public Element[] getChildren() { + return children; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,81 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +import javax.swing.text.*; + +class StubLeafElement implements Element { + Document document = new DefaultStyledDocument(); + String context; + Element parent; + int position; + + public StubLeafElement(String context, Element parent, int position) { + this.context = context; + this.parent = parent; + this.position = position; + try { + document.insertString(0, context, new SimpleAttributeSet()); + } catch (BadLocationException e) { + } + } + + public Document getDocument() { + return document; + } + + public Element getParentElement() { + return parent; + } + + public String getName() { + return "StubLeafElement"; + } + + public AttributeSet getAttributes() { + return new SimpleAttributeSet(); + } + + public int getStartOffset() { + return position; + } + + public int getEndOffset() { + return position + document.getLength(); + } + + public int getElementIndex(int offset) { + return 0; + } + + public int getElementCount() { + return 0; + } + + public Element getElement(int index) { + return this; + } + + public boolean isLeaf() { + return true; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/swing/text/WrappedPlainView/6857057/bug6857057.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,59 @@ +/* + * Copyright 2010 Sun Microsystems, Inc. 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. + * + * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6857057 + * @summary test that the JCK GlyphView2021 test doesn't fail + * @author Sergey Groznyh + * @run main bug6857057 + */ + +import javax.swing.*; +import javax.swing.text.Element; +import javax.swing.text.GlyphView; +import javax.swing.text.View; + +public class bug6857057 { + + bug6857057() { + Element elem = new StubBranchElement(" G L Y P H V"); + GlyphView view = new GlyphView(elem); + float pos = elem.getStartOffset(); + float len = elem.getEndOffset() - pos; + int res = view.getBreakWeight(View.X_AXIS, pos, len); + if (res != View.ExcellentBreakWeight) { + throw new RuntimeException("breakWeight != ExcellentBreakWeight"); + } + } + + public static void main(String[] args) throws Throwable { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + new bug6857057(); + } + }); + + System.out.println("OK"); + } +}
--- a/jdk/test/sun/jvmstat/testlibrary/utils.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/jvmstat/testlibrary/utils.sh Thu Jul 08 11:28:01 2010 -0700 @@ -189,3 +189,37 @@ echo "Error sending term signal to ${kpid}!" fi } + +# check to see if a port is free +checkPort() # port +{ + inuse=`netstat -a | egrep "\.$1"` + if [ "${inuse}" = "" ] ; then + echo "free" + else + echo "inuse" + fi +} + +# Get a free port, where port+1 is also free, return 0 when giving up +freePort() +{ + start=3000 + while [ ${start} -lt 3030 ] ; do + port1=`expr ${start} '+' $$ '%' 1000` + port2=`expr ${port1} '+' 1` + if [ "`checkPort ${port1}`" = "inuse" \ + -o "`checkPort ${port2}`" = "inuse" ] ; then + start=`expr ${start} '+' 1` + else + break + fi + done + if [ "`checkPort ${port1}`" = "inuse" \ + -o "`checkPort ${port2}`" = "inuse" ] ; then + port1="0" + fi + echo "${port1}" +} + +
--- a/jdk/test/sun/security/krb5/auto/Context.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/security/krb5/auto/Context.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,6 +42,7 @@ import com.sun.security.jgss.ExtendedGSSContext; import com.sun.security.jgss.InquireType; import com.sun.security.jgss.AuthorizationDataEntry; +import java.io.File; /** * Context of a JGSS subject, encapsulating Subject and GSSContext. @@ -107,7 +108,8 @@ * Logins with a username and a password, using Krb5LoginModule directly * @param storeKey true if key should be saved, used on acceptor side */ - public static Context fromUserPass(String user, char[] pass, boolean storeKey) throws Exception { + public static Context fromUserPass(String user, char[] pass, boolean storeKey) + throws Exception { Context out = new Context(); out.name = user; out.s = new Subject(); @@ -137,6 +139,33 @@ } /** + * Logins with a username and a keytab, using Krb5LoginModule directly + * @param storeKey true if key should be saved, used on acceptor side + */ + public static Context fromUserKtab(String user, String ktab, boolean storeKey) + throws Exception { + Context out = new Context(); + out.name = user; + out.s = new Subject(); + Krb5LoginModule krb5 = new Krb5LoginModule(); + Map<String, String> map = new HashMap<String, String>(); + + map.put("doNotPrompt", "true"); + map.put("useTicketCache", "false"); + map.put("useKeyTab", "true"); + map.put("keyTab", ktab); + map.put("principal", user); + if (storeKey) { + map.put("storeKey", "true"); + } + + krb5.initialize(out.s, null, null, map); + krb5.login(); + krb5.commit(); + return out; + } + + /** * Starts as a client * @param target communication peer * @param mech GSS mech
--- a/jdk/test/sun/security/krb5/auto/KDC.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/security/krb5/auto/KDC.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,6 +35,7 @@ import sun.security.krb5.*; import sun.security.krb5.internal.*; import sun.security.krb5.internal.ccache.CredentialsCache; +import sun.security.krb5.internal.crypto.EType; import sun.security.krb5.internal.crypto.KeyUsage; import sun.security.krb5.internal.ktab.KeyTab; import sun.security.util.DerInputStream; @@ -153,6 +154,14 @@ * Whether pre-authentication is required. Default Boolean.TRUE */ PREAUTH_REQUIRED, + /** + * Only issue TGT in RC4 + */ + ONLY_RC4_TGT, + /** + * Only use RC4 in preauth, enc-type still using eTypes[0] + */ + ONLY_RC4_PREAUTH, }; static { @@ -743,13 +752,25 @@ Field f = KDCReqBody.class.getDeclaredField("eType"); f.setAccessible(true); eTypes = (int[])f.get(body); - if (eTypes.length < 2) { - throw new KrbException(Krb5.KDC_ERR_ETYPE_NOSUPP); - } int eType = eTypes[0]; EncryptionKey ckey = keyForUser(body.cname, eType, false); EncryptionKey skey = keyForUser(body.sname, eType, true); + + if (options.containsKey(KDC.Option.ONLY_RC4_TGT)) { + int tgtEType = EncryptedData.ETYPE_ARCFOUR_HMAC; + boolean found = false; + for (int i=0; i<eTypes.length; i++) { + if (eTypes[i] == tgtEType) { + found = true; + break; + } + } + if (!found) { + throw new KrbException(Krb5.KDC_ERR_ETYPE_NOSUPP); + } + skey = keyForUser(body.sname, tgtEType, true); + } if (ckey == null) { throw new KrbException(Krb5.KDC_ERR_ETYPE_NOSUPP); } @@ -799,7 +820,8 @@ Constructor<EncryptedData> ctor = EncryptedData.class.getDeclaredConstructor(DerValue.class); ctor.setAccessible(true); EncryptedData data = ctor.newInstance(new DerValue(pas[0].getValue())); - data.decrypt(ckey, KeyUsage.KU_PA_ENC_TS); + EncryptionKey pakey = keyForUser(body.cname, data.getEType(), false); + data.decrypt(pakey, KeyUsage.KU_PA_ENC_TS); } catch (Exception e) { throw new KrbException(Krb5.KDC_ERR_PREAUTH_FAILED); } @@ -887,7 +909,11 @@ ke.returnCode() == Krb5.KDC_ERR_PREAUTH_FAILED) { PAData pa; - ETypeInfo2 ei2 = new ETypeInfo2(eTypes[0], null, null); + int epa = eTypes[0]; + if (options.containsKey(KDC.Option.ONLY_RC4_PREAUTH)) { + epa = EncryptedData.ETYPE_ARCFOUR_HMAC; + } + ETypeInfo2 ei2 = new ETypeInfo2(epa, null, null); DerOutputStream eid = new DerOutputStream(); eid.write(DerValue.tag_Sequence, ei2.asn1Encode()); @@ -906,7 +932,7 @@ } } if (allOld) { - ETypeInfo ei = new ETypeInfo(eTypes[0], null); + ETypeInfo ei = new ETypeInfo(epa, null); eid = new DerOutputStream(); eid.write(DerValue.tag_Sequence, ei.asn1Encode()); pa = new PAData(Krb5.PA_ETYPE_INFO, eid.toByteArray());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/auto/W83.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/* + * @test + * @bug 6932525 6951366 6959292 + * @summary kerberos login failure on win2008 with AD set to win2000 compat mode + * and cannot login if session key and preauth does not use the same etype + */ +import com.sun.security.auth.module.Krb5LoginModule; +import java.io.File; +import sun.security.krb5.Config; +import sun.security.krb5.EncryptedData; +import sun.security.krb5.PrincipalName; +import sun.security.krb5.internal.crypto.EType; +import sun.security.krb5.internal.ktab.KeyTab; + +public class W83 { + public static void main(String[] args) throws Exception { + + W83 x = new W83(); + + // Cannot use OneKDC. kinit command cannot resolve + // hostname kdc.rabbit.hole + KDC kdc = new KDC(OneKDC.REALM, "127.0.0.1", 0, true); + kdc.addPrincipal(OneKDC.USER, OneKDC.PASS); + kdc.addPrincipalRandKey("krbtgt/" + OneKDC.REALM); + KDC.saveConfig(OneKDC.KRB5_CONF, kdc); + System.setProperty("java.security.krb5.conf", OneKDC.KRB5_CONF); + Config.refresh(); + + kdc.writeKtab(OneKDC.KTAB); + new File(OneKDC.KRB5_CONF).deleteOnExit(); + new File(OneKDC.KTAB).deleteOnExit(); + + KeyTab ktab = KeyTab.getInstance(OneKDC.KTAB); + for (int etype: EType.getBuiltInDefaults()) { + if (etype != EncryptedData.ETYPE_ARCFOUR_HMAC) { + ktab.deleteEntry(new PrincipalName(OneKDC.USER), etype); + } + } + ktab.save(); + + // For 6932525 and 6951366, make sure the etypes sent in 2nd AS-REQ + // is not restricted to that of preauth + kdc.setOption(KDC.Option.ONLY_RC4_TGT, true); + x.go(); + + // For 6959292, make sure that when etype for enc-part in 2nd AS-REQ + // is different from that of preauth, client can still decrypt it + kdc.setOption(KDC.Option.ONLY_RC4_PREAUTH, true); + x.go(); + } + + void go() throws Exception { + Krb5LoginModule krb5 = new Krb5LoginModule(); + StringBuffer error = new StringBuffer(); + try { + Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); + } catch (Exception e) { + error.append("Krb5LoginModule password login error\n"); + } + try { + Context.fromUserKtab(OneKDC.USER, OneKDC.KTAB, false); + } catch (Exception e) { + error.append("Krb5LoginModule keytab login error\n"); + } + try { + Class.forName("sun.security.krb5.internal.tools.Kinit"); + String cmd = System.getProperty("java.home") + + System.getProperty("file.separator") + + "bin" + + System.getProperty("file.separator") + + "kinit"; + + int p = execute( + cmd, + "-J-Djava.security.krb5.conf=" + OneKDC.KRB5_CONF, + "-c", "cache1", + OneKDC.USER, + new String(OneKDC.PASS)); + if (p != 0) { + error.append("kinit password login error\n"); + } + p = execute( + cmd, + "-J-Djava.security.krb5.conf=" + OneKDC.KRB5_CONF, + "-c", "cache2", + "-k", "-t", OneKDC.KTAB, + OneKDC.USER); + if (p != 0) { + error.append("kinit keytab login error\n"); + } + } catch (ClassNotFoundException cnfe) { + System.out.println("No kinit, test ignored."); + // Ignore, not on windows + } + if (error.length() != 0) { + throw new Exception(error.toString()); + } + } + + private static int execute(String... args) throws Exception { + for (String arg: args) { + System.out.printf("%s ", arg); + } + System.out.println(); + Process p = Runtime.getRuntime().exec(args); + return p.waitFor(); + } +}
--- a/jdk/test/sun/security/validator/CertReplace.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/security/validator/CertReplace.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 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 @@ -16,9 +16,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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. */ /* @@ -37,25 +37,28 @@ public class CertReplace { - private final static String cacerts = "certreplace.jks"; - private final static String certs = "certreplace.certs"; - + /** + * @param args {cacerts keystore, cert chain} + */ public static void main(String[] args) throws Exception { KeyStore ks = KeyStore.getInstance("JKS"); - ks.load(new FileInputStream(cacerts), "changeit".toCharArray()); + ks.load(new FileInputStream(args[0]), "changeit".toCharArray()); Validator v = Validator.getInstance (Validator.TYPE_PKIX, Validator.VAR_GENERIC, ks); - X509Certificate[] chain = createPath(); - System.out.println(Arrays.toString(v.validate(chain))); - + X509Certificate[] chain = createPath(args[1]); + System.out.println("Chain: "); + for (X509Certificate c: v.validate(chain)) { + System.out.println(" " + c.getSubjectX500Principal() + + " issued by " + c.getIssuerX500Principal()); + } } - public static X509Certificate[] createPath() throws Exception { + public static X509Certificate[] createPath(String chain) throws Exception { CertificateFactory cf = CertificateFactory.getInstance("X.509"); List list = new ArrayList(); for (Certificate c: cf.generateCertificates( - new FileInputStream(certs))) { + new FileInputStream(chain))) { list.add((X509Certificate)c); } return (X509Certificate[]) list.toArray(new X509Certificate[0]);
--- a/jdk/test/sun/security/validator/certreplace.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/security/validator/certreplace.sh Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. +# Copyright (c) 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 @@ -16,9 +16,9 @@ # 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. +# 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. # # @test @@ -82,4 +82,4 @@ # 5. Build and run test $JAVAC -d . ${TESTSRC}${FS}CertReplace.java -$JAVA CertReplace +$JAVA CertReplace certreplace.jks certreplace.certs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/validator/samedn.sh Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,82 @@ +# +# Copyright (c) 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. +# +# 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. +# + +# @test +# @bug 6958869 +# @summary regression: PKIXValidator fails when multiple trust anchors +# have same dn +# + +if [ "${TESTSRC}" = "" ] ; then + TESTSRC="." +fi +if [ "${TESTJAVA}" = "" ] ; then + JAVAC_CMD=`which javac` + TESTJAVA=`dirname $JAVAC_CMD`/.. +fi + +# set platform-dependent variables +OS=`uname -s` +case "$OS" in + Windows_* ) + FS="\\" + ;; + * ) + FS="/" + ;; +esac + +KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit \ + -keypass changeit -keystore samedn.jks" +JAVAC=$TESTJAVA${FS}bin${FS}javac +JAVA=$TESTJAVA${FS}bin${FS}java + +rm -rf samedn.jks 2> /dev/null + +# 1. Generate 3 aliases in a keystore: ca1, ca2, user. The CAs' startdate +# is set to one year ago so that they are expired now + +$KT -genkeypair -alias ca1 -dname CN=CA -keyalg rsa -sigalg md5withrsa -ext bc -startdate -1y +$KT -genkeypair -alias ca2 -dname CN=CA -keyalg rsa -sigalg sha1withrsa -ext bc -startdate -1y +$KT -genkeypair -alias user -dname CN=User -keyalg rsa + +# 2. Signing: ca -> user + +$KT -certreq -alias user | $KT -gencert -rfc -alias ca1 > samedn1.certs +$KT -certreq -alias user | $KT -gencert -rfc -alias ca2 > samedn2.certs + +# 3. Append the ca file + +$KT -export -rfc -alias ca1 >> samedn1.certs +$KT -export -rfc -alias ca2 >> samedn2.certs + +# 4. Remove user for cacerts + +$KT -delete -alias user + +# 5. Build and run test. Make sure the CA certs are ignored for validity check. +# Check both, one of them might be dropped out of map in old codes. + +$JAVAC -d . ${TESTSRC}${FS}CertReplace.java +$JAVA CertReplace samedn.jks samedn1.certs || exit 1 +$JAVA CertReplace samedn.jks samedn2.certs || exit 2
--- a/jdk/test/sun/tools/jps/jps-Vvml_2.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/tools/jps/jps-Vvml_2.sh Thu Jul 08 11:28:01 2010 -0700 @@ -51,3 +51,9 @@ SLEEPER_PID=$! ${JPS} -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output2.awk +RC=$? + +cleanup + +exit ${RC} +
--- a/jdk/test/sun/tools/jps/jps-m_2.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/tools/jps/jps-m_2.sh Thu Jul 08 11:28:01 2010 -0700 @@ -50,3 +50,9 @@ SLEEPER_PID=$! ${JPS} -m | awk -f ${TESTSRC}/jps-m_Output2.awk +RC=$? + +cleanup + +exit ${RC} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jstat/classloadOutput1.awk Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,31 @@ +# +# matching the following output specified as a pattern that verifies +# that the numerical values conform to a specific pattern, rather than +# specific values. +# +# Loaded Time Inited Time Shared Kbytes LoadTime SysClass Kbytes LoadTime Lookup Parse Linked Time Verified Time AppClass Kbytes AppCL DefineClass Time FindClass Time Delegation URLCL Read +# 956 0.115 777 0.032 0 0.0 0.000 956 3437.5 0.085 0.013 0.045 918 0.032 917 0.011 13 1.0 0.003 1 0.000 1 0.004 0.005 0.000 +# + +BEGIN { + headerlines=0; datalines=0; totallines=0 + } + +/^Loaded Time Inited Time Shared Kbytes LoadTime SysClass Kbytes LoadTime Lookup Parse Linked Time Verified Time AppClass Kbytes AppCL DefineClass Time FindClass Time Delegation URLCL Read$/ { + headerlines++; + } + +/^[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9][ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9][ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9][ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+[ ]*[0-9]+\.[0-9]+$/ { + datalines++; + } + + { totallines++; print $0 } + +END { + if ((headerlines == 1) && (datalines == 1) && (totallines == 2)) { + exit 0 + } + else { + exit 1 + } + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jstat/jstatClassloadOutput1.sh Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,36 @@ +# +# Copyright (c) 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. +# +# 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. +# + +# @test +# @bug 6959965 +# @run shell jstatClassloadOutput1.sh +# @summary Test that output of 'jstat -classload 0' has expected line counts + +. ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh + +setup +verify_os + +JSTAT="${TESTJAVA}/bin/jstat" + +${JSTAT} -classload -J-Djstat.showUnsupported=true 0 2>&1 | awk -f ${TESTSRC}/classloadOutput1.awk
--- a/jdk/test/sun/tools/jstat/jstatOptions1.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/tools/jstat/jstatOptions1.sh Thu Jul 08 11:28:01 2010 -0700 @@ -32,7 +32,9 @@ JSTAT="${TESTJAVA}/bin/jstat" -rm -f jstat.out 2>/dev/null -${JSTAT} -options > jstat.out 2>&1 +rm -f jstat.out1 jstat.out2 2>/dev/null +${JSTAT} -options > jstat.out1 2>&1 +${JSTAT} -options -J-Djstat.showUnsupported=true > jstat.out2 2>&1 -diff -w jstat.out ${TESTSRC}/options1.out +diff -w jstat.out1 ${TESTSRC}/options1.out +diff -w jstat.out2 ${TESTSRC}/options2.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jstat/options2.out Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,13 @@ +-class +-classload +-compiler +-gc +-gccapacity +-gccause +-gcnew +-gcnewcapacity +-gcold +-gcoldcapacity +-gcpermcapacity +-gcutil +-printcompilation
--- a/jdk/test/sun/tools/jstatd/jstatdDefaults.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/tools/jstatd/jstatdDefaults.sh Thu Jul 08 11:28:01 2010 -0700 @@ -56,12 +56,11 @@ if [ $? -ne 0 ] then echo "Output of jps differs from expected output. Failed." + cleanup exit 1 fi -TARGET_PID=`${JPS} | grep "Jstatd" | cut -d" " -f1` - -${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk +${JSTAT} -gcutil ${JSTATD_PID}@${HOSTNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk RC=$? if [ ${RC} -ne 0 ] @@ -75,4 +74,6 @@ RC=1 fi +cleanup + exit ${RC}
--- a/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh Thu Jul 08 11:28:01 2010 -0700 @@ -44,7 +44,11 @@ JSTAT="${TESTJAVA}/bin/jstat" HOSTNAME=`uname -n` -PORT=2099 +PORT=`freePort` +if [ "${PORT}" = "0" ] ; then + echo "Cannot get free port" + exit 1 +fi RMIREGISTRY_OUT="rmiregistry_$$.out" JSTATD_OUT="jstatd_$$.out" @@ -69,12 +73,7 @@ exit 1 fi -# get the process id for the target app (jstatd). note, don't rely -# on JSTATD_PID as mks interposes a shell when starting a process in -# the background -TARGET_PID=`${JPS} | grep "Jstatd" | cut -d" " -f1` - -${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk +${JSTAT} -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk RC=$? if [ ${RC} -ne 0 ]
--- a/jdk/test/sun/tools/jstatd/jstatdPort.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/tools/jstatd/jstatdPort.sh Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,11 @@ JSTAT="${TESTJAVA}/bin/jstat" HOSTNAME=`uname -n` -PORT=2099 +PORT=`freePort` +if [ "${PORT}" = "0" ] ; then + echo "Cannot get free port" + exit 1 +fi JSTATD_OUT="jstatd_$$.out" @@ -57,12 +61,11 @@ if [ $? -ne 0 ] then echo "Output of jps differs from expected output. Failed." + cleanup exit 1 fi -TARGET_PID=`${JPS} | grep "Jstatd" | cut -d" " -f1` - -${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk +${JSTAT} -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk RC=$? if [ ${RC} -ne 0 ] @@ -76,4 +79,6 @@ RC=1 fi +cleanup + exit ${RC}
--- a/jdk/test/sun/tools/jstatd/jstatdServerName.sh Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/sun/tools/jstatd/jstatdServerName.sh Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,12 @@ JSTAT="${TESTJAVA}/bin/jstat" HOSTNAME=`uname -n` -PORT_1=2098 -PORT_2=2099 +PORT_1=`freePort` +if [ "${PORT_1}" = "0" ] ; then + echo "ERROR: No free port" + exit 1 +fi +PORT_2=`expr ${PORT_1} '+' 1` SERVERNAME="SecondJstatdServer" JSTATD_1_OUT="jstatd_$$_1.out" @@ -68,6 +72,7 @@ if [ $? -ne 0 ] then echo "Output of jps differs from expected output. Failed." + cleanup exit 1 fi @@ -77,13 +82,12 @@ if [ $? -ne 0 ] then echo "Output of jps differs from expected output. Failed." + cleanup exit 1 fi -TARGET_PID=`${JPS} | grep "Jstatd" | cut -d" " -f1 | head -1` - -echo "running: ${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME}:${PORT_1} 250 5" -${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME}:${PORT_1} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk +echo "running: ${JSTAT} -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5" +${JSTAT} -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk RC=$? if [ ${RC} -ne 0 ] @@ -91,8 +95,8 @@ echo "jstat output differs from expected output" fi -echo "running: ${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5" -${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk +echo "running: ${JSTAT} -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5" +${JSTAT} -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk RC=$? if [ ${RC} -ne 0 ] @@ -112,4 +116,6 @@ RC=1 fi +cleanup + exit ${RC}
--- a/jdk/test/tools/jar/UpdateManifest.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/tools/jar/UpdateManifest.java Thu Jul 08 11:28:01 2010 -0700 @@ -143,6 +143,7 @@ } else { fail("did not match specVersion nor specTitle"); } + zf.close(); } // --------------------- Convenience ---------------------------
--- a/jdk/test/tools/jar/index/MetaInf.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/tools/jar/index/MetaInf.java Thu Jul 08 11:28:01 2010 -0700 @@ -62,7 +62,13 @@ static boolean contains(File jarFile, String entryName) throws IOException { - return new ZipFile(jarFile).getEntry(entryName) != null; + ZipFile zf = new ZipFile(jarFile); + if ( zf != null ) { + boolean result = zf.getEntry(entryName) != null; + zf.close(); + return result; + } + return false; } static void checkContains(File jarFile, String entryName) @@ -94,9 +100,13 @@ String line; while ((line = index.readLine()) != null) { if (line.equals(SERVICES)) { + index.close(); + f.close(); return; } } + index.close(); + f.close(); throw new Error(SERVICES + " not indexed."); }
--- a/jdk/test/tools/pack200/Pack200Test.java Wed Jul 07 14:20:22 2010 +0400 +++ b/jdk/test/tools/pack200/Pack200Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 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 @@ -39,8 +39,8 @@ */ public class Pack200Test { - private static ArrayList <File> jarList = new ArrayList(); - private static final String PACKEXT = ".pack"; + private static ArrayList <File> jarList = new ArrayList<File>(); + static final String PACKEXT = ".pack"; /** Creates a new instance of Pack200Test */ private Pack200Test() {} @@ -48,7 +48,7 @@ private static void doPackUnpack() { for (File in : jarList) { Pack200.Packer packer = Pack200.newPacker(); - Map p = packer.properties(); + Map<String, String> p = packer.properties(); // Take the time optimization vs. space p.put(packer.EFFORT, "1"); // CAUTION: do not use 0. // Make the memory consumption as effective as possible @@ -96,7 +96,7 @@ } private static ArrayList <String> getZipFileEntryNames(ZipFile z) { - ArrayList <String> out = new ArrayList(); + ArrayList <String> out = new ArrayList<String>(); for (ZipEntry ze : Collections.list(z.entries())) { out.add(ze.getName()); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/tools/pack200/PackageVersionTest.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,169 @@ + +/* + * Copyright (c) 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. + * + * 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. + */ + +/** + * @test + * @bug 6712743 + * @summary verify package versioning + * @compile -XDignore.symbol.file PackageVersionTest.java + * @run main PackageVersionTest + */ + +import java.io.ByteArrayOutputStream; +import java.io.Closeable; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.util.jar.JarFile; +import java.util.jar.Pack200; +import java.util.jar.Pack200.Packer; + +public class PackageVersionTest { + private static final File javaHome = new File(System.getProperty("java.home")); + + public final static int JAVA5_PACKAGE_MAJOR_VERSION = 150; + public final static int JAVA5_PACKAGE_MINOR_VERSION = 7; + + public final static int JAVA6_PACKAGE_MAJOR_VERSION = 160; + public final static int JAVA6_PACKAGE_MINOR_VERSION = 1; + + public static void main(String... args) { + if (!javaHome.getName().endsWith("jre")) { + throw new RuntimeException("Error: requires an SDK to run"); + } + + File out = new File("test.pack"); + createClassFile("Test5"); + createClassFile("Test6"); + createClassFile("Test7"); + + verifyPack("Test5.class", JAVA5_PACKAGE_MAJOR_VERSION, + JAVA5_PACKAGE_MINOR_VERSION); + + verifyPack("Test6.class", JAVA6_PACKAGE_MAJOR_VERSION, + JAVA6_PACKAGE_MINOR_VERSION); + + // TODO: change this to the java7 package version as needed. + verifyPack("Test7.class", JAVA6_PACKAGE_MAJOR_VERSION, + JAVA6_PACKAGE_MINOR_VERSION); + + // test for resource file, ie. no class files + verifyPack("Test6.java", JAVA5_PACKAGE_MAJOR_VERSION, + JAVA5_PACKAGE_MINOR_VERSION); + } + + static void close(Closeable c) { + if (c == null) { + return; + } + try { + c.close(); + } catch (IOException ignore) {} + } + + static void createClassFile(String name) { + createJavaFile(name); + String target = name.substring(name.length() - 1); + String javacCmds[] = { + "-source", + "5", + "-target", + name.substring(name.length() - 1), + name + ".java" + }; + compileJava(javacCmds); + } + + static void createJavaFile(String name) { + PrintStream ps = null; + FileOutputStream fos = null; + File outputFile = new File(name + ".java"); + outputFile.delete(); + try { + fos = new FileOutputStream(outputFile); + ps = new PrintStream(fos); + ps.format("public class %s {}", name); + } catch (IOException ioe) { + throw new RuntimeException("creation of test file failed"); + } finally { + close(ps); + close(fos); + } + } + + static void compileJava(String... javacCmds) { + if (com.sun.tools.javac.Main.compile(javacCmds) != 0) { + throw new RuntimeException("compilation failed"); + } + } + + static void makeJar(String... jargs) { + sun.tools.jar.Main jarTool = + new sun.tools.jar.Main(System.out, System.err, "jartool"); + if (!jarTool.run(jargs)) { + throw new RuntimeException("jar command failed"); + } + } + + static void verifyPack(String filename, int expected_major, int expected_minor) { + + File jarFileName = new File("test.jar"); + jarFileName.delete(); + String jargs[] = { + "cvf", + jarFileName.getName(), + filename + }; + makeJar(jargs); + JarFile jfin = null; + + try { + jfin = new JarFile(jarFileName); + Packer packer = Pack200.newPacker(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + packer.pack(jfin, baos); + baos.flush(); + baos.close(); + byte[] buf = baos.toByteArray(); + + int minor = buf[4] & 0x000000ff; + int major = buf[5] & 0x000000ff; + + if (major != expected_major || minor != expected_minor) { + String msg = + String.format("test fails: expected:%d.%d but got %d.%d\n", + expected_major, expected_minor, + major, minor); + throw new Error(msg); + } + + System.out.println(filename + ": OK"); + } catch (IOException ioe) { + throw new RuntimeException(ioe.getMessage()); + } finally { + close(jfin); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/tools/pack200/SegmentLimit.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,134 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/** + * @test + * @bug 6575373 + * @summary verify default segment limit + * @compile SegmentLimit.java + * @run main SegmentLimit + */ + +import java.io.BufferedReader; +import java.io.Closeable; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; + +/* + * Run this against a large jar file, by default the packer should generate only + * one segment, parse the output of the packer to verify if this is indeed true. + */ + +public class SegmentLimit { + + private static final File javaHome = new File(System.getProperty("java.home")); + + public static void main(String... args) { + if (!javaHome.getName().endsWith("jre")) { + throw new RuntimeException("Error: requires an SDK to run"); + } + + File out = new File("test" + Pack200Test.PACKEXT); + out.delete(); + runPack200(out); + } + + static void close(Closeable c) { + if (c == null) { + return; + } + try { + c.close(); + } catch (IOException ignore) {} + } + + static void runPack200(File outFile) { + File binDir = new File(javaHome, "bin"); + File pack200Exe = System.getProperty("os.name").startsWith("Windows") + ? new File(binDir, "pack200.exe") + : new File(binDir, "pack200"); + File sdkHome = javaHome.getParentFile(); + File testJar = new File(new File(sdkHome, "lib"), "tools.jar"); + + System.out.println("using pack200: " + pack200Exe.getAbsolutePath()); + + String[] cmds = { pack200Exe.getAbsolutePath(), + "--effort=1", + "--verbose", + "--no-gzip", + outFile.getName(), + testJar.getAbsolutePath() + }; + InputStream is = null; + BufferedReader br = null; + InputStreamReader ir = null; + + FileOutputStream fos = null; + PrintStream ps = null; + + try { + ProcessBuilder pb = new ProcessBuilder(cmds); + pb.redirectErrorStream(true); + Process p = pb.start(); + is = p.getInputStream(); + ir = new InputStreamReader(is); + br = new BufferedReader(ir); + + File logFile = new File("pack200.log"); + fos = new FileOutputStream(logFile); + ps = new PrintStream(fos); + + String line = br.readLine(); + int count = 0; + while (line != null) { + line = line.trim(); + if (line.matches(".*Transmitted.*files of.*input bytes in a segment of.*bytes")) { + count++; + } + ps.println(line); + line=br.readLine(); + } + p.waitFor(); + if (p.exitValue() != 0) { + throw new RuntimeException("pack200 failed"); + } + p.destroy(); + if (count > 1) { + throw new Error("test fails: check for multiple segments(" + + count + ") in: " + logFile.getAbsolutePath()); + } + } catch (IOException ex) { + throw new RuntimeException(ex.getMessage()); + } catch (InterruptedException ignore){ + } finally { + close(is); + close(ps); + close(fos); + } + } +} +
--- a/langtools/.hgtags Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/.hgtags Thu Jul 08 11:28:01 2010 -0700 @@ -71,3 +71,6 @@ bb3d7c75a56df0c00246072b996fad1858a771a1 jdk7-b94 752bb790fc2d6df91e91d84420c9c87136eb81eb jdk7-b95 89cd267c216751bdacf8629bb07a40c0950fc4f2 jdk7-b96 +c0a41294297ed397098dd92b647f481f0e1bb8fa jdk7-b97 +3b38f3aa3dc388eef0737a9fba99f54a1602ee3b jdk7-b98 +005bec70ca27239bdd4e6169b9b078507401aa72 jdk7-b99
--- a/langtools/make/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/make/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -26,9 +26,9 @@ # Makefile for langtools: wrapper around Ant build.xml file # -# On Solaris, the 'make' utility from Sun will not work with these makefiles. -# This little rule is only understood by Sun's make, and is harmless -# when seen by the GNU make tool. If using Sun's make, this causes the +# On Solaris, the standard 'make' utility will not work with these makefiles. +# This little rule is only understood by Solaris make, and is harmless +# when seen by the GNU make tool. If using Solaris make, this causes the # make command to fail. # SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33 @@ -40,15 +40,16 @@ SYSTEM_UNAME := $(shell uname) +# Where is unwanted output to be delivered? +# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file. ifeq ($(SYSTEM_UNAME), Windows_NT) DEV_NULL = NUL else +DEV_NULL = /dev/null +endif + ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME))) -DEV_NULL = NUL USING_CYGWIN = true -else -DEV_NULL = /dev/null -endif endif ifdef USING_CYGWIN @@ -202,7 +203,7 @@ #------------------------------------------------------------------- # -# Targets for Sun's internal JPRT build system +# Targets for Oracle's internal JPRT build system CD = cd ZIP = zip
--- a/langtools/make/Makefile-classic Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/make/Makefile-classic Thu Jul 08 11:28:01 2010 -0700 @@ -28,9 +28,9 @@ # # -# On Solaris, the 'make' utility from Sun will not work with these makefiles. -# This little rule is only understood by Sun's make, and is harmless -# when seen by the GNU make tool. If using Sun's make, this causes the +# On Solaris, the standard 'make' utility will not work with these makefiles. +# This little rule is only understood by Solaris make, and is harmless +# when seen by the GNU make tool. If using Solaris make, this causes the # make command to fail. # SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
--- a/langtools/make/build.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/make/build.properties Thu Jul 08 11:28:01 2010 -0700 @@ -76,17 +76,27 @@ javadoc.jls3.option=-tag "jls3:a:See <cite>${javadoc.jls3.cite}</cite>:" # jtreg, used to run the JDK regression tests +# See http://openjdk.java.net/jtreg/ # Override this path as needed, either on the command line or in # one of the standard user build.properties files (see build.xml) -# jtreg.home = /opt/jtreg/3.2.2_02 +# jtreg.home = /opt/jtreg/4.1 # findbugs +# See http://findbugs.sourceforge.net/ # Override this path as needed, either on the command line or in # one of the standard user build.properties files (see build.xml) # findbugs.home = /opt/findbugs/1.2.1 +# vizant (graph visualization tool for Ant) +# See http://vizant.sourceforge.net/ +# Override this path as needed, either on the command line or in +# one of the standard user build.properties files (see build.xml) + +# vizant.jar = /opt/vizant/0.1.2/vizant-0.1.2.jar +# dot = dot + #------------------------------------------------------------ # The following properties define the packages for each of the tools. @@ -148,12 +158,14 @@ # -# The following files require the import JDK to be available -require.import.jdk.files = \ +# The following files require the latest JDK to be available. +# The API can be provided by using a suitable boot.java.home +# or by setting import.jdk +require.latest.jdk.files = \ com/sun/tools/javac/nio/*.java # The following files in the import jdk source directory are required -# in order to compile the files defined in ${require.import.jdk.files} +# in order to compile the files defined in ${require.latest.jdk.files} # # For NIO, the list of stub files is defined by the contents of the primary # API packages, together with such types that may be required in order to
--- a/langtools/make/build.xml Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/make/build.xml Thu Jul 08 11:28:01 2010 -0700 @@ -25,12 +25,79 @@ --> <!-- - This is the main build file for the complete langtools workspace. - It is used both when working on the tools in NetBeans, and when building - JDK itself, in which case it is invoked from the wrapper Makefile. + This is the main build file for the complete langtools repository. + It is used when building JDK (in which case it is invoked from the + Makefile), and it can be used when working on the tools themselves, + in an IDE such as NetBeans. + + External dependencies are specified via properties. These can be given + on the command line, or by providing a local build.properties file. + (They can also be edited into make/build.properties, although that is not + recommended.) At a minimum, boot.java.home must be set to the installed + location of the version of JDK used to build this repository. Additional + properties may be required, depending on the targets that are built. + For example, to run any of the jtreg tests you must set jtreg.home, + to run findbugs on the code you must set findbugs.home, and so on. + + For the most part, javac can be built using the previous version of JDK. + However, a small number of javac files require access to the latest JDK, + which may not yet have been compiled. To compile these files, you can do + one of the following: + - Set boot.java.home to a recent build of the latest version of JDK. + - Set import.jdk to either a recent build (containing jre/lib/rt.jar) + or to jdk source repository. In the latter case, stub files will + automatically be generated and used for the required API, to avoid + unnecessary compilation of the source repository. + If you do neither, the relevant files will not be built. + + The main build happens in two phases: + - First, javac and other tools as needed are built using ${boot.java.home}. + (This implies a constraint on the source code that they can be compiled + with the previous version of JDK. + - Second, all required classes are compiled with the latest javac, created + in the previous step. + The first phase is called the bootstrap phase. All targets, properties and + tasks that are specific to that phase have "bootstrap" in their name. + + For more details on the JDK build, see + http://blogs.sun.com/kto/entry/anatomy_of_the_jdk_build + http://openjdk.java.net/groups/build/ + For more details on the stub generator, see + http://blogs.sun.com/jjg/entry/building_javac_for_jdk7 + + Internal details ... + + Interim build products are created in the build/ directory. + Final build products are created in the dist/ directory. + When building JDK, the dist/directory will contain: + - A bootstrap compiler suitable for running with ${boot.java.home} + suitable for compiling downstream parts of JDK + - Source files and class files for inclusion in the JDK being built + When building standalone, the dist/directory will contain: + - Separate jar files for each of the separate langtools components + - Simple scripts to invoke the tools by executing the corresponding + jar files. + These jar files and scripts are "for developer use only". + + This file is organized into sections as follows: + - global property definitions + - general top level targets + - general diagnostic/debugging targets + - groups of targets for each tool: javac, javadoc, doclets, javah, javap, apt + Within each group, the following targets are provided, where applicable + build-bootstrap-TOOL build the bootstrap version of the tool + build-classes-TOOL build the classes for the tool + build-TOOL build the jar file and script for the tool + jtreg-TOOL build the tool and run the appropriate tests + findbugs-TOOL run findbugs on the tool's source oode + TOOL build the tool, run the tests, and run findbugs + - utility definitions --> <project name="langtools" default="build" basedir=".."> + <!-- + **** Global property definitions. + --> <!-- Force full debuginfo for javac if the debug.classfiles property is set. This must be BEFORE the include of @@ -107,35 +174,55 @@ ignoresystemclasses="true" classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.Path"/> - <!-- Set the default value of the sourcepath used for javac. --> - <condition property="javac.sourcepath" value="${build.genstubs.dir}" else=""> - <isset property="import.jdk.src.dir"/> - </condition> - - <!-- Set the default value of the classpath used for javac. --> - <property name="javac.classpath" value=""/> - - <!-- Set the default bootclasspath option used for javac. - Note that different variants of the option are used, meaning we can't just - define the value for the option. - Note the explicit use of the standard property ${path.separator} in the following. - This is because Ant is not clever enough to handle direct use of : or ; --> + <!-- Set the default bootclasspath option used for javac. + Note that different variants of the option are used, meaning we can't just + define the value for the option. + Note the explicit use of the standard property ${path.separator} in the following. + This is because Ant is not clever enough to handle direct use of : or ; --> <condition property="javac.bootclasspath.opt" value="-Xbootclasspath:${build.classes.dir}${path.separator}${import.jdk.jar}" else="-Xbootclasspath/p:${build.classes.dir}"> <isset property="import.jdk.jar"/> </condition> - <condition property="exclude.files" value="" else="${require.import.jdk.files}"> - <isset property="import.jdk"/> + <condition property="boot.java.provides.latest.jdk"> + <available + ignoresystemclasses="true" + classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/> + </condition> + + <condition property="bootstrap.exclude.files" value="" else="${require.latest.jdk.files}"> + <isset property="boot.java.provides.latest.jdk"/> + </condition> + + <condition property="exclude.files" value="" else="${require.latest.jdk.files}"> + <or> + <isset property="boot.java.provides.latest.jdk"/> + <isset property="import.jdk"/> + </or> </condition> - <!-- for debugging --> - <target name="check-import.jdk"> - <echo message="import.jdk: ${import.jdk}"/> - <echo message="import.jdk.jar: ${import.jdk.jar}"/> - <echo message="import.jdk.src.dir: ${import.jdk.src.dir}"/> - </target> + <condition property="require.import.jdk.stubs"> + <and> + <not> + <isset property="boot.java.provides.latest.jdk"/> + </not> + <isset property="import.jdk.src.dir"/> + </and> + </condition> + + <!-- Set the default value of the sourcepath used for javac. --> + <condition property="javac.sourcepath" value="${build.genstubs.dir}" else=""> + <isset property="require.import.jdk.stubs"/> + </condition> + + <!-- Set the default value of the classpath used for javac. --> + <property name="javac.classpath" value=""/> + + + <!-- + **** General top level targets. + --> <!-- Standard target to build deliverables for JDK build. --> @@ -235,7 +322,61 @@ datafile="${build.coverage.dir}/cobertura.ser"/> </target> - <!-- javac targets --> + + <!-- + **** Debugging/diagnostic targets. + --> + + <!-- standard JDK target --> + <target name="sanity" + description="display settings of configuration values"> + <echo level="info">ant.home = ${ant.home}</echo> + <echo level="info">boot.java.home = ${boot.java.home}</echo> + <echo level="info">target.java.home = ${target.java.home}</echo> + <echo level="info">jtreg.home = ${jtreg.home}</echo> + <echo level="info">findbugs.home = ${findbugs.home}</echo> + </target> + + <target name="post-sanity" depends="-def-jtreg,sanity,build" + description="perform basic validation after a standard build"> + <jtreg + dir="make/test" + workDir="${build.jtreg.dir}/post-sanity/work" + reportDir="${build.jtreg.dir}/post-sanity/report" + jdk="${target.java.home}" + verbose="summary" + failonerror="false" resultproperty="jtreg.post-sanity.result"> + </jtreg> + </target> + + <!-- use vizant tool to generate graphical image of this Ant file.--> + <target name="vizant" depends="-def-vizant"> + <mkdir dir="${build.dir}"/> + <echo message="Generating ${build.dir}/build.dot"/> + <vizant antfile="${make.dir}/build.xml" outfile="${build.dir}/build.dot"/> + <echo message="Generating ${build.dir}/build.png"/> + <exec executable="${dot}" > + <arg value="-Tpng"/> + <arg value="-o"/> + <arg file="${build.dir}/build.png"/> + <arg file="${build.dir}/build.dot"/> + </exec> + </target> + + <target name="check-import.jdk"> + <echo message="import.jdk: ${import.jdk}"/> + <echo message="import.jdk.jar: ${import.jdk.jar}"/> + <echo message="import.jdk.src.dir: ${import.jdk.src.dir}"/> + </target> + + <target name="diagnostics"> + <diagnostics/> + </target> + + + <!-- + **** javac targets. + --> <target name="build-bootstrap-javac" depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool"> @@ -267,7 +408,10 @@ <target name="javac" depends="build-javac,jtreg-javac,findbugs-javac"/> - <!-- javadoc targets --> + + <!-- + **** javadoc targets. + --> <target name="build-bootstrap-javadoc" depends="build-bootstrap-javac"> <build-bootstrap-classes includes="${javadoc.includes}"/> @@ -300,7 +444,10 @@ <target name="javadoc" depends="build-javadoc,jtreg-javadoc,findbugs-javadoc"/> - <!-- doclets targets --> + + <!-- + **** doclets targets. + --> <target name="build-bootstrap-doclets" depends="build-bootstrap-javadoc,-def-build-bootstrap-jar"> <build-bootstrap-classes includes="${doclets.includes}"/> @@ -330,7 +477,10 @@ <target name="doclets" depends="build-doclets,jtreg-doclets,findbugs-doclets"/> - <!-- javah targets --> + + <!-- + **** javah targets. + --> <target name="build-bootstrap-javah" depends="build-bootstrap-javadoc"> <build-bootstrap-classes includes="${javah.includes}"/> @@ -360,7 +510,10 @@ <target name="javah" depends="build-javah,jtreg-javah,findbugs-javah"/> - <!-- javap targets --> + + <!-- + **** javap targets. + --> <target name="build-bootstrap-javap" depends="-def-build-bootstrap-classes,-def-build-bootstrap-jar,-def-build-bootstrap-tool"> @@ -393,7 +546,10 @@ <target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/> - <!-- apt targets --> + + <!-- + **** apt targets. + --> <target name="build-bootstrap-apt" depends="build-bootstrap-javac"> <build-bootstrap-classes includes="${apt.includes}"/> @@ -426,9 +582,12 @@ <target name="apt" depends="build-apt,jtreg-apt,findbugs-apt"/> - <!-- Create import JDK stubs --> - <target name="-create-import-jdk-stubs" depends="-def-genstubs" if="import.jdk.src.dir"> + <!-- + **** Create import JDK stubs. + --> + + <target name="-create-import-jdk-stubs" depends="-def-genstubs" if="require.import.jdk.stubs"> <mkdir dir="${build.genstubs.dir}"/> <genstubs srcdir="${import.jdk.src.dir}" destdir="${build.genstubs.dir}" @@ -437,7 +596,12 @@ /> </target> - <!-- Check targets --> + + <!-- + **** Check targets. + **** "-check-*" targets check that a required property is set, and set to a reasonable value. + **** A user friendly message is generated if not, and the build exits. + --> <target name="-check-boot.java.home" depends="-def-check"> <check name="bootstrap java" property="boot.java.home" marker="${java.marker}"/> @@ -459,7 +623,15 @@ <check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/> </target> - <!-- Ant macro and preset defs --> + <target name="-check-vizant" depends="-def-check"> + <check name="vizant" property="vizant.jar"/> + <check name="dot" property="dot"/> + </target> + + + <!-- + **** Targets for Ant macro and task definitions. + --> <target name="-def-build-tool"> <macrodef name="build-tool"> @@ -599,7 +771,7 @@ sourcepath="" release="${bootstrap.release}" full.version="${bootstrap.full.version}" - excludes="${require.import.jdk.files} **/package-info.java"/> + excludes="${bootstrap.exclude.files} **/package-info.java"/> </presetdef> </target> @@ -617,7 +789,7 @@ classpath="${build.toolclasses.dir}/"/> </target> - <target name="-def-genstubs" depends="build-bootstrap-javac"> + <target name="-def-genstubs" depends="build-bootstrap-javac" if="require.import.jdk.stubs"> <mkdir dir="${build.toolclasses.dir}"/> <javac fork="true" source="${boot.javac.source}" @@ -640,7 +812,7 @@ <sequential> <property name="javadoc.options" value=""/> <!-- default, can be overridden per user or per project --> <!-- Note: even with this default value, includes - from src.classes.dir get javadoc'd; see packageset below --> + from src.classes.dir get javadoc'd; see packageset below --> <property name="javadoc.packagenames" value="none"/> <!-- default, can be overridden per user or per project --> <javadoc executable="${target.java.home}/bin/javadoc" @@ -691,13 +863,15 @@ <attribute name="tests"/> <attribute name="jdk" default="${target.java.home}"/> <attribute name="samevm" default="true"/> - <attribute name="verbose" default="summary"/> - <attribute name="options" default=""/> + <attribute name="verbose" default="${default.jtreg.verbose}"/> + <attribute name="options" default="${other.jtreg.options}"/> <attribute name="keywords" default="-keywords:!ignore"/> <attribute name="jpda.jvmargs" default=""/> <sequential> - <property name="coverage.options" value=""/> <!-- default --> - <property name="coverage.classpath" value=""/> <!-- default --> + <property name="coverage.options" value=""/> <!-- default --> + <property name="coverage.classpath" value=""/> <!-- default --> + <property name="default.jtreg.verbose" value="summary"/> <!-- default --> + <property name="other.jtreg.options" value=""/> <!-- default --> <jtreg dir="${test.dir}" workDir="${build.jtreg.dir}/@{name}/work" @@ -766,11 +940,16 @@ <property name="findbugs.defined" value="true"/> </target> + <target name="-def-vizant" unless="vizant.defined" depends="-check-vizant"> + <taskdef name="vizant" classname="net.sourceforge.vizant.Vizant" classpath="${vizant.jar}"/> + <property name="vizant.defined" value="true"/> + </target> + <target name="-def-check"> <macrodef name="check"> <attribute name="name"/> <attribute name="property"/> - <attribute name="marker"/> + <attribute name="marker" default=""/> <sequential> <fail message="Cannot locate @{name}: please set @{property} to its location"> <condition> @@ -781,41 +960,19 @@ </fail> <fail message="@{name} is not installed in ${@{property}}"> <condition> - <not> - <available file="${@{property}}/@{marker}"/> - </not> + <and> + <not> + <equals arg1="@{marker}" arg2=""/> + </not> + <not> + <available file="${@{property}}/@{marker}"/> + </not> + </and> </condition> </fail> </sequential> </macrodef> </target> - <!-- standard JDK target --> - <target name="sanity" - description="display settings of configuration values"> - <echo level="info">ant.home = ${ant.home}</echo> - <echo level="info">boot.java.home = ${boot.java.home}</echo> - <echo level="info">target.java.home = ${target.java.home}</echo> - <echo level="info">jtreg.home = ${jtreg.home}</echo> - <echo level="info">findbugs.home = ${findbugs.home}</echo> - </target> - - <!-- useful debugging targets --> - <target name="diagnostics"> - <diagnostics/> - </target> - - <target name="post-sanity" depends="-def-jtreg,sanity,build" - description="perform basic validation after a standard build"> - <jtreg - dir="make/test" - workDir="${build.jtreg.dir}/post-sanity/work" - reportDir="${build.jtreg.dir}/post-sanity/report" - jdk="${target.java.home}" - verbose="summary" - failonerror="false" resultproperty="jtreg.post-sanity.result"> - </jtreg> - - </target> </project>
--- a/langtools/src/share/classes/com/sun/source/tree/Tree.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/source/tree/Tree.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,7 @@ * * <p><b>WARNING:</b> This interface and its sub-interfaces are * subject to change as the Java™ programming language evolves. - * These interfaces are implemented by Sun's Java compiler (javac) + * These interfaces are implemented by the JDK Java compiler (javac) * and should not be implemented either directly or indirectly by * other applications. *
--- a/langtools/src/share/classes/com/sun/source/util/JavacTask.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/source/util/JavacTask.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,7 +36,7 @@ import javax.tools.JavaFileObject; /** - * Provides access to functionality specific to the Sun Java Compiler, javac. + * Provides access to functionality specific to the JDK Java Compiler, javac. * * @author Peter von der Ahé * @author Jonathan Gibbons
--- a/langtools/src/share/classes/com/sun/source/util/TaskEvent.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/source/util/TaskEvent.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,7 @@ import javax.tools.JavaFileObject; /** - * Provides details about work that has been done by the Sun Java Compiler, javac. + * Provides details about work that has been done by the JDK Java Compiler, javac. * * @author Jonathan Gibbons * @since 1.6
--- a/langtools/src/share/classes/com/sun/source/util/TaskListener.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/source/util/TaskListener.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,7 +27,7 @@ /** - * Provides a listener to monitor the activity of the Sun Java Compiler, javac. + * Provides a listener to monitor the activity of the JDK Java Compiler, javac. * * @author Jonathan Gibbons * @since 1.6
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Thu Jul 08 11:28:01 2010 -0700 @@ -60,7 +60,7 @@ /** * Apt compiler phase. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,8 +35,8 @@ /** * Various utility methods for processing Java tool command line arguments. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java Thu Jul 08 11:28:01 2010 -0700 @@ -45,7 +45,7 @@ import com.sun.tools.javac.parser.DocCommentScanner; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java Thu Jul 08 11:28:01 2010 -0700 @@ -61,7 +61,7 @@ /** This class provides a commandline interface to the apt build-time * tool. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/apt/util/Bark.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/apt/util/Bark.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,8 @@ /** A subtype of Log for use in APT. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ /** * See JVMS3, sections 4.2, 4.6, 4.7. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Annotation.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.16. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.15. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ import java.util.Map; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/AttributeException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/AttributeException.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,8 +26,8 @@ package com.sun.tools.classfile; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ import java.util.Map; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ import java.io.IOException; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,8 +35,8 @@ /** * See JVMS3, section 4.2. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassReader.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassReader.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ import java.io.InputStream; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassTranslator.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,8 +42,8 @@ /** * Rewrites a class file using a map of translations. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,8 +41,8 @@ /** * Write a ClassFile data structure to a file or stream. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Code_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ /** * See JVMS3, section 4.8.3. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,8 +27,8 @@ import java.io.IOException; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,8 +33,8 @@ /** * See JVMS3, section 4.5. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,8 +27,8 @@ package com.sun.tools.classfile; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.2. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,8 +26,8 @@ package com.sun.tools.classfile; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.15. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Descriptor.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ /** * See JVMS3, section 4.4. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/DescriptorException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/DescriptorException.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,8 +27,8 @@ package com.sun.tools.classfile; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ /** * See JVMS3, section 4.8.7. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.5. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ /** * See JSR 308 specification, section 4.1 * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Field.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Field.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ import java.io.IOException; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ /** * See JVMS3, section 4.8.6. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Instruction.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ /** * See JVMS3, chapter 6. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> *
--- a/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.12. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.13. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.14. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Method.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Method.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ import java.io.IOException; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Opcode.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,8 @@ * <p>In addition to providing all the standard opcodes defined in JVMS, * this class also provides legacy support for the PicoJava extensions. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.16 and 4.8.17. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.17. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.18. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JSR 308 specification, section 4.1 * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.18 and 4.8.19. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JSR 308 specification, section 4 * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.16. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.18. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JSR 308 specification, section 4.1 * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Signature.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Signature.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ /** * See JVMS3 4.4.4. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Signature_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.9. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ /** * See JVMS3, section 4.8.15. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.10. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,8 +27,8 @@ import java.io.IOException; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.4. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ import java.io.IOException; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * See JVMS3, section 4.8.8. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/classfile/Type.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Type.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,8 @@ * Family of classes used to represent the parsed form of a {@link Descriptor} * or {@link Signature}. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/package.html Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/package.html Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,7 @@ <title>com.sun.tools.doclets.formats.html package</title> </head> <body bgcolor="white"> - This is the default doclet provided by doclet provided by - Sun<font size="-2"><sup>TM</sup></font> that produces Javadoc's + This is the default doclet provided with JDK that produces Javadoc's default HTML-formatted API output. For more documentation on this doclet, please refer to the link below.
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -92,44 +92,42 @@ public abstract void build() throws IOException; /** - * Build the documentation, as specified by the given XML elements. + * Build the documentation, as specified by the given XML element. * - * @param elements the XML elements that specify which components to - * document. + * @param node the XML element that specifies which component to document. */ - protected void build(List<?> elements) { - for (int i = 0; i < elements.size(); i++ ) { - Object element = elements.get(i); - String component = (String) - ((element instanceof String) ? - element : - ((List<?>) element).get(0)); - try { - invokeMethod("build" + component, - element instanceof String ? - new Class<?>[] {} : - new Class<?>[] {List.class}, - element instanceof String ? - new Object[] {} : - new Object[] {((List<?>) element).subList(1, - ((List<?>) element).size())}); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - configuration.root.printError("Unknown element: " + component); - throw new DocletAbortException(); - } catch (InvocationTargetException e) { - e.getCause().printStackTrace(); - } catch (Exception e) { - e.printStackTrace(); - configuration.root.printError("Exception " + - e.getClass().getName() + - " thrown while processing element: " + component); - throw new DocletAbortException(); - } + protected void build(XMLNode node) { + String component = node.name; + try { + invokeMethod("build" + component, + new Class<?>[] { XMLNode.class }, + new Object[] { node }); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + configuration.root.printError("Unknown element: " + component); + throw new DocletAbortException(); + } catch (InvocationTargetException e) { + e.getCause().printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + configuration.root.printError("Exception " + + e.getClass().getName() + + " thrown while processing element: " + component); + throw new DocletAbortException(); } } /** + * Build the documentation, as specified by the children of the given XML element. + * + * @param node the XML element that specifies which components to document. + */ + protected void buildChildren(XMLNode node) { + for (XMLNode child: node.children) + build(child); + } + + /** * Given the name and parameters, invoke the method in the builder. This * method is required to invoke the appropriate build method as instructed * by the builder XML file. @@ -138,7 +136,14 @@ * @param paramClasses the types for each parameter. * @param params the parameters of the method. */ - protected abstract void invokeMethod(String methodName, Class<?>[] paramClasses, + protected void invokeMethod(String methodName, Class<?>[] paramClasses, Object[] params) - throws Exception; + throws Exception { + if (DEBUG) { + configuration.root.printError("DEBUG: " + this.getClass().getName() + + "." + methodName); + } + Method method = this.getClass().getMethod(methodName, paramClasses); + method.invoke(this, params); + } }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,7 +27,6 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.tools.doclets.internal.toolkit.util.*; -import java.util.*; /** * The superclass for all member builders. Member builders are only executed @@ -69,9 +68,10 @@ * * @param elements {@inheritDoc} */ - public void build(List<?> elements) { + @Override + public void build(XMLNode node) { if (hasMembersToDocument()) { - super.build(elements); + super.build(node); } }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,6 @@ import com.sun.javadoc.*; import java.io.*; import java.util.*; -import java.lang.reflect.*; /** * Builds the summary for a given annotation type. @@ -92,20 +91,6 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError("DEBUG: " + this.getClass().getName() - + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** - * {@inheritDoc} - */ public void build() throws IOException { build(LayoutParser.getInstance(configuration).parseXML(ROOT)); } @@ -122,8 +107,8 @@ * * @param elements the XML elements that specify how to document a class. */ - public void buildAnnotationTypeDoc(List<?> elements) throws Exception { - build(elements); + public void buildAnnotationTypeDoc(XMLNode node) throws Exception { + buildChildren(node); writer.close(); copyDocFiles(); } @@ -154,7 +139,7 @@ /** * Build the header of the page. */ - public void buildAnnotationTypeHeader() { + public void buildAnnotationTypeHeader(XMLNode node) { writer.writeHeader(configuration.getText("doclet.AnnotationType") + " " + annotationTypeDoc.name()); } @@ -162,14 +147,14 @@ /** * If this class is deprecated, print the appropriate information. */ - public void buildDeprecationInfo () { + public void buildDeprecationInfo (XMLNode node) { writer.writeAnnotationTypeDeprecationInfo(); } /** * Build the signature of the current annotation type. */ - public void buildAnnotationTypeSignature() { + public void buildAnnotationTypeSignature(XMLNode node) { StringBuffer modifiers = new StringBuffer( annotationTypeDoc.modifiers() + " "); writer.writeAnnotationTypeSignature( @@ -180,14 +165,14 @@ /** * Build the class description. */ - public void buildAnnotationTypeDescription() { + public void buildAnnotationTypeDescription(XMLNode node) { writer.writeAnnotationTypeDescription(); } /** * Build the tag information for the current class. */ - public void buildAnnotationTypeTagInfo() { + public void buildAnnotationTypeTagInfo(XMLNode node) { writer.writeAnnotationTypeTagInfo(); } @@ -197,9 +182,9 @@ * @param elements the XML elements that specify how a member summary is * documented. */ - public void buildMemberSummary(List<?> elements) throws Exception { + public void buildMemberSummary(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getMemberSummaryBuilder(writer).build(elements); + getMemberSummaryBuilder(writer).buildChildren(node); writer.completeMemberSummaryBuild(); } @@ -209,10 +194,10 @@ * @param elements the XML elements that specify how a annotation type * members are documented. */ - public void buildAnnotationTypeOptionalMemberDetails(List<?> elements) + public void buildAnnotationTypeOptionalMemberDetails(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getAnnotationTypeOptionalMemberBuilder(writer).build(elements); + getAnnotationTypeOptionalMemberBuilder(writer).buildChildren(node); } /** @@ -221,17 +206,17 @@ * @param elements the XML elements that specify how a annotation type * members are documented. */ - public void buildAnnotationTypeRequiredMemberDetails(List<?> elements) + public void buildAnnotationTypeRequiredMemberDetails(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getAnnotationTypeRequiredMemberBuilder(writer).build(elements); + getAnnotationTypeRequiredMemberBuilder(writer).buildChildren(node); } /** * Build the footer of the page. */ - public void buildAnnotationTypeFooter() { + public void buildAnnotationTypeFooter(XMLNode node) { writer.writeFooter(); } }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,6 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; import java.util.*; -import java.lang.reflect.*; /** * Builds documentation for optional annotation type members. @@ -85,6 +84,7 @@ /** * {@inheritDoc} */ + @Override public String getName() { return "AnnotationTypeOptionalMemberDetails"; } @@ -95,34 +95,20 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildAnnotationTypeOptionalMember(List<?> elements) { + public void buildAnnotationTypeOptionalMember(XMLNode node) { if (writer == null) { return; } for (currentMemberIndex = 0; currentMemberIndex < members.size(); currentMemberIndex++) { - build(elements); + buildChildren(node); } } /** - * {@inheritDoc} - */ - public void invokeMethod(String methodName, Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError("DEBUG: " + this.getClass().getName() - + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Document the default value for this optional member. */ - public void buildDefaultValueInfo() { + public void buildDefaultValueInfo(XMLNode node) { ((AnnotationTypeOptionalMemberWriter) writer).writeDefaultValueInfo( (MemberDoc) members.get(currentMemberIndex)); } @@ -130,6 +116,7 @@ /** * {@inheritDoc} */ + @Override public AnnotationTypeRequiredMemberWriter getWriter() { return writer; }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,6 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; import java.util.*; -import java.lang.reflect.*; /** * Builds documentation for required annotation type members. @@ -114,20 +113,6 @@ } /** - * {@inheritDoc} - */ - public void invokeMethod(String methodName, Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError("DEBUG: " + this.getClass().getName() - + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Returns a list of members that will be documented for the given class. * This information can be used for doclet specific documentation * generation. @@ -161,20 +146,20 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildAnnotationTypeRequiredMember(List<?> elements) { + public void buildAnnotationTypeRequiredMember(XMLNode node) { if (writer == null) { return; } for (currentMemberIndex = 0; currentMemberIndex < members.size(); currentMemberIndex++) { - build(elements); + buildChildren(node); } } /** * Build the overall header. */ - public void buildHeader() { + public void buildHeader(XMLNode node) { writer.writeHeader(classDoc, configuration.getText("doclet.Annotation_Type_Member_Detail")); } @@ -182,7 +167,7 @@ /** * Build the header for the individual members. */ - public void buildMemberHeader() { + public void buildMemberHeader(XMLNode node) { writer.writeMemberHeader((MemberDoc) members.get( currentMemberIndex), currentMemberIndex == 0); @@ -191,14 +176,14 @@ /** * Build the signature. */ - public void buildSignature() { + public void buildSignature(XMLNode node) { writer.writeSignature((MemberDoc) members.get(currentMemberIndex)); } /** * Build the deprecation information. */ - public void buildDeprecationInfo() { + public void buildDeprecationInfo(XMLNode node) { writer.writeDeprecated((MemberDoc) members.get(currentMemberIndex)); } @@ -206,7 +191,7 @@ * Build the comments for the member. Do nothing if * {@link Configuration#nocomment} is set to true. */ - public void buildMemberComments() { + public void buildMemberComments(XMLNode node) { if(! configuration.nocomment){ writer.writeComments((MemberDoc) members.get(currentMemberIndex)); } @@ -215,21 +200,21 @@ /** * Build the tag information. */ - public void buildTagInfo() { + public void buildTagInfo(XMLNode node) { writer.writeTags((MemberDoc) members.get(currentMemberIndex)); } /** * Build the footer for the individual member. */ - public void buildMemberFooter() { + public void buildMemberFooter(XMLNode node) { writer.writeMemberFooter(); } /** * Build the overall footer. */ - public void buildFooter() { + public void buildFooter(XMLNode node) { writer.writeFooter(classDoc); }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,6 @@ import com.sun.javadoc.*; import java.io.*; import java.util.*; -import java.lang.reflect.*; /** * Builds the summary for a given class. @@ -108,20 +107,6 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError("DEBUG: " + this.getClass().getName() - + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** - * {@inheritDoc} - */ public void build() throws IOException { build(LayoutParser.getInstance(configuration).parseXML(ROOT)); } @@ -138,8 +123,8 @@ * * @param elements the XML elements that specify how to document a class. */ - public void buildClassDoc(List<?> elements) throws Exception { - build(elements); + public void buildClassDoc(XMLNode node) throws Exception { + buildChildren(node); writer.close(); copyDocFiles(); } @@ -169,7 +154,7 @@ /** * Build the header of the page. */ - public void buildClassHeader() { + public void buildClassHeader(XMLNode node) { String key; if (isInterface) { key = "doclet.Interface"; @@ -185,7 +170,7 @@ /** * Build the class tree documentation. */ - public void buildClassTree() { + public void buildClassTree(XMLNode node) { writer.writeClassTree(); } @@ -193,42 +178,42 @@ * If this is a class, list all interfaces * implemented by this class. */ - public void buildImplementedInterfacesInfo() { + public void buildImplementedInterfacesInfo(XMLNode node) { writer.writeImplementedInterfacesInfo(); } /** * If this is an interface, list all super interfaces. */ - public void buildSuperInterfacesInfo() { + public void buildSuperInterfacesInfo(XMLNode node) { writer.writeSuperInterfacesInfo(); } /** * List the parameters of this class. */ - public void buildTypeParamInfo() { + public void buildTypeParamInfo(XMLNode node) { writer.writeTypeParamInfo(); } /** * List all the classes extend this one. */ - public void buildSubClassInfo() { + public void buildSubClassInfo(XMLNode node) { writer.writeSubClassInfo(); } /** * List all the interfaces that extend this one. */ - public void buildSubInterfacesInfo() { + public void buildSubInterfacesInfo(XMLNode node) { writer.writeSubInterfacesInfo(); } /** * If this is an interface, list all classes that implement this interface. */ - public void buildInterfaceUsageInfo () { + public void buildInterfaceUsageInfo (XMLNode node) { writer.writeInterfaceUsageInfo(); } @@ -236,21 +221,21 @@ * If this is an inner class or interface, list the enclosing class or * interface. */ - public void buildNestedClassInfo () { + public void buildNestedClassInfo (XMLNode node) { writer.writeNestedClassInfo(); } /** * If this class is deprecated, print the appropriate information. */ - public void buildDeprecationInfo () { + public void buildDeprecationInfo (XMLNode node) { writer.writeClassDeprecationInfo(); } /** * Build the signature of the current class. */ - public void buildClassSignature() { + public void buildClassSignature(XMLNode node) { StringBuffer modifiers = new StringBuffer(classDoc.modifiers() + " "); if (isEnum) { modifiers.append("enum "); @@ -276,14 +261,14 @@ /** * Build the class description. */ - public void buildClassDescription() { + public void buildClassDescription(XMLNode node) { writer.writeClassDescription(); } /** * Build the tag information for the current class. */ - public void buildClassTagInfo() { + public void buildClassTagInfo(XMLNode node) { writer.writeClassTagInfo(); } @@ -293,9 +278,9 @@ * @param elements the XML elements that specify how a member summary is * documented. */ - public void buildMemberSummary(List<?> elements) throws Exception { + public void buildMemberSummary(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getMemberSummaryBuilder(writer).build(elements); + getMemberSummaryBuilder(writer).buildChildren(node); writer.completeMemberSummaryBuild(); } @@ -305,9 +290,9 @@ * @param elements the XML elements that specify how a enum constants are * documented. */ - public void buildEnumConstantsDetails(List<?> elements) throws Exception { + public void buildEnumConstantsDetails(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getEnumConstantsBuilder(writer).build(elements); + getEnumConstantsBuilder(writer).buildChildren(node); } /** @@ -315,9 +300,9 @@ * * @param elements the XML elements that specify how a field is documented. */ - public void buildFieldDetails(List<?> elements) throws Exception { + public void buildFieldDetails(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getFieldBuilder(writer).build(elements); + getFieldBuilder(writer).buildChildren(node); } /** @@ -326,9 +311,9 @@ * @param elements the XML elements that specify how to document a * constructor. */ - public void buildConstructorDetails(List<?> elements) throws Exception { + public void buildConstructorDetails(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getConstructorBuilder(writer).build(elements); + getConstructorBuilder(writer).buildChildren(node); } /** @@ -336,15 +321,15 @@ * * @param elements the XML elements that specify how a method is documented. */ - public void buildMethodDetails(List<?> elements) throws Exception { + public void buildMethodDetails(XMLNode node) throws Exception { configuration.getBuilderFactory(). - getMethodBuilder(writer).build(elements); + getMethodBuilder(writer).buildChildren(node); } /** * Build the footer of the page. */ - public void buildClassFooter() { + public void buildClassFooter(XMLNode node) { writer.writeFooter(); } }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,7 +30,6 @@ import com.sun.javadoc.*; import java.io.*; import java.util.*; -import java.lang.reflect.*; /** * Builds the Constants Summary Page. @@ -109,20 +108,6 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError("DEBUG: " + this.getClass().getName() - + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** - * {@inheritDoc} - */ public void build() throws IOException { if (writer == null) { //Doclet does not support this output. @@ -144,29 +129,29 @@ * @param elements the list of elements describing constant summary * documentation. */ - public void buildConstantSummary(List<?> elements) throws Exception { - build(elements); + public void buildConstantSummary(XMLNode node) throws Exception { + buildChildren(node); writer.close(); } /** * Build the header. */ - public void buildHeader() { + public void buildHeader(XMLNode node) { writer.writeHeader(); } /** * Build the footer. */ - public void buildFooter() { + public void buildFooter(XMLNode node) { writer.writeFooter(); } /** * Build the table of contents. */ - public void buildContents() { + public void buildContents(XMLNode node) { writer.writeContentsHeader(); PackageDoc[] packages = configuration.packages; printedPackageHeaders = new HashSet<String>(); @@ -186,14 +171,14 @@ * @param elements the XML elements that represent the components * of documentation for each package. */ - public void buildConstantSummaries(List<?> elements) { + public void buildConstantSummaries(XMLNode node) { PackageDoc[] packages = configuration.packages; printedPackageHeaders = new HashSet<String>(); for (int i = 0; i < packages.length; i++) { if (hasConstantField(packages[i])) { currentPackage = packages[i]; //Build the documentation for the current package. - build(elements); + buildChildren(node); } } } @@ -204,8 +189,8 @@ * @param elements the list of XML elements that make up package * documentation. */ - public void buildPackageConstantSummary(List<?> elements) { - build(elements); + public void buildPackageConstantSummary(XMLNode node) { + buildChildren(node); } /** @@ -214,7 +199,7 @@ * @param elements the list of XML elements that make up the class * constant summary. */ - public void buildClassConstantSummary(List<?> elements) { + public void buildClassConstantSummary(XMLNode node) { ClassDoc[] classes = currentPackage.name().length() > 0 ? currentPackage.allClasses() : configuration.classDocCatalog.allClasses( @@ -227,14 +212,14 @@ } currentClass = classes[i]; //Build the documentation for the current class. - build(elements); + buildChildren(node); } } /** * Build the header for the given class. */ - public void buildPackageHeader() { + public void buildPackageHeader(XMLNode node) { String parsedPackageName = parsePackageName(currentPackage.name()); if (! printedPackageHeaders.contains(parsedPackageName)) { writer.writePackageName(currentPackage, @@ -246,7 +231,7 @@ /** * Build the header for the given class. */ - public void buildClassHeader() { + public void buildClassHeader(XMLNode node) { writer.writeConstantMembersHeader(currentClass); } @@ -254,14 +239,14 @@ * Print summary of constant members in the * class. */ - public void buildConstantMembers() { - new ConstantFieldBuilder(currentClass).buildMembersSummary(); + public void buildConstantMembers(XMLNode node) { + new ConstantFieldBuilder(currentClass).buildMembersSummary(node); } /** * Build the footer for the given class. */ - public void buildClassFooter() { + public void buildClassFooter(XMLNode node) { writer.writeConstantMembersFooter(currentClass); } @@ -362,7 +347,7 @@ /** * Builds the table of constants for a given class. */ - protected void buildMembersSummary() { + protected void buildMembersSummary(XMLNode node) { List<FieldDoc> members = new ArrayList<FieldDoc>(members()); if (members.size() > 0) { Collections.sort(members);
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,7 +28,6 @@ import com.sun.tools.doclets.internal.toolkit.util.*; import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; -import java.lang.reflect.*; import java.util.*; /** @@ -134,22 +133,6 @@ } /** - * {@inheritDoc} - */ - public void invokeMethod( - String methodName, - Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError( - "DEBUG: " + this.getClass().getName() + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Returns a list of constructors that will be documented for the given class. * This information can be used for doclet specific documentation * generation. @@ -175,21 +158,21 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildConstructorDoc(List<?> elements) { + public void buildConstructorDoc(XMLNode node) { if (writer == null) { return; } for (currentMethodIndex = 0; currentMethodIndex < constructors.size(); currentMethodIndex++) { - build(elements); + buildChildren(node); } } /** * Build the overall header. */ - public void buildHeader() { + public void buildHeader(XMLNode node) { writer.writeHeader( classDoc, configuration.getText("doclet.Constructor_Detail")); @@ -198,7 +181,7 @@ /** * Build the header for the individual constructor. */ - public void buildConstructorHeader() { + public void buildConstructorHeader(XMLNode node) { writer.writeConstructorHeader( (ConstructorDoc) constructors.get(currentMethodIndex), currentMethodIndex == 0); @@ -207,7 +190,7 @@ /** * Build the signature. */ - public void buildSignature() { + public void buildSignature(XMLNode node) { writer.writeSignature( (ConstructorDoc) constructors.get(currentMethodIndex)); } @@ -215,7 +198,7 @@ /** * Build the deprecation information. */ - public void buildDeprecationInfo() { + public void buildDeprecationInfo(XMLNode node) { writer.writeDeprecated( (ConstructorDoc) constructors.get(currentMethodIndex)); } @@ -224,7 +207,7 @@ * Build the comments for the constructor. Do nothing if * {@link Configuration#nocomment} is set to true. */ - public void buildConstructorComments() { + public void buildConstructorComments(XMLNode node) { if (!configuration.nocomment) { writer.writeComments( (ConstructorDoc) constructors.get(currentMethodIndex)); @@ -234,21 +217,21 @@ /** * Build the tag information. */ - public void buildTagInfo() { + public void buildTagInfo(XMLNode node) { writer.writeTags((ConstructorDoc) constructors.get(currentMethodIndex)); } /** * Build the footer for the individual constructor. */ - public void buildConstructorFooter() { + public void buildConstructorFooter(XMLNode node) { writer.writeConstructorFooter(); } /** * Build the overall footer. */ - public void buildFooter() { + public void buildFooter(XMLNode node) { writer.writeFooter(classDoc); } }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,6 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; import java.util.*; -import java.lang.reflect.*; /** * Builds documentation for a enum constants. @@ -116,22 +115,6 @@ } /** - * {@inheritDoc} - */ - public void invokeMethod( - String methodName, - Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError( - "DEBUG: " + this.getClass().getName() + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Returns a list of enum constants that will be documented for the given class. * This information can be used for doclet specific documentation * generation. @@ -165,21 +148,21 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildEnumConstant(List<?> elements) { + public void buildEnumConstant(XMLNode node) { if (writer == null) { return; } for (currentEnumConstantsIndex = 0; currentEnumConstantsIndex < enumConstants.size(); currentEnumConstantsIndex++) { - build(elements); + buildChildren(node); } } /** * Build the overall header. */ - public void buildHeader() { + public void buildHeader(XMLNode node) { writer.writeHeader( classDoc, configuration.getText("doclet.Enum_Constant_Detail")); @@ -188,7 +171,7 @@ /** * Build the header for the individual enum constants. */ - public void buildEnumConstantHeader() { + public void buildEnumConstantHeader(XMLNode node) { writer.writeEnumConstantHeader( (FieldDoc) enumConstants.get(currentEnumConstantsIndex), currentEnumConstantsIndex == 0); @@ -197,7 +180,7 @@ /** * Build the signature. */ - public void buildSignature() { + public void buildSignature(XMLNode node) { writer.writeSignature( (FieldDoc) enumConstants.get(currentEnumConstantsIndex)); } @@ -205,7 +188,7 @@ /** * Build the deprecation information. */ - public void buildDeprecationInfo() { + public void buildDeprecationInfo(XMLNode node) { writer.writeDeprecated( (FieldDoc) enumConstants.get(currentEnumConstantsIndex)); } @@ -214,7 +197,7 @@ * Build the comments for the enum constant. Do nothing if * {@link Configuration#nocomment} is set to true. */ - public void buildEnumConstantComments() { + public void buildEnumConstantComments(XMLNode node) { if (!configuration.nocomment) { writer.writeComments( (FieldDoc) enumConstants.get(currentEnumConstantsIndex)); @@ -224,7 +207,7 @@ /** * Build the tag information. */ - public void buildTagInfo() { + public void buildTagInfo(XMLNode node) { writer.writeTags( (FieldDoc) enumConstants.get(currentEnumConstantsIndex)); } @@ -232,14 +215,14 @@ /** * Build the footer for the individual enum constants. */ - public void buildEnumConstantFooter() { + public void buildEnumConstantFooter(XMLNode node) { writer.writeEnumConstantFooter(); } /** * Build the overall footer. */ - public void buildFooter() { + public void buildFooter(XMLNode node) { writer.writeFooter(classDoc); }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,6 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; import java.util.*; -import java.lang.reflect.*; /** * Builds documentation for a field. @@ -117,22 +116,6 @@ } /** - * {@inheritDoc} - */ - public void invokeMethod( - String methodName, - Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError( - "DEBUG: " + this.getClass().getName() + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Returns a list of fields that will be documented for the given class. * This information can be used for doclet specific documentation * generation. @@ -166,21 +149,21 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildFieldDoc(List<?> elements) { + public void buildFieldDoc(XMLNode node) { if (writer == null) { return; } for (currentFieldIndex = 0; currentFieldIndex < fields.size(); currentFieldIndex++) { - build(elements); + buildChildren(node); } } /** * Build the overall header. */ - public void buildHeader() { + public void buildHeader(XMLNode node) { writer.writeHeader( classDoc, configuration.getText("doclet.Field_Detail")); @@ -189,7 +172,7 @@ /** * Build the header for the individual field. */ - public void buildFieldHeader() { + public void buildFieldHeader(XMLNode node) { writer.writeFieldHeader( (FieldDoc) fields.get(currentFieldIndex), currentFieldIndex == 0); @@ -198,14 +181,14 @@ /** * Build the signature. */ - public void buildSignature() { + public void buildSignature(XMLNode node) { writer.writeSignature((FieldDoc) fields.get(currentFieldIndex)); } /** * Build the deprecation information. */ - public void buildDeprecationInfo() { + public void buildDeprecationInfo(XMLNode node) { writer.writeDeprecated((FieldDoc) fields.get(currentFieldIndex)); } @@ -213,7 +196,7 @@ * Build the comments for the field. Do nothing if * {@link Configuration#nocomment} is set to true. */ - public void buildFieldComments() { + public void buildFieldComments(XMLNode node) { if (!configuration.nocomment) { writer.writeComments((FieldDoc) fields.get(currentFieldIndex)); } @@ -222,21 +205,21 @@ /** * Build the tag information. */ - public void buildTagInfo() { + public void buildTagInfo(XMLNode node) { writer.writeTags((FieldDoc) fields.get(currentFieldIndex)); } /** * Build the footer for the individual field. */ - public void buildFieldFooter() { + public void buildFieldFooter(XMLNode node) { writer.writeFieldFooter(); } /** * Build the overall footer. */ - public void buildFooter() { + public void buildFooter(XMLNode node) { writer.writeFooter(classDoc); }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Thu Jul 08 11:28:01 2010 -0700 @@ -45,8 +45,8 @@ /** * The map of XML elements that have been parsed. */ - private Map<String,List<Object>> xmlElementsMap; - + private Map<String,XMLNode> xmlElementsMap; + private XMLNode currentNode; private Configuration configuration; private static LayoutParser instance; private String currentRoot; @@ -56,7 +56,7 @@ * This class is a singleton. */ private LayoutParser(Configuration configuration) { - xmlElementsMap = new HashMap<String,List<Object>>(); + xmlElementsMap = new HashMap<String,XMLNode>(); this.configuration = configuration; } @@ -78,20 +78,18 @@ * * @return List the list of XML elements parsed. */ - public List<?> parseXML(String root) { + public XMLNode parseXML(String root) { if (xmlElementsMap.containsKey(root)) { return xmlElementsMap.get(root); } try { - List<Object> xmlElements = new ArrayList<Object>(); - xmlElementsMap.put(root, xmlElements); currentRoot = root; isParsing = false; SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); InputStream in = configuration.getBuilderXML(); saxParser.parse(in, this); - return xmlElements; + return xmlElementsMap.get(root); } catch (Throwable t) { t.printStackTrace(); throw new DocletAbortException(); @@ -101,39 +99,30 @@ /** * {@inheritDoc} */ + @Override public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException { if (isParsing || qName.equals(currentRoot)) { isParsing = true; - List<Object> xmlElements = xmlElementsMap.get(currentRoot); - xmlElements.add(qName); + currentNode = new XMLNode(currentNode, qName); + for (int i = 0; i < attrs.getLength(); i++) + currentNode.attrs.put(attrs.getLocalName(i), attrs.getValue(i)); + if (qName.equals(currentRoot)) + xmlElementsMap.put(qName, currentNode); } } /** * {@inheritDoc} */ + @Override public void endElement(String namespaceURI, String sName, String qName) throws SAXException { if (! isParsing) { - isParsing = false; return; } - List<Object> xmlElements = xmlElementsMap.get(currentRoot); - if (xmlElements.get(xmlElements.size()-1).equals(qName)) { - return; - } else { - List<Object> subElements = new ArrayList<Object>(); - int targetIndex = xmlElements.indexOf(qName); - int size = xmlElements.size(); - for (int i = targetIndex; i < size; i++) { - subElements.add(xmlElements.get(targetIndex)); - xmlElements.remove(targetIndex); - } - //Save the sub elements as a list. - xmlElements.add(subElements); - } + currentNode = currentNode.parent; isParsing = ! qName.equals(currentRoot); } }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,6 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; import java.util.*; -import java.lang.reflect.*; /** * Builds the member summary. @@ -175,22 +174,6 @@ } /** - * {@inheritDoc} - */ - public void invokeMethod( - String methodName, - Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError( - "DEBUG: " + this.getClass().getName() + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Return true it there are any members to summarize. * * @return true if there are any members to summarize. @@ -211,7 +194,7 @@ /** * Build the summary for the enum constants. */ - public void buildEnumConstantsSummary() { + public void buildEnumConstantsSummary(XMLNode node) { buildSummary( memberSummaryWriters[VisibleMemberMap.ENUM_CONSTANTS], visibleMemberMaps[VisibleMemberMap.ENUM_CONSTANTS]); @@ -220,7 +203,7 @@ /** * Build the summary for the optional members. */ - public void buildAnnotationTypeOptionalMemberSummary() { + public void buildAnnotationTypeOptionalMemberSummary(XMLNode node) { buildSummary( memberSummaryWriters[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL], visibleMemberMaps[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_OPTIONAL]); @@ -229,7 +212,7 @@ /** * Build the summary for the optional members. */ - public void buildAnnotationTypeRequiredMemberSummary() { + public void buildAnnotationTypeRequiredMemberSummary(XMLNode node) { buildSummary( memberSummaryWriters[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED], visibleMemberMaps[VisibleMemberMap.ANNOTATION_TYPE_MEMBER_REQUIRED]); @@ -238,7 +221,7 @@ /** * Build the summary for the fields. */ - public void buildFieldsSummary() { + public void buildFieldsSummary(XMLNode node) { buildSummary( memberSummaryWriters[VisibleMemberMap.FIELDS], visibleMemberMaps[VisibleMemberMap.FIELDS]); @@ -247,7 +230,7 @@ /** * Build the inherited summary for the fields. */ - public void buildFieldsInheritedSummary() { + public void buildFieldsInheritedSummary(XMLNode node) { buildInheritedSummary( memberSummaryWriters[VisibleMemberMap.FIELDS], visibleMemberMaps[VisibleMemberMap.FIELDS]); @@ -256,7 +239,7 @@ /** * Build the summary for the nested classes. */ - public void buildNestedClassesSummary() { + public void buildNestedClassesSummary(XMLNode node) { buildSummary( memberSummaryWriters[VisibleMemberMap.INNERCLASSES], visibleMemberMaps[VisibleMemberMap.INNERCLASSES]); @@ -265,7 +248,7 @@ /** * Build the inherited summary for the nested classes. */ - public void buildNestedClassesInheritedSummary() { + public void buildNestedClassesInheritedSummary(XMLNode node) { buildInheritedSummary( memberSummaryWriters[VisibleMemberMap.INNERCLASSES], visibleMemberMaps[VisibleMemberMap.INNERCLASSES]); @@ -274,7 +257,7 @@ /** * Build the method summary. */ - public void buildMethodsSummary() { + public void buildMethodsSummary(XMLNode node) { buildSummary( memberSummaryWriters[VisibleMemberMap.METHODS], visibleMemberMaps[VisibleMemberMap.METHODS]); @@ -283,7 +266,7 @@ /** * Build the inherited method summary. */ - public void buildMethodsInheritedSummary() { + public void buildMethodsInheritedSummary(XMLNode node) { buildInheritedSummary( memberSummaryWriters[VisibleMemberMap.METHODS], visibleMemberMaps[VisibleMemberMap.METHODS]); @@ -292,7 +275,7 @@ /** * Build the constructor summary. */ - public void buildConstructorsSummary() { + public void buildConstructorsSummary(XMLNode node) { buildSummary( memberSummaryWriters[VisibleMemberMap.CONSTRUCTORS], visibleMemberMaps[VisibleMemberMap.CONSTRUCTORS]);
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,7 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; import java.util.*; -import java.lang.reflect.*; + /** * Builds documentation for a method. * @@ -112,22 +112,6 @@ } /** - * {@inheritDoc} - */ - public void invokeMethod( - String methodName, - Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError( - "DEBUG: " + this.getClass().getName() + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Returns a list of methods that will be documented for the given class. * This information can be used for doclet specific documentation * generation. @@ -158,21 +142,21 @@ /** * Build the method documentation. */ - public void buildMethodDoc(List<?> elements) { + public void buildMethodDoc(XMLNode node) { if (writer == null) { return; } for (currentMethodIndex = 0; currentMethodIndex < methods.size(); currentMethodIndex++) { - build(elements); + buildChildren(node); } } /** * Build the overall header. */ - public void buildHeader() { + public void buildHeader(XMLNode node) { writer.writeHeader( classDoc, configuration.getText("doclet.Method_Detail")); @@ -181,7 +165,7 @@ /** * Build the header for the individual method. */ - public void buildMethodHeader() { + public void buildMethodHeader(XMLNode node) { writer.writeMethodHeader( (MethodDoc) methods.get(currentMethodIndex), currentMethodIndex == 0); @@ -190,14 +174,14 @@ /** * Build the signature. */ - public void buildSignature() { + public void buildSignature(XMLNode node) { writer.writeSignature((MethodDoc) methods.get(currentMethodIndex)); } /** * Build the deprecation information. */ - public void buildDeprecationInfo() { + public void buildDeprecationInfo(XMLNode node) { writer.writeDeprecated((MethodDoc) methods.get(currentMethodIndex)); } @@ -205,7 +189,7 @@ * Build the comments for the method. Do nothing if * {@link Configuration#nocomment} is set to true. If this method */ - public void buildMethodComments() { + public void buildMethodComments(XMLNode node) { if (!configuration.nocomment) { MethodDoc method = (MethodDoc) methods.get(currentMethodIndex); @@ -228,21 +212,21 @@ /** * Build the tag information. */ - public void buildTagInfo() { + public void buildTagInfo(XMLNode node) { writer.writeTags((MethodDoc) methods.get(currentMethodIndex)); } /** * Build the footer of the method. */ - public void buildMethodFooter() { + public void buildMethodFooter(XMLNode node) { writer.writeMethodFooter(); } /** * Build the overall footer. */ - public void buildFooter() { + public void buildFooter(XMLNode node) { writer.writeFooter(classDoc); }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,6 @@ import com.sun.tools.doclets.internal.toolkit.*; import com.sun.javadoc.*; import java.io.*; -import java.util.*; -import java.lang.reflect.*; /** * Builds the summary for a given package. @@ -85,22 +83,6 @@ } /** - * {@inheritDoc} - */ - public void invokeMethod( - String methodName, - Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError( - "DEBUG: " + this.getClass().getName() + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Build the package summary. */ public void build() throws IOException { @@ -121,8 +103,8 @@ /** * Build the package documentation. */ - public void buildPackageDoc(List<?> elements) throws Exception { - build(elements); + public void buildPackageDoc(XMLNode node) throws Exception { + buildChildren(node); packageWriter.close(); Util.copyDocFiles( configuration, @@ -136,14 +118,14 @@ /** * Build the header of the summary. */ - public void buildPackageHeader() { + public void buildPackageHeader(XMLNode node) { packageWriter.writePackageHeader(Util.getPackageName(packageDoc)); } /** * Build the description of the summary. */ - public void buildPackageDescription() { + public void buildPackageDescription(XMLNode node) { if (configuration.nocomment) { return; } @@ -153,7 +135,7 @@ /** * Build the tags of the summary. */ - public void buildPackageTags() { + public void buildPackageTags(XMLNode node) { if (configuration.nocomment) { return; } @@ -163,28 +145,28 @@ /** * Build the package summary. */ - public void buildSummary(List<?> elements) { - build(elements); + public void buildSummary(XMLNode node) { + buildChildren(node); } /** * Build the overall header. */ - public void buildSummaryHeader() { + public void buildSummaryHeader(XMLNode node) { packageWriter.writeSummaryHeader(); } /** * Build the overall footer. */ - public void buildSummaryFooter() { + public void buildSummaryFooter(XMLNode node) { packageWriter.writeSummaryFooter(); } /** * Build the summary for the classes in this package. */ - public void buildClassSummary() { + public void buildClassSummary(XMLNode node) { String classTableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Class_Summary"), @@ -209,7 +191,7 @@ /** * Build the summary for the interfaces in this package. */ - public void buildInterfaceSummary() { + public void buildInterfaceSummary(XMLNode node) { String interfaceTableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Interface_Summary"), @@ -234,7 +216,7 @@ /** * Build the summary for the enums in this package. */ - public void buildAnnotationTypeSummary() { + public void buildAnnotationTypeSummary(XMLNode node) { String annotationtypeTableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Annotation_Types_Summary"), @@ -259,7 +241,7 @@ /** * Build the summary for the enums in this package. */ - public void buildEnumSummary() { + public void buildEnumSummary(XMLNode node) { String enumTableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Enum_Summary"), @@ -284,7 +266,7 @@ /** * Build the summary for the exceptions in this package. */ - public void buildExceptionSummary() { + public void buildExceptionSummary(XMLNode node) { String exceptionTableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Exception_Summary"), @@ -309,7 +291,7 @@ /** * Build the summary for the errors in this package. */ - public void buildErrorSummary() { + public void buildErrorSummary(XMLNode node) { String errorTableSummary = configuration.getText("doclet.Member_Table_Summary", configuration.getText("doclet.Error_Summary"), @@ -334,7 +316,7 @@ /** * Build the footer of the summary. */ - public void buildPackageFooter() { + public void buildPackageFooter(XMLNode node) { packageWriter.writePackageFooter(); } }
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,7 +26,6 @@ package com.sun.tools.doclets.internal.toolkit.builders; import java.io.*; -import java.lang.reflect.*; import java.util.*; import com.sun.javadoc.*; @@ -132,47 +131,33 @@ /** * Build the serialized form. */ - public void buildSerializedForm(List<?> elements) throws Exception { - build(elements); + public void buildSerializedForm(XMLNode node) throws Exception { + buildChildren(node); writer.close(); } /** - * {@inheritDoc} - */ - public void invokeMethod(String methodName, Class<?>[] paramClasses, - Object[] params) - throws Exception { - if (DEBUG) { - configuration.root.printError("DEBUG: " + this.getClass().getName() - + "." + methodName); - } - Method method = this.getClass().getMethod(methodName, paramClasses); - method.invoke(this, params); - } - - /** * Build the header. */ - public void buildHeader() { + public void buildHeader(XMLNode node) { writer.writeHeader(configuration.getText("doclet.Serialized_Form")); } /** * Build the contents. */ - public void buildSerializedFormSummaries(List<?> elements) { + public void buildSerializedFormSummaries(XMLNode node) { PackageDoc[] packages = configuration.packages; for (int i = 0; i < packages.length; i++) { currentPackage = packages[i]; - build(elements); + buildChildren(node); } } /** * Build the package serialized for for the current package being processed. */ - public void buildPackageSerializedForm(List<?> elements) { + public void buildPackageSerializedForm(XMLNode node) { String foo = currentPackage.name(); ClassDoc[] classes = currentPackage.allClasses(false); if (classes == null || classes.length == 0) { @@ -184,14 +169,14 @@ if (!serialClassFoundToDocument(classes)) { return; } - build(elements); + buildChildren(node); } - public void buildPackageHeader() { + public void buildPackageHeader(XMLNode node) { writer.writePackageHeader(Util.getPackageName(currentPackage)); } - public void buildClassSerializedForm(List<?> elements) { + public void buildClassSerializedForm(XMLNode node) { ClassDoc[] classes = currentPackage.allClasses(false); Arrays.sort(classes); for (int j = 0; j < classes.length; j++) { @@ -202,19 +187,19 @@ if(!serialClassInclude(currentClass)) { continue; } - build(elements); + buildChildren(node); } } } - public void buildClassHeader() { + public void buildClassHeader(XMLNode node) { writer.writeClassHeader(currentClass); } /** * Build the serial UID information for the given class. */ - public void buildSerialUIDInfo() { + public void buildSerialUIDInfo(XMLNode node) { FieldDoc[] fields = currentClass.fields(false); for (int i = 0; i < fields.length; i++) { if (fields[i].name().equals("serialVersionUID") && @@ -229,7 +214,7 @@ /** * Build the footer. */ - public void buildFooter() { + public void buildFooter(XMLNode node) { writer.writeFooter(); } @@ -316,7 +301,7 @@ /** * Build the method header. */ - public void buildMethodHeader() { + public void buildMethodHeader(XMLNode node) { if (currentClass.serializationMethods().length > 0) { methodWriter.writeHeader( configuration.getText("doclet.Serialized_Form_methods")); @@ -333,28 +318,28 @@ /** * Build the method sub header. */ - public void buildMethodSubHeader() { + public void buildMethodSubHeader(XMLNode node) { methodWriter.writeMemberHeader((MethodDoc) currentMember); } /** * Build the deprecated method description. */ - public void buildDeprecatedMethodInfo() { + public void buildDeprecatedMethodInfo(XMLNode node) { methodWriter.writeDeprecatedMemberInfo((MethodDoc) currentMember); } /** * Build method tags. */ - public void buildMethodDescription() { + public void buildMethodDescription(XMLNode node) { methodWriter.writeMemberDescription((MethodDoc) currentMember); } /** * Build the method tags. */ - public void buildMethodTags() { + public void buildMethodTags(XMLNode node) { methodWriter.writeMemberTags((MethodDoc) currentMember); MethodDoc method = (MethodDoc)currentMember; if (method.name().compareTo("writeExternal") == 0 @@ -370,24 +355,24 @@ /** * build the information for the method. */ - public void buildMethodInfo(List<?> elements) { + public void buildMethodInfo(XMLNode node) { if(configuration.nocomment){ return; } - build(elements); + buildChildren(node); } /** * Build the method footer. */ - public void buildMethodFooter() { + public void buildMethodFooter(XMLNode node) { methodWriter.writeMemberFooter(); } /** * Build the field header. */ - public void buildFieldHeader() { + public void buildFieldHeader(XMLNode node) { if (currentClass.serializableFields().length > 0) { buildFieldSerializationOverview(currentClass); fieldWriter.writeHeader(configuration.getText( @@ -426,7 +411,7 @@ /** * Build the field sub header. */ - public void buildFieldSubHeader() { + public void buildFieldSubHeader(XMLNode node) { if (! currentClass.definesSerializableFields() ){ FieldDoc field = (FieldDoc) currentMember; fieldWriter.writeMemberHeader(field.type().asClassDoc(), @@ -437,7 +422,7 @@ /** * Build the field deprecation information. */ - public void buildFieldDeprecationInfo() { + public void buildFieldDeprecationInfo(XMLNode node) { if (!currentClass.definesSerializableFields()) { FieldDoc field = (FieldDoc)currentMember; fieldWriter.writeMemberDeprecatedInfo(field); @@ -447,7 +432,7 @@ /** * Build the field information. */ - public void buildFieldInfo() { + public void buildFieldInfo(XMLNode node) { if(configuration.nocomment){ return; } @@ -483,7 +468,7 @@ /** * Build the field sub footer. */ - public void buildFieldSubFooter() { + public void buildFieldSubFooter(XMLNode node) { if (! currentClass.definesSerializableFields()) { fieldWriter.writeMemberFooter(); } @@ -493,12 +478,12 @@ * Build the summaries for the methods that belong to the given * class. */ - public void buildSerializableMethods(List<?> elements) { + public void buildSerializableMethods(XMLNode node) { MemberDoc[] members = currentClass.serializationMethods(); if (members.length > 0) { for (int i = 0; i < members.length; i++) { currentMember = members[i]; - build(elements); + buildChildren(node); } } } @@ -507,12 +492,12 @@ * Build the summaries for the fields that belong to the given * class. */ - public void buildSerializableFields(List<?> elements) { + public void buildSerializableFields(XMLNode node) { MemberDoc[] members = currentClass.serializableFields(); if (members.length > 0) { for (int i = 0; i < members.length; i++) { currentMember = members[i]; - build(elements); + buildChildren(node); } } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,69 @@ +/* + * Copyright (c) 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 com.sun.tools.doclets.internal.toolkit.builders; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Simple class to represent the attribute and elements of an XML node. + */ +public class XMLNode { + XMLNode(XMLNode parent, String qname) { + this.parent = parent; + name = qname; + attrs = new HashMap<String,String>(); + children = new ArrayList<XMLNode>(); + + if (parent != null) + parent.children.add(this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("<"); + sb.append(name); + for (Map.Entry<String,String> e: attrs.entrySet()) + sb.append(" " + e.getKey() + "=\"" + e.getValue() + "\""); + if (children.size() == 0) + sb.append("/>"); + else { + sb.append(">"); + for (XMLNode c: children) + sb.append(c.toString()); + sb.append("</" + name + ">"); + } + return sb.toString(); + } + + final XMLNode parent; + final String name; + final Map<String,String> attrs; + final List<XMLNode> children; +}
--- a/langtools/src/share/classes/com/sun/tools/javac/Launcher.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/Launcher.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,7 +41,7 @@ * of a <em>project</em>). Simply ensure that this class is added to * the project and make it the main class of the project.</p> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/Server.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/Server.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,7 +36,7 @@ * Java Compiler Server. Can be used to speed up a set of (small) * compilation tasks by caching jar files between compilations. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,7 +33,7 @@ * Provides simple functionalities for javac diagnostic formatting. * @param <D> type of diagnostic handled by this formatter * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ * This interface must be implemented by any javac class that has non-trivial * formatting needs (e.g. where toString() does not apply because of localization). * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacScope.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacScope.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,7 +38,7 @@ /** * Provides an implementation of Scope. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java Thu Jul 08 11:28:01 2010 -0700 @@ -54,9 +54,9 @@ import com.sun.tools.javac.main.JavaCompiler; /** - * Provides access to functionality specific to the Sun Java Compiler, javac. + * Provides access to functionality specific to the JDK Java Compiler, javac. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p> @@ -502,7 +502,7 @@ } /** - * For internal use by Sun Microsystems only. This method will be + * For internal use only. This method will be * removed without warning. */ public Context getContext() { @@ -510,7 +510,7 @@ } /** - * For internal use by Sun Microsystems only. This method will be + * For internal use only. This method will be * removed without warning. */ public void updateContext(Context newContext) { @@ -518,7 +518,7 @@ } /** - * For internal use by Sun Microsystems only. This method will be + * For internal use only. This method will be * removed without warning. */ public Type parseType(String expr, TypeElement scope) {
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTool.java Thu Jul 08 11:28:01 2010 -0700 @@ -57,7 +57,7 @@ /** * TODO: describe com.sun.tools.javac.api.Tool * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java Thu Jul 08 11:28:01 2010 -0700 @@ -71,7 +71,7 @@ /** * Provides an implementation of Trees. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,7 +32,7 @@ * This interface defines the minimum requirements in order to provide support * for localized formatted strings. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,7 @@ * <p>This class might be moved to {@link javax.tools} in a future * release. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Attribute.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,8 +38,8 @@ /** An annotation value. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,7 +27,7 @@ /** * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Flags.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,8 +33,8 @@ /** Access flags and other modifiers for Java classes and members. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -226,7 +226,7 @@ public static final long HYPOTHETICAL = 1L<<37; /** - * Flag that marks a Sun proprietary class. + * Flag that marks an internal proprietary class. */ public static final long PROPRIETARY = 1L<<38; @@ -235,6 +235,12 @@ */ public static final long DISJOINT = 1L<<39; + /** + * Flag that marks a signature-polymorphic invoke method. + * (These occur inside java.dyn.MethodHandle.) + */ + public static final long POLYMORPHIC_SIGNATURE = 1L<<40; + /** Modifier masks. */ public static final int
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Kinds.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,8 +38,8 @@ * different subclasses of Symbol. Symbol kinds are organized so they can be * or'ed to sets. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,8 +39,8 @@ /** * A class for handling -Xlint suboptions and @SuppresssWarnings. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -196,14 +196,19 @@ RAW("rawtypes"), /** - * Warn about Sun proprietary API that may be removed in a future release. + * Warn about proprietary API that may be removed in a future release. */ SUNAPI("sunapi", true), /** * Warn about issues relating to use of statics */ - STATIC("static"); + STATIC("static"), + + /** + * Warn about potentially unsafe vararg methods + */ + VARARGS("varargs"); LintCategory(String option) { this(option, false);
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,7 +41,7 @@ * A combined type/symbol visitor for generating non-trivial localized string * representation of types and symbols. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Scope.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,8 @@ * as hash tables. Scopes can be nested; the next field of a scope points * to its next outer scope. Nested scopes can share their hash tables. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,8 +33,8 @@ /** The source language version accepted. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -171,6 +171,10 @@ public boolean allowStringsInSwitch() { return compareTo(JDK1_7) >= 0; } + // JSR 292: recognize @PolymorphicSignature on java/dyn names + public boolean allowPolymorphicSignature() { + return compareTo(JDK1_7) >= 0; + } public static SourceVersion toSourceVersion(Source source) { switch(source) { case JDK1_2:
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java Thu Jul 08 11:28:01 2010 -0700 @@ -49,8 +49,8 @@ * types, packages. Each subclass is represented as a static inner class * inside Symbol. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,8 +42,8 @@ * fields. This makes it possible to work in multiple concurrent * projects, which might use different class files for library classes. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -120,6 +120,7 @@ public final Type cloneableType; public final Type serializableType; public final Type methodHandleType; + public final Type polymorphicSignatureType; public final Type invokeDynamicType; public final Type throwableType; public final Type errorType; @@ -291,24 +292,6 @@ } } - public void synthesizeMHTypeIfMissing(final Type type) { - final Completer completer = type.tsym.completer; - if (completer != null) { - type.tsym.completer = new Completer() { - public void complete(Symbol sym) throws CompletionFailure { - try { - completer.complete(sym); - } catch (CompletionFailure e) { - sym.flags_field |= (PUBLIC | ABSTRACT); - ((ClassType) sym.type).supertype_field = objectType; - // do not bother to create MH.type if not visibly declared - // this sym just accumulates invoke(...) methods - } - } - }; - } - } - public void synthesizeBoxTypeIfMissing(final Type type) { ClassSymbol sym = reader.enterClass(boxedName[type.tag]); final Completer completer = sym.completer; @@ -426,6 +409,7 @@ throwableType = enterClass("java.lang.Throwable"); serializableType = enterClass("java.io.Serializable"); methodHandleType = enterClass("java.dyn.MethodHandle"); + polymorphicSignatureType = enterClass("java.dyn.MethodHandle$PolymorphicSignature"); invokeDynamicType = enterClass("java.dyn.InvokeDynamic"); errorType = enterClass("java.lang.Error"); illegalArgumentExceptionType = enterClass("java.lang.IllegalArgumentException"); @@ -463,13 +447,12 @@ synthesizeEmptyInterfaceIfMissing(cloneableType); synthesizeEmptyInterfaceIfMissing(serializableType); - synthesizeMHTypeIfMissing(methodHandleType); - synthesizeMHTypeIfMissing(invokeDynamicType); + synthesizeEmptyInterfaceIfMissing(polymorphicSignatureType); synthesizeBoxTypeIfMissing(doubleType); synthesizeBoxTypeIfMissing(floatType); synthesizeBoxTypeIfMissing(voidType); - // Enter a synthetic class that is used to mark Sun + // Enter a synthetic class that is used to mark internal // proprietary classes in ct.sym. This class does not have a // class file. ClassType proprietaryType = (ClassType)enterClass("sun.Proprietary+Annotation");
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/TargetType.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,8 +39,8 @@ * annotation targets a type argument in a local variable, method return type, * or a typecast). * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Thu Jul 08 11:28:01 2010 -0700 @@ -56,8 +56,8 @@ * the error type (tag: ERROR, class: ErrorType). * </pre> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> *
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,8 @@ /** A type annotation position. * -* <p><b>This is NOT part of any API supported by Sun Microsystems. If -* you write code that depends on this, you do so at your own risk. +* <p><b>This is NOT part of any supported API. +* If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,8 @@ /** An interface for type tag values, which distinguish between different * sorts of types. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Thu Jul 08 11:28:01 2010 -0700 @@ -58,7 +58,7 @@ * <dd>A second list of types should be named ss.</dd> * </dl> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,8 +35,8 @@ * which is processed at the top level of any set of recursive calls * requesting it be processed. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Thu Jul 08 11:28:01 2010 -0700 @@ -59,8 +59,8 @@ * @see ConstFold * @see Infer * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -122,7 +122,6 @@ relax = (options.get("-retrofit") != null || options.get("-relax") != null); useBeforeDeclarationWarning = options.get("useBeforeDeclarationWarning") != null; - allowInvokedynamic = options.get("invokedynamic") != null; enableSunApiLintControl = options.get("enableSunApiLintControl") != null; } @@ -155,10 +154,6 @@ */ boolean allowAnonOuterThis; - /** Switch: allow invokedynamic syntax - */ - boolean allowInvokedynamic; - /** * Switch: warn about use of variable before declaration? * RFE: 6425594 @@ -166,7 +161,7 @@ boolean useBeforeDeclarationWarning; /** - * Switch: allow lint infrastructure to control Sun proprietary + * Switch: allow lint infrastructure to control proprietary * API warnings. */ boolean enableSunApiLintControl; @@ -657,6 +652,8 @@ attribStat(l.head, localEnv); } + chk.checkVarargMethodDecl(tree); + // Check that type parameters are well-formed. chk.validate(tree.typarams, localEnv); if ((owner.flags() & ANNOTATION) != 0 && @@ -1384,9 +1381,15 @@ // as a special case, MethodHandle.<T>invoke(abc) and InvokeDynamic.<T>foo(abc) // has type <T>, and T can be a primitive type. if (tree.meth.getTag() == JCTree.SELECT && !typeargtypes.isEmpty()) { - Type selt = ((JCFieldAccess) tree.meth).selected.type; - if ((selt == syms.methodHandleType && methName == names.invoke) || selt == syms.invokeDynamicType) { + JCFieldAccess mfield = (JCFieldAccess) tree.meth; + if ((mfield.selected.type.tsym != null && + (mfield.selected.type.tsym.flags() & POLYMORPHIC_SIGNATURE) != 0) + || + (mfield.sym != null && + (mfield.sym.flags() & POLYMORPHIC_SIGNATURE) != 0)) { assert types.isSameType(restype, typeargtypes.head) : mtype; + assert mfield.selected.type == syms.methodHandleType + || mfield.selected.type == syms.invokeDynamicType; typeargtypesNonRefOK = true; } } @@ -2634,10 +2637,11 @@ } if (useVarargs) { JCTree tree = env.tree; + Type argtype = owntype.getParameterTypes().last(); if (owntype.getReturnType().tag != FORALL || warned) { - chk.checkVararg(env.tree.pos(), owntype.getParameterTypes()); + chk.checkVararg(env.tree.pos(), owntype.getParameterTypes(), sym, env); } - Type elemtype = types.elemtype(owntype.getParameterTypes().last()); + Type elemtype = types.elemtype(argtype); switch (tree.getTag()) { case JCTree.APPLY: ((JCMethodInvocation) tree).varargsElement = elemtype;
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContext.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ /** Contains information specific to the attribute and enter * passes, to be used in place of the generic field in environments. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** {@code Env<A>} specialized as {@code Env<AttrContext>} * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Thu Jul 08 11:28:01 2010 -0700 @@ -47,8 +47,8 @@ /** Type checking helper class for the attribution phase. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -64,6 +64,7 @@ private final JCDiagnostic.Factory diags; private final boolean skipAnnotations; private boolean warnOnSyntheticConflicts; + private boolean suppressAbortOnBadClassFile; private final TreeInfo treeinfo; // The set of lint options currently in effect. It is initialized @@ -98,12 +99,14 @@ complexInference = options.get("-complexinference") != null; skipAnnotations = options.get("skipAnnotations") != null; warnOnSyntheticConflicts = options.get("warnOnSyntheticConflicts") != null; + suppressAbortOnBadClassFile = options.get("suppressAbortOnBadClassFile") != null; Target target = Target.instance(context); syntheticNameChar = target.syntheticNameChar(); boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION); boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED); + boolean verboseVarargs = lint.isEnabled(LintCategory.VARARGS); boolean verboseSunApi = lint.isEnabled(LintCategory.SUNAPI); boolean enforceMandatoryWarnings = source.enforceMandatoryWarnings(); @@ -111,6 +114,8 @@ enforceMandatoryWarnings, "deprecated"); uncheckedHandler = new MandatoryWarningHandler(log, verboseUnchecked, enforceMandatoryWarnings, "unchecked"); + unsafeVarargsHandler = new MandatoryWarningHandler(log, verboseVarargs, + enforceMandatoryWarnings, "varargs"); sunApiHandler = new MandatoryWarningHandler(log, verboseSunApi, enforceMandatoryWarnings, "sunapi"); } @@ -148,7 +153,11 @@ */ private MandatoryWarningHandler uncheckedHandler; - /** A handler for messages about using Sun proprietary API. + /** A handler for messages about unchecked or unsafe vararg method decl. + */ + private MandatoryWarningHandler unsafeVarargsHandler; + + /** A handler for messages about using proprietary API. */ private MandatoryWarningHandler sunApiHandler; @@ -180,7 +189,16 @@ uncheckedHandler.report(pos, msg, args); } - /** Warn about using Sun proprietary API. + /** Warn about unsafe vararg method decl. + * @param pos Position to be used for error reporting. + * @param sym The deprecated symbol. + */ + void warnUnsafeVararg(DiagnosticPosition pos, Type elemType) { + if (!lint.isSuppressed(LintCategory.VARARGS)) + unsafeVarargsHandler.report(pos, "varargs.non.reifiable.type", elemType); + } + + /** Warn about using proprietary API. * @param pos Position to be used for error reporting. * @param msg A string describing the problem. */ @@ -200,6 +218,7 @@ public void reportDeferredDiagnostics() { deprecationHandler.reportDeferredDiagnostic(); uncheckedHandler.reportDeferredDiagnostic(); + unsafeVarargsHandler.reportDeferredDiagnostic(); sunApiHandler.reportDeferredDiagnostic(); } @@ -210,7 +229,8 @@ */ public Type completionError(DiagnosticPosition pos, CompletionFailure ex) { log.error(pos, "cant.access", ex.sym, ex.getDetailValue()); - if (ex instanceof ClassReader.BadClassFile) throw new Abort(); + if (ex instanceof ClassReader.BadClassFile + && !suppressAbortOnBadClassFile) throw new Abort(); else return syms.errType; } @@ -677,17 +697,33 @@ } } + void checkVarargMethodDecl(JCMethodDecl tree) { + MethodSymbol m = tree.sym; + //check the element type of the vararg + if (m.isVarArgs()) { + Type varargElemType = types.elemtype(tree.params.last().type); + if (!types.isReifiable(varargElemType)) { + warnUnsafeVararg(tree.params.head.pos(), varargElemType); + } + } + } + /** * Check that vararg method call is sound * @param pos Position to be used for error reporting. * @param argtypes Actual arguments supplied to vararg method. */ - void checkVararg(DiagnosticPosition pos, List<Type> argtypes) { + void checkVararg(DiagnosticPosition pos, List<Type> argtypes, Symbol msym, Env<AttrContext> env) { + Env<AttrContext> calleeLintEnv = env; + while (calleeLintEnv.info.lint == null) + calleeLintEnv = calleeLintEnv.next; + Lint calleeLint = calleeLintEnv.info.lint.augment(msym.attributes_field, msym.flags()); Type argtype = argtypes.last(); - if (!types.isReifiable(argtype)) + if (!types.isReifiable(argtype) && !calleeLint.isSuppressed(Lint.LintCategory.VARARGS)) { warnUnchecked(pos, "unchecked.generic.array.creation", argtype); + } } /** Check that given modifiers are legal for given symbol and
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/ConstFold.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,8 @@ /** Helper class for constant folding, used by the attribution phase. * This class is marked strictfp as mandated by JLS 15.4. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Enter.java Thu Jul 08 11:28:01 2010 -0700 @@ -82,8 +82,8 @@ * (only for toplevel classes) * </pre> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Env.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ * a generic component, represented as a type parameter, to carry further * information specific to individual passes. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Thu Jul 08 11:28:01 2010 -0700 @@ -170,8 +170,8 @@ * allow unqualified forms only, parentheses optional, and phase out * support for assigning to a final field via this.x. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,8 @@ /** Helper class for type parameter inference, used by the attribution phase. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -290,6 +290,7 @@ public Type instantiateMethod(final Env<AttrContext> env, List<Type> tvars, MethodType mt, + final Symbol msym, final List<Type> argtypes, final boolean allowBoxing, final boolean useVarargs, @@ -418,7 +419,7 @@ checkWithinBounds(all_tvars, types.subst(inferredTypes, tvars, inferred), warn); if (useVarargs) { - chk.checkVararg(env.tree.pos(), formals); + chk.checkVararg(env.tree.pos(), formals, msym, env); } return super.inst(inferred, types); }};
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Jul 08 11:28:01 2010 -0700 @@ -48,8 +48,8 @@ /** This pass translates away some syntactic sugar: inner classes, * class literals, assertions, foreach loops, etc. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Thu Jul 08 11:28:01 2010 -0700 @@ -48,8 +48,8 @@ * by entering their members into the class scope using * MemberEnter.complete(). See Enter for an overview. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -768,6 +768,12 @@ && s.owner.kind != MTH && types.isSameType(c.type, syms.deprecatedType)) s.flags_field |= Flags.DEPRECATED; + // Internally to java.dyn, a @PolymorphicSignature annotation + // translates to a classfile attribute. + if (!c.type.isErroneous() + && types.isSameType(c.type, syms.polymorphicSignatureType)) { + s.flags_field |= Flags.POLYMORPHIC_SIGNATURE; + } if (!annotated.add(a.type.tsym)) log.error(a.pos, "duplicate.annotation"); }
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Jul 08 11:28:01 2010 -0700 @@ -47,8 +47,8 @@ /** Helper class for name resolution, used mostly by the attribution phase. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -67,7 +67,7 @@ JCDiagnostic.Factory diags; public final boolean boxingEnabled; // = source.allowBoxing(); public final boolean varargsEnabled; // = source.allowVarargs(); - public final boolean allowInvokedynamic; // = options.get("invokedynamic"); + public final boolean allowPolymorphicSignature; private final boolean debugResolve; public static Resolve instance(Context context) { @@ -105,7 +105,7 @@ varargsEnabled = source.allowVarargs(); Options options = Options.instance(context); debugResolve = options.get("debugresolve") != null; - allowInvokedynamic = options.get("invokedynamic") != null; + allowPolymorphicSignature = source.allowPolymorphicSignature() || options.get("invokedynamic") != null; } /** error symbols, which are returned when resolution fails @@ -301,6 +301,7 @@ boolean useVarargs, Warner warn) throws Infer.InferenceException { + assert ((m.flags() & (POLYMORPHIC_SIGNATURE|HYPOTHETICAL)) != POLYMORPHIC_SIGNATURE); if (useVarargs && (m.flags() & VARARGS) == 0) return null; Type mt = types.memberType(site, m); @@ -348,6 +349,7 @@ infer.instantiateMethod(env, tvars, (MethodType)mt, + m, argtypes, allowBoxing, useVarargs, @@ -576,6 +578,14 @@ if (sym.kind == ERR) return bestSoFar; if (!sym.isInheritedIn(site.tsym, types)) return bestSoFar; assert sym.kind < AMBIGUOUS; + if ((sym.flags() & POLYMORPHIC_SIGNATURE) != 0 && allowPolymorphicSignature) { + assert(site.tag == CLASS); + // Never match a MethodHandle.invoke directly. + if (useVarargs | allowBoxing | operator) + return bestSoFar; + // Supply an exactly-typed implicit method instead. + sym = findPolymorphicSignatureInstance(env, sym.owner.type, sym.name, (MethodSymbol) sym, argtypes, typeargtypes); + } try { if (rawInstantiate(env, site, sym, argtypes, typeargtypes, allowBoxing, useVarargs, Warner.noWarnings) == null) { @@ -746,6 +756,14 @@ boolean allowBoxing, boolean useVarargs, boolean operator) { + Symbol bestSoFar = methodNotFound; + if ((site.tsym.flags() & POLYMORPHIC_SIGNATURE) != 0 && + allowPolymorphicSignature && + site.tag == CLASS && + !(useVarargs | allowBoxing | operator)) { + // supply an exactly-typed implicit method in java.dyn.InvokeDynamic + bestSoFar = findPolymorphicSignatureInstance(env, site, name, null, argtypes, typeargtypes); + } return findMethod(env, site, name, @@ -753,7 +771,7 @@ typeargtypes, site.tsym.type, true, - methodNotFound, + bestSoFar, allowBoxing, useVarargs, operator); @@ -897,13 +915,14 @@ * @param argtypes The method's value arguments. * @param typeargtypes The method's type arguments */ - Symbol findImplicitMethod(Env<AttrContext> env, - Type site, - Name name, - List<Type> argtypes, - List<Type> typeargtypes) { - assert allowInvokedynamic; - assert site == syms.invokeDynamicType || (site == syms.methodHandleType && name == names.invoke); + Symbol findPolymorphicSignatureInstance(Env<AttrContext> env, + Type site, + Name name, + MethodSymbol spMethod, // sig. poly. method or null if none + List<Type> argtypes, + List<Type> typeargtypes) { + assert allowPolymorphicSignature; + //assert site == syms.invokeDynamicType || site == syms.methodHandleType : site; ClassSymbol c = (ClassSymbol) site.tsym; Scope implicit = c.members().next; if (implicit == null) { @@ -918,12 +937,22 @@ return methodNotFound; } List<Type> paramtypes = Type.map(argtypes, implicitArgType); + long flags; + List<Type> exType; + if (spMethod != null) { + exType = spMethod.getThrownTypes(); + flags = spMethod.flags() & AccessFlags; + } else { + // make it throw all exceptions + //assert(site == syms.invokeDynamicType); + exType = List.of(syms.throwableType); + flags = PUBLIC | STATIC; + } MethodType mtype = new MethodType(paramtypes, restype, - List.<Type>nil(), + exType, syms.methodClass); - int flags = PUBLIC | ABSTRACT; - if (site == syms.invokeDynamicType) flags |= STATIC; + flags |= ABSTRACT | HYPOTHETICAL | POLYMORPHIC_SIGNATURE; Symbol m = null; for (Scope.Entry e = implicit.lookup(name); e.scope != null; @@ -1338,14 +1367,6 @@ methodResolutionCache.put(steps.head, sym); steps = steps.tail; } - if (sym.kind >= AMBIGUOUS && - allowInvokedynamic && - (site == syms.invokeDynamicType || - site == syms.methodHandleType && name == names.invoke)) { - // lookup failed; supply an exactly-typed implicit method - sym = findImplicitMethod(env, site, name, argtypes, typeargtypes); - env.info.varArgs = false; - } if (sym.kind >= AMBIGUOUS) {//if nothing is found return the 'first' error MethodResolutionPhase errPhase = firstErroneousResolutionPhase();
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Todo.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Todo.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ /** A queue of all as yet unattributed classes. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,8 @@ /** This pass translates Generic Java to conventional Java. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,7 @@ import com.sun.tools.javac.util.BaseFileManager; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,7 +36,7 @@ /** * Caching implementation of FSInfo. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java Thu Jul 08 11:28:01 2010 -0700 @@ -17,7 +17,7 @@ * Get meta-info about files. Default direct (non-caching) implementation. * @see CacheFSInfo * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -68,7 +68,7 @@ * This class provides access to the source, class and other files * used by the compiler and related tools. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/Paths.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/Paths.java Thu Jul 08 11:28:01 2010 -0700 @@ -54,8 +54,8 @@ * into a boot class path, user class path, and source path (in * Collection<String> form). * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,7 +44,7 @@ /** * A subclass of JavaFileObject representing regular files. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,7 +35,7 @@ * container, such as a directory or zip file. * Internally, the file separator is always '/'. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,7 +36,7 @@ import com.sun.tools.javac.util.List; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java Thu Jul 08 11:28:01 2010 -0700 @@ -51,7 +51,7 @@ import java.lang.ref.SoftReference; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Thu Jul 08 11:28:01 2010 -0700 @@ -69,7 +69,7 @@ * checking to reindex the zip files if it is needed. In batch mode the timestamps are not checked * and the compiler uses the cached indexes. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java Thu Jul 08 11:28:01 2010 -0700 @@ -45,7 +45,7 @@ import com.sun.tools.javac.util.List; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,8 @@ /** Bytecode instruction codes, as well as typecodes used as * instruction modifiers. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ /** The CharacterRangeTable flags indicating type of an entry. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/CRTable.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ * and the hashtable for mapping trees or lists of trees to their * ending positions. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java Thu Jul 08 11:28:01 2010 -0700 @@ -59,8 +59,8 @@ * as routines to convert between internal ``.'' and external ``/'' * separators in class names. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ public class ClassFile {
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Thu Jul 08 11:28:01 2010 -0700 @@ -62,8 +62,8 @@ * for all other definitions in the classfile. Top-level Classes themselves * appear as members of the scopes of PackageSymbols. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -1098,6 +1098,12 @@ } }, + new AttributeReader(names.PolymorphicSignature, V45_3/*S.B.V51*/, CLASS_OR_MEMBER_ATTRIBUTE) { + void read(Symbol sym, int attrLen) { + sym.flags_field |= POLYMORPHIC_SIGNATURE; + } + }, + // The following attributes for a Code attribute are not currently handled // StackMapTable
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -49,8 +49,8 @@ /** This class provides operations to map an internal symbol table graph * rooted in a ClassSymbol into a classfile. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -651,6 +651,13 @@ endAttr(alenIdx); acount++; } + if ((flags & POLYMORPHIC_SIGNATURE) != 0) { + if (target.majorVersion < 51) + throw new AssertionError("PolymorphicSignature attributes in java/dyn must be written with -target 7 (required major version is 51, current is"+target.majorVersion+")"); + int alenIdx = writeAttr(names.PolymorphicSignature); + endAttr(alenIdx); + acount++; + } return acount; }
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,8 +39,8 @@ * methods in a classfile. The class also provides some utility operations to * generate bytecode instructions. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jul 08 11:28:01 2010 -0700 @@ -49,8 +49,8 @@ /** This pass maps flat Java (i.e. without inner classes) to bytecodes. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -121,7 +121,7 @@ : options.get("-g:vars") != null; genCrt = options.get("-Xjcov") != null; debugCode = options.get("debugcode") != null; - allowInvokedynamic = options.get("invokedynamic") != null; + allowInvokedynamic = target.hasInvokedynamic() || options.get("invokedynamic") != null; generateIproxies = target.requiresIproxy() ||
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,8 @@ * special values this or super, etc. Individual items are represented as * inner classes in class Items. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Pool.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ /** An internal structure that corresponds to the constant pool of a classfile. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/Target.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,8 +33,8 @@ /** The classfile version target. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ /** These pseudo-types appear in the generated verifier tables to * indicate objects that have been allocated but not yet constructed. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/main/CommandLine.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/main/CommandLine.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,8 +35,8 @@ /** * Various utility methods for processing Java tool command line arguments. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java Thu Jul 08 11:28:01 2010 -0700 @@ -73,8 +73,8 @@ * construct a new compiler, and to run a new compiler on a set of source * files. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,7 +34,7 @@ /** * TODO: describe com.sun.tools.javac.main.JavacOption * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Main.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/main/Main.java Thu Jul 08 11:28:01 2010 -0700 @@ -47,8 +47,8 @@ /** This class provides a commandline interface to the GJC compiler. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -281,9 +281,6 @@ } } } - if (target.hasInvokedynamic()) { - options.put("invokedynamic", "invokedynamic"); - } // handle this here so it works even if no other options given String showClass = options.get("showClass");
--- a/langtools/src/share/classes/com/sun/tools/javac/main/OptionName.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/main/OptionName.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,7 @@ /** * TODO: describe com.sun.tools.javac.main.OptionName * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java Thu Jul 08 11:28:01 2010 -0700 @@ -49,7 +49,7 @@ /** * TODO: describe com.sun.tools.javac.main.RecognizedOptions * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Thu Jul 08 11:28:01 2010 -0700 @@ -50,8 +50,8 @@ * <p> The "dynamic proxy return form" of an annotation element value is * the form used by sun.reflect.annotation.AnnotationInvocationHandler. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -181,16 +181,16 @@ } public void visitArray(Attribute.Array a) { - Name elemName = ((ArrayType) a.type).elemtype.tsym.name; + Name elemName = ((ArrayType) a.type).elemtype.tsym.getQualifiedName(); - if (elemName == elemName.table.names.java_lang_Class) { // Class[] + if (elemName.equals(elemName.table.names.java_lang_Class)) { // Class[] // Construct a proxy for a MirroredTypesException - List<TypeMirror> elems = List.nil(); + ListBuffer<TypeMirror> elems = new ListBuffer<TypeMirror>(); for (Attribute value : a.values) { Type elem = ((Attribute.Class) value).type; - elems.add(elem); + elems.append(elem); } - value = new MirroredTypesExceptionProxy(elems); + value = new MirroredTypesExceptionProxy(elems.toList()); } else { int len = a.values.length;
--- a/langtools/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,8 +38,8 @@ * filtering out unwanted elements such as synthetic ones. * This view is most efficiently accessed through its iterator() method. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacElements.java Thu Jul 08 11:28:01 2010 -0700 @@ -53,7 +53,7 @@ /** * Utility methods for operating on program elements. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ /** * Implementation of model API SourcePosition based on javac internal state. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,7 +37,7 @@ /** * Utility methods for operating on types. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -101,8 +101,8 @@ * <p>To reduce confusion with Path objects, the locations such as "class path", * "source path", etc, are generically referred to here as "search paths". * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,8 +41,8 @@ * getStandardFileManager}. However, would need to be handled carefully * as another forward reference from langtools to jdk. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java Thu Jul 08 11:28:01 2010 -0700 @@ -56,8 +56,8 @@ * different factory methods, which compute the binary name based on * information available at the time the file object is created. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,8 +35,8 @@ * translating Unicode escape sequences and by stripping the * leading whitespace and starts from each line of the comment. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,7 +36,7 @@ * This class is similar to Parser except that it stores ending * positions for the tree nodes. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,8 @@ * operator precedence scheme is used for parsing binary operation * expressions. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Keywords.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Keywords.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,7 +35,7 @@ /** * Map from Name to Token and Token to String. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Lexer.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,7 +32,7 @@ * The lexical analyzer maps an input stream consisting of ASCII * characters and Unicode escapes into a token sequence. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,7 +34,7 @@ * Reads syntactic units from source code. * Parsers are normally created from a ParserFactory. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,7 +35,7 @@ /** * A factory for creating parsers. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,8 +38,8 @@ /** The lexical analyzer maps an input stream consisting of * ASCII characters and Unicode escapes into a token sequence. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/Token.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Token.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,8 +33,8 @@ /** An interface that defines codes for Java source tokens * returned from lexical analysis. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,7 +29,7 @@ /** * Error thrown for problems encountered during annotation processing. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java Thu Jul 08 11:28:01 2010 -0700 @@ -87,7 +87,7 @@ * class path can alter the behavior of the tool and any final * compile. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,7 +37,7 @@ /** * An implementation of the Messager built on top of log. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Jul 08 11:28:01 2010 -0700 @@ -81,7 +81,7 @@ * Objects of this class hold and manage the state needed to support * annotation processing. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> @@ -745,7 +745,7 @@ * Leave class public for external testing purposes. */ public static class ComputeAnnotationSet extends - ElementScanner6<Set<TypeElement>, Set<TypeElement>> { + ElementScanner7<Set<TypeElement>, Set<TypeElement>> { final Elements elements; public ComputeAnnotationSet(Elements elements) { @@ -1380,7 +1380,7 @@ } /** - * For internal use by Sun Microsystems only. This method will be + * For internal use only. This method will be * removed without warning. */ public Context getContext() {
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,7 +40,7 @@ * <p>The methods in this class do not take type annotations into account, * as target types, not java elements. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> @@ -125,7 +125,7 @@ else throw new AssertionError("Bad implementation type for " + tm); - ElementScanner6<Set<Element>, DeclaredType> scanner = + ElementScanner7<Set<Element>, DeclaredType> scanner = new AnnotationSetScanner(result, typeUtil); for (Element element : rootElements) @@ -136,7 +136,7 @@ // Could be written as a local class inside getElementsAnnotatedWith private class AnnotationSetScanner extends - ElementScanner6<Set<Element>, DeclaredType> { + ElementScanner7<Set<Element>, DeclaredType> { // Insertion-order preserving set Set<Element> annotatedElements = new LinkedHashSet<Element>(); Types typeUtil;
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,7 @@ * -Xprint option; the included visitor class is used to implement * Elements.printElements. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> @@ -83,7 +83,7 @@ * Used for the -Xprint option and called by Elements.printElements */ public static class PrintingElementVisitor - extends SimpleElementVisitor6<PrintingElementVisitor, Boolean> { + extends SimpleElementVisitor7<PrintingElementVisitor, Boolean> { int indentation; // Indentation level; final PrintWriter writer; final Elements elementUtils; @@ -117,7 +117,7 @@ enclosing != null && NestingKind.ANONYMOUS == // Use an anonymous class to determine anonymity! - (new SimpleElementVisitor6<NestingKind, Void>() { + (new SimpleElementVisitor7<NestingKind, Void>() { @Override public NestingKind visitType(TypeElement e, Void p) { return e.getNestingKind();
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,7 +37,7 @@ * Utility class to determine if a service can be found on the * path that might be used to create a class loader. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jul 08 11:28:01 2010 -0700 @@ -593,18 +593,32 @@ compiler.note.unchecked.plural.additional=\ Some input files additionally use unchecked or unsafe operations. +compiler.note.varargs.filename=\ + {0} declares unsafe vararg methods. +compiler.note.varargs.plural=\ + Some input files declare unsafe vararg methods. +# The following string may appear after one of the above unsafe varargs +# messages. +compiler.note.varargs.recompile=\ + Recompile with -Xlint:varargs for details. + +compiler.note.varargs.filename.additional=\ + {0} declares additional unsafe vararg methods. +compiler.note.varargs.plural.additional=\ + Some input files additionally declares unsafe vararg methods. + compiler.note.sunapi.filename=\ - {0} uses Sun proprietary API that may be removed in a future release. + {0} uses internal proprietary API that may be removed in a future release. compiler.note.sunapi.plural=\ - Some input files use Sun proprietary API that may be removed in a future release. + Some input files use internal proprietary API that may be removed in a future release. # The following string may appear after one of the above sunapi messages. compiler.note.sunapi.recompile=\ Recompile with -Xlint:sunapi for details. compiler.note.sunapi.filename.additional=\ - {0} uses additional Sun proprietary API that may be removed in a future release. + {0} uses additional internal proprietary API that may be removed in a future release. compiler.note.sunapi.plural.additional=\ - Some input files additionally use Sun proprietary API that may be removed in a future release. + Some input files additionally use internal proprietary API that may be removed in a future release. # Notes related to annotation processing @@ -687,7 +701,7 @@ [deprecation] {0} in {1} has been deprecated compiler.warn.sun.proprietary=\ - {0} is Sun proprietary API and may be removed in a future release + {0} is internal proprietary API and may be removed in a future release compiler.warn.illegal.char.for.encoding=\ unmappable character for encoding {0} @@ -796,6 +810,9 @@ compiler.warn.unchecked.generic.array.creation=\ [unchecked] unchecked generic array creation for varargs parameter of type {0} +compiler.warn.varargs.non.reifiable.type=\ + [varargs] Possible heap pollution from parameterized vararg type {0} + compiler.warn.missing.deprecated.annotation=\ [dep-ann] deprecated item is not annotated with @Deprecated
--- a/langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Thu Jul 08 11:28:01 2010 -0700 @@ -77,7 +77,7 @@ * <dd>Specifies the destination directory.</dd> * </dl> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Thu Jul 08 11:28:01 2010 -0700 @@ -66,7 +66,7 @@ * <p>To avoid ambiguities with the Tree API in com.sun.source all sub * classes should, by convention, start with JC (javac). * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/Pretty.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,8 +39,8 @@ /** Prints out a tree as an indented Java source program. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,8 @@ * Creates a copy of a tree, using a given TreeMaker. * Names, literal values, etc are shared with the original. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,8 +38,8 @@ /** Utility class containing inspector methods for trees. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java Thu Jul 08 11:28:01 2010 -0700 @@ -39,8 +39,8 @@ /** Factory class for trees. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ * do some interesting work. The scanner class itself takes care of all * navigational aspects. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,8 @@ * do some interesting work. The translator class itself takes care of all * navigational aspects. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Abort.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Abort.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ /** Throwing an instance of * this class causes (silent) termination of the main compiler method. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java Thu Jul 08 11:28:01 2010 -0700 @@ -57,7 +57,7 @@ * <li> Provides the formatting logic for rendering the arguments of a JCDiagnostic object. * <ul> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractLog.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,8 @@ * A base class for error logs. Reports errors and warnings, and * keeps track of error numbers and positions. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java Thu Jul 08 11:28:01 2010 -0700 @@ -58,7 +58,7 @@ * <li>%_: space delimiter, useful for formatting purposes * </ul> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Bits.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Bits.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,8 +27,8 @@ /** A class for extensible, mutable bit sets. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ * appended. There are also methods to append names to byte buffers * and to convert byte buffers to names. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,8 @@ * An exception used for propogating exceptions found in client code * invoked from javac. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,8 +40,8 @@ * fragile. Caveat emptor. * @throws Error if the internal data structures are not as expected. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Constants.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ /** * Utilities for operating on constant values. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Context.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Context.java Thu Jul 08 11:28:01 2010 -0700 @@ -91,8 +91,8 @@ * NewPhase.preRegister(context); * </pre> * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Convert.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ /** Utility class for static conversion methods between numbers * and strings in various formats. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,8 +40,8 @@ * A simple abstraction of a source file, as needed for use in a diagnostic message. * Provides access to the line and position in a line for any given character offset. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/FatalError.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/FatalError.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,8 @@ * of the main compiler method. It is used when some non-recoverable * error has been detected in the compiler environment at runtime. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,7 +38,7 @@ * A delegated diagnostic formatter delegates all formatting * actions to an underlying formatter (aka the delegated formatter). * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,8 +38,8 @@ /** An abstraction of a diagnostic message generated by the compiler. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/JavacMessages.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,8 @@ /** * Support for formatted localized messages. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,8 +28,8 @@ /** An interface containing layout character constants used in Java * programs. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/List.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/List.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,8 @@ * <p>Lists are always trailed by a sentinel element, whose head and tail * are both null. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -103,6 +103,7 @@ /** Construct a list consisting of given elements. */ + @SuppressWarnings("varargs") public static <A> List<A> of(A x1, A x2, A x3, A... rest) { return new List<A>(x1, new List<A>(x2, new List<A>(x3, from(rest)))); }
--- a/langtools/src/share/classes/com/sun/tools/javac/util/ListBuffer.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/ListBuffer.java Thu Jul 08 11:28:01 2010 -0700 @@ -33,8 +33,8 @@ /** A class for constructing lists by appending elements. Modelled after * java.lang.StringBuffer. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,8 +41,8 @@ /** A class for error logs. Reports errors and warnings, and * keeps track of error numbers and positions. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -125,8 +125,8 @@ this.promptOnError = options.get("-prompt") != null; this.emitWarnings = options.get("-Xlint:none") == null; this.suppressNotes = options.get("suppressNotes") != null; - this.MaxErrors = getIntOption(options, "-Xmaxerrs", 100); - this.MaxWarnings = getIntOption(options, "-Xmaxwarns", 100); + this.MaxErrors = getIntOption(options, "-Xmaxerrs", getDefaultMaxErrors()); + this.MaxWarnings = getIntOption(options, "-Xmaxwarns", getDefaultMaxWarnings()); boolean rawDiagnostics = options.get("rawDiagnostics") != null; messages = JavacMessages.instance(context); @@ -155,6 +155,18 @@ return defaultValue; } + /** Default value for -Xmaxerrs. + */ + protected int getDefaultMaxErrors() { + return 100; + } + + /** Default value for -Xmaxwarns. + */ + protected int getDefaultMaxWarnings() { + return 100; + } + /** The default writer for diagnostics */ static final PrintWriter defaultWriter(Context context) {
--- a/langtools/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,8 @@ * made on any API to generate a warning at all. In consequence, this handler only * gets to handle those warnings that JLS says must be generated. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Name.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Name.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,8 @@ * Utf8 format. Names are stored in a Name.Table, and are unique within * that table. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Names.java Thu Jul 08 11:28:01 2010 -0700 @@ -29,8 +29,8 @@ * Access to the compiler's name table. STandard names are defined, * as well as methods to create new names. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */ @@ -103,6 +103,7 @@ public final Name RuntimeInvisibleTypeAnnotations; public final Name RuntimeVisibleParameterAnnotations; public final Name RuntimeInvisibleParameterAnnotations; + public final Name PolymorphicSignature; public final Name Value; public final Name EnclosingMethod; public final Name desiredAssertionStatus; @@ -115,7 +116,6 @@ public final Name value; public final Name getMessage; public final Name getClass; - public final Name invoke; public final Name TYPE; public final Name TYPE_USE; public final Name TYPE_PARAMETER; @@ -213,6 +213,7 @@ RuntimeInvisibleTypeAnnotations = fromString("RuntimeInvisibleTypeAnnotations"); RuntimeVisibleParameterAnnotations = fromString("RuntimeVisibleParameterAnnotations"); RuntimeInvisibleParameterAnnotations = fromString("RuntimeInvisibleParameterAnnotations"); + PolymorphicSignature = fromString("PolymorphicSignature"); Value = fromString("Value"); EnclosingMethod = fromString("EnclosingMethod"); @@ -227,7 +228,6 @@ value = fromString("value"); getMessage = fromString("getMessage"); getClass = fromString("getClass"); - invoke = fromString("invoke"); TYPE = fromString("TYPE"); TYPE_USE = fromString("TYPE_USE");
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Options.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Options.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ * If an option has an argument, the option name is mapped to the argument. * If a set option has no argument, it is mapped to itself. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Pair.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Pair.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,8 +27,8 @@ /** A generic class for pairs. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Position.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Position.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ * expansion is optional and no Unicode excape translation is considered. * The first character is at location (1,1). * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/PropagatedException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/PropagatedException.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,7 +28,7 @@ /** * Used to propagate exceptions through to the user. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,7 +41,7 @@ * or not the source name and position are set. This formatter provides a standardized, localize-independent * implementation of a diagnostic formatter; as such, this formatter is best suited for testing purposes. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java Thu Jul 08 11:28:01 2010 -0700 @@ -59,7 +59,7 @@ * to two different type-variables with the same name, their representation is * disambiguated by appending an index to the type variable name. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ * byte array, expanding it as needed. This avoids the overhead incurred * by using an array of bytes for each name. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,8 +32,8 @@ * using weak references. It is recommended for use when a single shared * byte array is unsuitable. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,7 +31,7 @@ * An interface to support optional warnings, needed for support of * unchecked conversions and unchecked casts. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Thu Jul 08 11:28:01 2010 -0700 @@ -155,10 +155,8 @@ public boolean start(RootDoc root) { Object retVal; String methodName = "start"; - Class<?>[] paramTypes = new Class<?>[1]; - Object[] params = new Object[1]; - paramTypes[0] = RootDoc.class; - params[0] = root; + Class<?>[] paramTypes = { RootDoc.class }; + Object[] params = { root }; try { retVal = invoke(methodName, null, paramTypes, params); } catch (DocletInvokeException exc) { @@ -181,10 +179,8 @@ public int optionLength(String option) { Object retVal; String methodName = "optionLength"; - Class<?>[] paramTypes = new Class<?>[1]; - Object[] params = new Object[1]; - paramTypes[0] = option.getClass(); - params[0] = option; + Class<?>[] paramTypes = { String.class }; + Object[] params = { option }; try { retVal = invoke(methodName, new Integer(0), paramTypes, params); } catch (DocletInvokeException exc) { @@ -208,12 +204,8 @@ String options[][] = optlist.toArray(new String[optlist.length()][]); String methodName = "validOptions"; DocErrorReporter reporter = messager; - Class<?>[] paramTypes = new Class<?>[2]; - Object[] params = new Object[2]; - paramTypes[0] = options.getClass(); - paramTypes[1] = DocErrorReporter.class; - params[0] = options; - params[1] = reporter; + Class<?>[] paramTypes = { String[][].class, DocErrorReporter.class }; + Object[] params = { options, reporter }; try { retVal = invoke(methodName, Boolean.TRUE, paramTypes, params); } catch (DocletInvokeException exc) {
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/Messager.java Thu Jul 08 11:28:01 2010 -0700 @@ -86,7 +86,7 @@ private static final long serialVersionUID = 0; } - private final String programName; + final String programName; private ResourceBundle messageRB = null; @@ -121,6 +121,16 @@ this.programName = programName; } + @Override + protected int getDefaultMaxErrors() { + return Integer.MAX_VALUE; + } + + @Override + protected int getDefaultMaxWarnings() { + return Integer.MAX_VALUE; + } + /** * Reset resource bundle, eg. locale has changed. */ @@ -231,11 +241,13 @@ * @param msg message to print */ public void printError(SourcePosition pos, String msg) { - String prefix = (pos == null) ? programName : pos.toString(); - errWriter.println(prefix + ": " + getText("javadoc.error") + " - " + msg); - errWriter.flush(); - prompt(); - nerrors++; + if (nerrors < MaxErrors) { + String prefix = (pos == null) ? programName : pos.toString(); + errWriter.println(prefix + ": " + getText("javadoc.error") + " - " + msg); + errWriter.flush(); + prompt(); + nerrors++; + } } /** @@ -256,10 +268,12 @@ * @param msg message to print */ public void printWarning(SourcePosition pos, String msg) { - String prefix = (pos == null) ? programName : pos.toString(); - warnWriter.println(prefix + ": " + getText("javadoc.warning") +" - " + msg); - warnWriter.flush(); - nwarnings++; + if (nwarnings < MaxWarnings) { + String prefix = (pos == null) ? programName : pos.toString(); + warnWriter.println(prefix + ": " + getText("javadoc.warning") +" - " + msg); + warnWriter.flush(); + nwarnings++; + } } /**
--- a/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/Start.java Thu Jul 08 11:28:01 2010 -0700 @@ -51,8 +51,6 @@ * @author Neal Gafter (rewrite) */ class Start { - /** Context for this invocation. */ - private final Context context; private final String defaultDocletClassName; private final ClassLoader docletParentClassLoader; @@ -98,8 +96,8 @@ PrintWriter noticeWriter, String defaultDocletClassName, ClassLoader docletParentClassLoader) { - context = new Context(); - messager = new Messager(context, programName, errWriter, warnWriter, noticeWriter); + Context tempContext = new Context(); // interim context until option decoding completed + messager = new Messager(tempContext, programName, errWriter, warnWriter, noticeWriter); this.defaultDocletClassName = defaultDocletClassName; this.docletParentClassLoader = docletParentClassLoader; } @@ -110,8 +108,8 @@ Start(String programName, String defaultDocletClassName, ClassLoader docletParentClassLoader) { - context = new Context(); - messager = new Messager(context, programName); + Context tempContext = new Context(); // interim context until option decoding completed + messager = new Messager(tempContext, programName); this.defaultDocletClassName = defaultDocletClassName; this.docletParentClassLoader = docletParentClassLoader; } @@ -145,6 +143,13 @@ } /** + * Usage + */ + private void Xusage() { + messager.notice("main.Xusage"); + } + + /** * Exit */ private void exit() { @@ -213,6 +218,15 @@ setDocletInvoker(argv); ListBuffer<String> subPackages = new ListBuffer<String>(); ListBuffer<String> excludedPackages = new ListBuffer<String>(); + + Context context = new Context(); + // Setup a new Messager, using the same initial parameters as the + // existing Messager, except that this one will be able to use any + // options that may be set up below. + Messager.preRegister(context, + messager.programName, + messager.errWriter, messager.warnWriter, messager.noticeWriter); + Options compOpts = Options.instance(context); boolean docClasses = false; @@ -310,6 +324,15 @@ usageError("main.locale_first"); oneArg(argv, i++); docLocale = argv[i]; + } else if (arg.equals("-Xmaxerrs") || arg.equals("-Xmaxwarns")) { + oneArg(argv, i++); + if (compOpts.get(arg) != null) { + usageError("main.option.already.seen", arg); + } + compOpts.put(arg, argv[i]); + } else if (arg.equals("-X")) { + Xusage(); + exit(); } else if (arg.startsWith("-XD")) { String s = arg.substring("-XD".length()); int eq = s.indexOf('=');
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties Thu Jul 08 11:28:01 2010 -0700 @@ -49,7 +49,13 @@ -locale <name> Locale to be used, e.g. en_US or en_US_WIN\n\ -encoding <name> Source file encoding name\n\ -quiet Do not display status messages\n\ - -J<flag> Pass <flag> directly to the runtime system\n + -J<flag> Pass <flag> directly to the runtime system\n\ + -X Print a synopsis of nonstandard options\n +main.Xusage=\ + -Xmaxerrs <number> Set the maximum number of errors to print\n\ + -Xmaxwarns <number> Set the maximum number of warnings to print\n\ +\n\ +These options are non-standard and subject to change without notice. main.option.already.seen=The {0} option may be specified no more than once. main.requires_argument=option {0} requires an argument. main.locale_first=option -locale must be first on the command line. @@ -65,7 +71,7 @@ main.fatal.error=fatal error main.fatal.exception=fatal exception main.out.of.memory=java.lang.OutOfMemoryError: Please increase memory.\n\ -For example, on the Sun Classic or HotSpot VMs, add the option -J-Xmx\n\ +For example, on the JDK Classic or HotSpot VMs, add the option -J-Xmx\n\ such as -J-Xmx32m. main.done_in=[done in {0} ms] main.doclet_method_must_be_static=In doclet class {0}, method {1} must be static.
--- a/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Thu Jul 08 11:28:01 2010 -0700 @@ -65,7 +65,7 @@ main.fatal.error=\u81f4\u547d\u9519\u8bef main.fatal.exception=\u81f4\u547d\u5f02\u5e38 main.out.of.memory=java.lang.OutOfMemoryError\uff1a\u8bf7\u589e\u52a0\u5185\u5b58\u3002\n\ -\u4f8b\u5982\uff0c\u5bf9\u4e8e Sun Classic \u6216 HotSpot VM\uff0c\u8bf7\u6dfb\u52a0\u9009\u9879 -J-Xmx\uff0c\n\ +\u4f8b\u5982\uff0c\u5bf9\u4e8e JDK Classic \u6216 HotSpot VM\uff0c\u8bf7\u6dfb\u52a0\u9009\u9879 -J-Xmx\uff0c\n\ \u5982 -J-Xmx32m\u3002 main.done_in=[\u5728{0} \u6beb\u79d2\u5185\u5b8c\u6210] main.doclet_method_must_be_static=\u5728 doclet \u7c7b {0} \u4e2d\uff0c\u65b9\u6cd5 {1} \u5fc5\u987b\u4e3a\u9759\u6001\u3002
--- a/langtools/src/share/classes/com/sun/tools/javah/Gen.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/Gen.java Thu Jul 08 11:28:01 2010 -0700 @@ -60,7 +60,7 @@ * original writing, this interface is rich enough to support JNI and the * old 1.0-style native method interface. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javah/InternalError.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/InternalError.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,8 +26,8 @@ package com.sun.tools.javah; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javah/JNI.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/JNI.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,7 @@ /** * Header file generator for JNI. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/JavahFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ /** * javah's implementation of JavaFileManager. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/JavahTask.java Thu Jul 08 11:28:01 2010 -0700 @@ -59,7 +59,7 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeVisitor; import javax.lang.model.util.ElementFilter; -import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.SimpleTypeVisitor7; import javax.lang.model.util.Types; import javax.tools.Diagnostic; @@ -76,7 +76,7 @@ * Javah generates support files for native methods. * Parse commandline options & Invokes javadoc to execute those commands. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p> @@ -705,7 +705,7 @@ } private TypeVisitor<Void,Types> checkMethodParametersVisitor = - new SimpleTypeVisitor6<Void,Types>() { + new SimpleTypeVisitor7<Void,Types>() { @Override public Void visitArray(ArrayType t, Types types) { visit(t.getComponentType(), types);
--- a/langtools/src/share/classes/com/sun/tools/javah/JavahTool.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/JavahTool.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,7 +40,7 @@ import javax.tools.StandardJavaFileManager; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javah/LLNI.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/LLNI.java Thu Jul 08 11:28:01 2010 -0700 @@ -45,10 +45,10 @@ import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeVisitor; import javax.lang.model.util.ElementFilter; -import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.SimpleTypeVisitor7; /* - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p> @@ -620,7 +620,7 @@ } protected final boolean isLongOrDouble(TypeMirror t) { - TypeVisitor<Boolean,Void> v = new SimpleTypeVisitor6<Boolean,Void>() { + TypeVisitor<Boolean,Void> v = new SimpleTypeVisitor7<Boolean,Void>() { public Boolean defaultAction(TypeMirror t, Void p){ return false; }
--- a/langtools/src/share/classes/com/sun/tools/javah/Main.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/Main.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * Main entry point. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javah/Mangle.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/Mangle.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,7 +37,7 @@ * this more fine grained and distribute the functionality to the * generators. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,8 +44,8 @@ * @see JavaFileManager * @since 1.7 * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java Thu Jul 08 11:28:01 2010 -0700 @@ -38,12 +38,12 @@ import javax.lang.model.type.TypeVariable; import javax.lang.model.type.TypeVisitor; import javax.lang.model.util.Elements; -import javax.lang.model.util.SimpleTypeVisitor6; +import javax.lang.model.util.SimpleTypeVisitor7; /** * Returns internal type signature. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p> @@ -239,7 +239,7 @@ String qualifiedTypeName(TypeMirror type) { - TypeVisitor<Name, Void> v = new SimpleTypeVisitor6<Name, Void>() { + TypeVisitor<Name, Void> v = new SimpleTypeVisitor7<Name, Void>() { @Override public Name visitArray(ArrayType t, Void p) { return t.getComponentType().accept(this, p);
--- a/langtools/src/share/classes/com/sun/tools/javah/Util.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javah/Util.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,7 +44,7 @@ * bug -- Bug has occurred in javah * fatal -- We can't even find resources, so bail fast, don't localize * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,8 +40,8 @@ /** * A writer for writing annotations as text. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -64,8 +64,8 @@ /* * A writer for writing Attributes as text. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -35,8 +35,8 @@ * A writer similar to a PrintWriter but which does not hide exceptions. * The standard print calls are line-buffered; report calls write messages directly. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -54,8 +54,8 @@ /* * The main javap class to write the contents of a class file as text. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -40,8 +40,8 @@ /* * Write the contents of a Code attribute. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,8 @@ /* * Write a constant pool entry. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/Context.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/Context.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ /* * Class from which to put/get shared resources. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/DisassemblerTool.java Thu Jul 08 11:28:01 2010 -0700 @@ -44,8 +44,8 @@ * @see JavaFileManager * @since 1.7 * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -31,8 +31,8 @@ /* * Write additional details for an instruction. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/InternalError.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/InternalError.java Thu Jul 08 11:28:01 2010 -0700 @@ -26,8 +26,8 @@ package com.sun.tools.javap; /** - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -36,8 +36,8 @@ /** * javap's implementation of JavaFileManager. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java Thu Jul 08 11:28:01 2010 -0700 @@ -69,8 +69,8 @@ * "Main" class for javap, normally accessed from the command line * via Main, or from JSR199 via DisassemblerTool. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,8 +42,8 @@ /** * Annotate instructions with details about local variables. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,8 +43,8 @@ /** * Annotate instructions with details about local variables. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/Main.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/Main.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * Main entry point. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/Messages.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/Messages.java Thu Jul 08 11:28:01 2010 -0700 @@ -30,8 +30,8 @@ /** * Access to javap messages. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/Options.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/Options.java Thu Jul 08 11:28:01 2010 -0700 @@ -34,8 +34,8 @@ /* * Provides access to javap's options, set via the command line * or JSR 199 API. - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/SourceWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/SourceWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -52,8 +52,8 @@ /** * Annotate instructions with source code. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/StackMapWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/StackMapWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -45,8 +45,8 @@ /** * Annotate instructions with stack map. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/TryBlockWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/TryBlockWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -37,8 +37,8 @@ /** * Annotate instructions with details about try blocks. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java Thu Jul 08 11:28:01 2010 -0700 @@ -41,8 +41,8 @@ /** * Annotate instructions with details about type annotations. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. If - * you write code that depends on this, you do so at your own risk. + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b> */
--- a/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/element/ElementVisitor.java Thu Jul 08 11:28:01 2010 -0700 @@ -62,6 +62,7 @@ * @author Scott Seligman * @author Peter von der Ahé * @see AbstractElementVisitor6 + * @see AbstractElementVisitor7 * @since 1.6 */ public interface ElementVisitor<R, P> {
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypeException.java Thu Jul 08 11:28:01 2010 -0700 @@ -42,7 +42,7 @@ * @see Element#getAnnotation(Class) * @since 1.6 */ -public class MirroredTypeException extends RuntimeException { +public class MirroredTypeException extends MirroredTypesException { private static final long serialVersionUID = 269; @@ -54,7 +54,7 @@ * @param type the type being accessed */ public MirroredTypeException(TypeMirror type) { - super("Attempt to access Class object for TypeMirror " + type.toString()); + super("Attempt to access Class object for TypeMirror " + type.toString(), type); this.type = type; } @@ -76,5 +76,6 @@ throws IOException, ClassNotFoundException { s.defaultReadObject(); type = null; + types = null; } }
--- a/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/type/MirroredTypesException.java Thu Jul 08 11:28:01 2010 -0700 @@ -49,7 +49,17 @@ private static final long serialVersionUID = 269; - private transient List<? extends TypeMirror> types; // cannot be serialized + transient List<? extends TypeMirror> types; // cannot be serialized + + /* + * Trusted constructor to be called by MirroredTypeException. + */ + MirroredTypesException(String message, TypeMirror type) { + super(message); + List<TypeMirror> tmp = (new ArrayList<TypeMirror>()); + tmp.add(type); + types = Collections.unmodifiableList(tmp); + } /** * Constructs a new MirroredTypesException for the specified types.
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -62,6 +62,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see AbstractAnnotationValueVisitor7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,73 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import java.util.List; +import javax.lang.model.element.*; + +import javax.lang.model.type.TypeMirror; +import static javax.lang.model.SourceVersion.*; +import javax.lang.model.SourceVersion; +import javax.annotation.processing.SupportedSourceVersion; + +/** + * A skeletal visitor for annotation values with default behavior + * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7} + * source version. + * + * <p> <b>WARNING:</b> The {@code AnnotationValueVisitor} interface + * implemented by this class may have methods added to it in the + * future to accommodate new, currently unknown, language structures + * added to future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new abstract annotation + * value visitor class will also be introduced to correspond to the + * new language level; this visitor will have different default + * behavior for the visit method in question. When the new visitor is + * introduced, all or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods + * @param <P> the type of the additional parameter to this visitor's methods. + * + * @see AbstractAnnotationValueVisitor6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public abstract class AbstractAnnotationValueVisitor7<R, P> extends AbstractAnnotationValueVisitor6<R, P> { + + /** + * Constructor for concrete subclasses to call. + */ + protected AbstractAnnotationValueVisitor7() { + super(); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -65,6 +65,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see AbstractElementVisitor7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import javax.lang.model.element.*; +import javax.annotation.processing.SupportedSourceVersion; +import javax.lang.model.element.*; +import static javax.lang.model.element.ElementKind.*; +import static javax.lang.model.SourceVersion.*; +import javax.lang.model.SourceVersion; + + +/** + * A skeletal visitor of program elements with default behavior + * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7} + * source version. + * + * <p> <b>WARNING:</b> The {@code ElementVisitor} interface + * implemented by this class may have methods added to it in the + * future to accommodate new, currently unknown, language structures + * added to future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new abstract element visitor + * class will also be introduced to correspond to the new language + * level; this visitor will have different default behavior for the + * visit method in question. When the new visitor is introduced, all + * or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @see AbstractElementVisitor6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public abstract class AbstractElementVisitor7<R, P> extends AbstractElementVisitor6<R, P> { + /** + * Constructor for concrete subclasses to call. + */ + protected AbstractElementVisitor7(){ + super(); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -57,6 +57,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see AbstractTypeVisitor7 * @since 1.6 */ public abstract class AbstractTypeVisitor6<R, P> implements TypeVisitor<R, P> {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import javax.lang.model.type.*; + +/** + * A skeletal visitor of types with default behavior appropriate for + * the version 7 language level. + * + * <p> <b>WARNING:</b> The {@code TypeVisitor} interface implemented + * by this class may have methods added to it in the future to + * accommodate new, currently unknown, language structures added to + * future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new abstract type visitor + * class will also be introduced to correspond to the new language + * level; this visitor will have different default behavior for the + * visit method in question. When the new visitor is introduced, all + * or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @see AbstractTypeVisitor6 + * @since 1.7 + */ +public abstract class AbstractTypeVisitor7<R, P> extends AbstractTypeVisitor6<R, P> { + /** + * Constructor for concrete subclasses to call. + */ + protected AbstractTypeVisitor7() { + super(); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -76,6 +76,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see ElementKindVisitor7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import javax.lang.model.element.*; +import static javax.lang.model.element.ElementKind.*; +import javax.annotation.processing.SupportedSourceVersion; +import static javax.lang.model.SourceVersion.*; +import javax.lang.model.SourceVersion; + +/** + * A visitor of program elements based on their {@linkplain + * ElementKind kind} with default behavior appropriate for the {@link + * SourceVersion#RELEASE_6 RELEASE_6} source version. For {@linkplain + * Element elements} <tt><i>XYZ</i></tt> that may have more than one + * kind, the <tt>visit<i>XYZ</i></tt> methods in this class delegate + * to the <tt>visit<i>XYZKind</i></tt> method corresponding to the + * first argument's kind. The <tt>visit<i>XYZKind</i></tt> methods + * call {@link #defaultAction defaultAction}, passing their arguments + * to {@code defaultAction}'s corresponding parameters. + * + * <p> Methods in this class may be overridden subject to their + * general contract. Note that annotating methods in concrete + * subclasses with {@link java.lang.Override @Override} will help + * ensure that methods are overridden as intended. + * + * <p> <b>WARNING:</b> The {@code ElementVisitor} interface + * implemented by this class may have methods added to it or the + * {@code ElementKind} {@code enum} used in this case may have + * constants added to it in the future to accommodate new, currently + * unknown, language structures added to future versions of the + * Java™ programming language. Therefore, methods whose names + * begin with {@code "visit"} may be added to this class in the + * future; to avoid incompatibilities, classes which extend this class + * should not declare any instance methods with names beginning with + * {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new abstract element kind + * visitor class will also be introduced to correspond to the new + * language level; this visitor will have different default behavior + * for the visit method in question. When the new visitor is + * introduced, all or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @see ElementKindVisitor6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public class ElementKindVisitor7<R, P> extends ElementKindVisitor6<R, P> { + /** + * Constructor for concrete subclasses; uses {@code null} for the + * default value. + */ + protected ElementKindVisitor7() { + super(null); + } + + /** + * Constructor for concrete subclasses; uses the argument for the + * default value. + * + * @param defaultValue the value to assign to {@link #DEFAULT_VALUE} + */ + protected ElementKindVisitor7(R defaultValue) { + super(defaultValue); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner6.java Thu Jul 08 11:28:01 2010 -0700 @@ -88,6 +88,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see ElementScanner7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/ElementScanner7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import javax.lang.model.element.*; +import javax.annotation.processing.SupportedSourceVersion; +import static javax.lang.model.element.ElementKind.*; +import javax.lang.model.SourceVersion; +import static javax.lang.model.SourceVersion.*; + + +/** + * A scanning visitor of program elements with default behavior + * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7} + * source version. The <tt>visit<i>XYZ</i></tt> methods in this + * class scan their component elements by calling {@code scan} on + * their {@linkplain Element#getEnclosedElements enclosed elements}, + * {@linkplain ExecutableElement#getParameters parameters}, etc., as + * indicated in the individual method specifications. A subclass can + * control the order elements are visited by overriding the + * <tt>visit<i>XYZ</i></tt> methods. Note that clients of a scanner + * may get the desired behavior be invoking {@code v.scan(e, p)} rather + * than {@code v.visit(e, p)} on the root objects of interest. + * + * <p>When a subclass overrides a <tt>visit<i>XYZ</i></tt> method, the + * new method can cause the enclosed elements to be scanned in the + * default way by calling <tt>super.visit<i>XYZ</i></tt>. In this + * fashion, the concrete visitor can control the ordering of traversal + * over the component elements with respect to the additional + * processing; for example, consistently calling + * <tt>super.visit<i>XYZ</i></tt> at the start of the overridden + * methods will yield a preorder traversal, etc. If the component + * elements should be traversed in some other order, instead of + * calling <tt>super.visit<i>XYZ</i></tt>, an overriding visit method + * should call {@code scan} with the elements in the desired order. + * + * <p> Methods in this class may be overridden subject to their + * general contract. Note that annotating methods in concrete + * subclasses with {@link java.lang.Override @Override} will help + * ensure that methods are overridden as intended. + * + * <p> <b>WARNING:</b> The {@code ElementVisitor} interface + * implemented by this class may have methods added to it in the + * future to accommodate new, currently unknown, language structures + * added to future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new element scanner visitor + * class will also be introduced to correspond to the new language + * level; this visitor will have different default behavior for the + * visit method in question. When the new visitor is introduced, all + * or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @see ElementScanner6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public class ElementScanner7<R, P> extends ElementScanner6<R, P> { + /** + * Constructor for concrete subclasses; uses {@code null} for the + * default value. + */ + protected ElementScanner7(){ + super(null); + } + + /** + * Constructor for concrete subclasses; uses the argument for the + * default value. + */ + protected ElementScanner7(R defaultValue){ + super(defaultValue); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -69,6 +69,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see SimpleAnnotationValueVisitor7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,90 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import java.util.List; +import javax.lang.model.element.*; + +import javax.lang.model.type.TypeMirror; +import static javax.lang.model.SourceVersion.*; +import javax.lang.model.SourceVersion; +import javax.annotation.processing.SupportedSourceVersion; + +/** + * A simple visitor for annotation values with default behavior + * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7} + * source version. Visit methods call {@link + * #defaultAction} passing their arguments to {@code defaultAction}'s + * corresponding parameters. + * + * <p> Methods in this class may be overridden subject to their + * general contract. Note that annotating methods in concrete + * subclasses with {@link java.lang.Override @Override} will help + * ensure that methods are overridden as intended. + * + * <p> <b>WARNING:</b> The {@code AnnotationValueVisitor} interface + * implemented by this class may have methods added to it in the + * future to accommodate new, currently unknown, language structures + * added to future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new simple annotation + * value visitor class will also be introduced to correspond to the + * new language level; this visitor will have different default + * behavior for the visit method in question. When the new visitor is + * introduced, all or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods + * @param <P> the type of the additional parameter to this visitor's methods. + * + * @see SimpleAnnotationValueVisitor6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public class SimpleAnnotationValueVisitor7<R, P> extends SimpleAnnotationValueVisitor6<R, P> { + /** + * Constructor for concrete subclasses; uses {@code null} for the + * default value. + */ + protected SimpleAnnotationValueVisitor7() { + super(null); + } + + /** + * Constructor for concrete subclasses; uses the argument for the + * default value. + * + * @param defaultValue the value to assign to {@link #DEFAULT_VALUE} + */ + protected SimpleAnnotationValueVisitor7(R defaultValue) { + super(defaultValue); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -71,6 +71,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see SimpleElementVisitor7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import javax.lang.model.element.*; +import javax.annotation.processing.SupportedSourceVersion; +import static javax.lang.model.element.ElementKind.*; +import javax.lang.model.SourceVersion; +import static javax.lang.model.SourceVersion.*; + +/** + * A simple visitor of program elements with default behavior + * appropriate for the {@link SourceVersion#RELEASE_7 RELEASE_7} + * source version. + * + * Visit methods corresponding to {@code RELEASE_7} language + * constructs call {@link #defaultAction}, passing their arguments to + * {@code defaultAction}'s corresponding parameters. + * + * <p> Methods in this class may be overridden subject to their + * general contract. Note that annotating methods in concrete + * subclasses with {@link java.lang.Override @Override} will help + * ensure that methods are overridden as intended. + * + * <p> <b>WARNING:</b> The {@code ElementVisitor} interface + * implemented by this class may have methods added to it in the + * future to accommodate new, currently unknown, language structures + * added to future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new simple element visitor + * class will also be introduced to correspond to the new language + * level; this visitor will have different default behavior for the + * visit method in question. When the new visitor is introduced, all + * or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods. Use {@code Void} + * for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's methods. Use {@code Void} + * for visitors that do not need an additional parameter. + * + * @see SimpleElementVisitor6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public class SimpleElementVisitor7<R, P> extends SimpleElementVisitor6<R, P> { + /** + * Constructor for concrete subclasses; uses {@code null} for the + * default value. + */ + protected SimpleElementVisitor7(){ + super(null); + } + + /** + * Constructor for concrete subclasses; uses the argument for the + * default value. + * + * @param defaultValue the value to assign to {@link #DEFAULT_VALUE} + */ + protected SimpleElementVisitor7(R defaultValue){ + super(defaultValue); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -70,6 +70,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see SimpleTypeVisitor7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,91 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import javax.lang.model.type.*; +import javax.annotation.processing.SupportedSourceVersion; +import javax.lang.model.SourceVersion; +import static javax.lang.model.SourceVersion.*; + +/** + * A simple visitor of types with default behavior appropriate for the + * {@link SourceVersion#RELEASE_7 RELEASE_7} source version. + * + * Visit methods corresponding to {@code RELEASE_7} language + * constructs call {@link #defaultAction}, passing their arguments to + * {@code defaultAction}'s corresponding parameters. + * + * <p> Methods in this class may be overridden subject to their + * general contract. Note that annotating methods in concrete + * subclasses with {@link java.lang.Override @Override} will help + * ensure that methods are overridden as intended. + * + * <p> <b>WARNING:</b> The {@code TypeVisitor} interface implemented + * by this class may have methods added to it in the future to + * accommodate new, currently unknown, language structures added to + * future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new simple type visitor + * class will also be introduced to correspond to the new language + * level; this visitor will have different default behavior for the + * visit method in question. When the new visitor is introduced, all + * or portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @see SimpleTypeVisitor6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public class SimpleTypeVisitor7<R, P> extends SimpleTypeVisitor6<R, P> { + /** + * Constructor for concrete subclasses; uses {@code null} for the + * default value. + */ + protected SimpleTypeVisitor7(){ + super(null); + } + + /** + * Constructor for concrete subclasses; uses the argument for the + * default value. + * + * @param defaultValue the value to assign to {@link #DEFAULT_VALUE} + */ + protected SimpleTypeVisitor7(R defaultValue){ + super(defaultValue); + } +}
--- a/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java Thu Jul 08 11:28:01 2010 -0700 @@ -74,6 +74,8 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé + * + * @see TypeKindVisitor7 * @since 1.6 */ @SupportedSourceVersion(RELEASE_6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 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 javax.lang.model.util; + +import javax.lang.model.type.*; +import javax.annotation.processing.SupportedSourceVersion; +import static javax.lang.model.element.ElementKind.*; +import static javax.lang.model.SourceVersion.*; +import javax.lang.model.SourceVersion; + +/** + * A visitor of types based on their {@linkplain TypeKind kind} with + * default behavior appropriate for the {@link SourceVersion#RELEASE_7 + * RELEASE_7} source version. For {@linkplain + * TypeMirror types} <tt><i>XYZ</i></tt> that may have more than one + * kind, the <tt>visit<i>XYZ</i></tt> methods in this class delegate + * to the <tt>visit<i>XYZKind</i></tt> method corresponding to the + * first argument's kind. The <tt>visit<i>XYZKind</i></tt> methods + * call {@link #defaultAction defaultAction}, passing their arguments + * to {@code defaultAction}'s corresponding parameters. + * + * <p> Methods in this class may be overridden subject to their + * general contract. Note that annotating methods in concrete + * subclasses with {@link java.lang.Override @Override} will help + * ensure that methods are overridden as intended. + * + * <p> <b>WARNING:</b> The {@code TypeVisitor} interface implemented + * by this class may have methods added to it in the future to + * accommodate new, currently unknown, language structures added to + * future versions of the Java™ programming language. + * Therefore, methods whose names begin with {@code "visit"} may be + * added to this class in the future; to avoid incompatibilities, + * classes which extend this class should not declare any instance + * methods with names beginning with {@code "visit"}. + * + * <p>When such a new visit method is added, the default + * implementation in this class will be to call the {@link + * #visitUnknown visitUnknown} method. A new type kind visitor class + * will also be introduced to correspond to the new language level; + * this visitor will have different default behavior for the visit + * method in question. When the new visitor is introduced, all or + * portions of this visitor may be deprecated. + * + * @param <R> the return type of this visitor's methods. Use {@link + * Void} for visitors that do not need to return results. + * @param <P> the type of the additional parameter to this visitor's + * methods. Use {@code Void} for visitors that do not need an + * additional parameter. + * + * @see TypeKindVisitor6 + * @since 1.7 + */ +@SupportedSourceVersion(RELEASE_7) +public class TypeKindVisitor7<R, P> extends TypeKindVisitor6<R, P> { + /** + * Constructor for concrete subclasses to call; uses {@code null} + * for the default value. + */ + protected TypeKindVisitor7() { + super(null); + } + + /** + * Constructor for concrete subclasses to call; uses the argument + * for the default value. + * + * @param defaultValue the value to assign to {@link #DEFAULT_VALUE} + */ + protected TypeKindVisitor7(R defaultValue) { + super(defaultValue); + } +}
--- a/langtools/src/share/classes/javax/tools/JavaFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/classes/javax/tools/JavaFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -256,7 +256,7 @@ * * <p>Optionally, this file manager might consider the sibling as * a hint for where to place the output. The exact semantics of - * this hint is unspecified. Sun's compiler, javac, for + * this hint is unspecified. The JDK compiler, javac, for * example, will place class files in the same directories as * originating source files unless a class file output directory * is provided. To facilitate this behavior, javac might provide @@ -338,7 +338,7 @@ * * <p>Optionally, this file manager might consider the sibling as * a hint for where to place the output. The exact semantics of - * this hint is unspecified. Sun's compiler, javac, for + * this hint is unspecified. The JDK compiler, javac, for * example, will place class files in the same directories as * originating source files unless a class file output directory * is provided. To facilitate this behavior, javac might provide
--- a/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/src/share/sample/javac/processing/src/CheckNamesProcessor.java Thu Jul 08 11:28:01 2010 -0700 @@ -138,7 +138,7 @@ public SourceVersion getSupportedSourceVersion() { /* * Return latest source version instead of a fixed version - * like RELEASE_6. To return a fixed version, this class + * like RELEASE_7. To return a fixed version, this class * could be annotated with a SupportedSourceVersion * annotation. * @@ -190,7 +190,7 @@ /** * Visitor to implement name checks. */ - private class NameCheckScanner extends ElementScanner6<Void, Void> { + private class NameCheckScanner extends ElementScanner7<Void, Void> { // The visitor could be enhanced to return true/false if // there were warnings reported or a count of the number // of warnings. This could be facilitated by using @@ -312,7 +312,7 @@ @Override public Void visitUnknown(Element e, Void p) { // This method will be called if a kind of element - // added after JDK 6 is visited. Since as of this + // added after JDK 7 is visited. Since as of this // writing the conventions for such constructs aren't // known, issue a warning. messager.printMessage(WARNING,
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html Thu Jul 08 11:28:01 2010 -0700 @@ -24,7 +24,6 @@ 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. - --> </head>
--- a/langtools/test/tools/javac/6402516/CheckLocalElements.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/6402516/CheckLocalElements.java Thu Jul 08 11:28:01 2010 -0700 @@ -95,7 +95,7 @@ return encl == null ? "" : encl.accept(qualNameVisitor, null); } - private ElementVisitor<String,Void> qualNameVisitor = new SimpleElementVisitor6<String,Void>() { + private ElementVisitor<String,Void> qualNameVisitor = new SimpleElementVisitor7<String,Void>() { protected String defaultAction(Element e, Void ignore) { return ""; }
--- a/langtools/test/tools/javac/6948381/T6948381.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/6948381/T6948381.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 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 @@ -16,9 +16,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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. */ /**
--- a/langtools/test/tools/javac/6948381/npe/A.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/6948381/npe/A.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 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 @@ -16,9 +16,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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 npe;
--- a/langtools/test/tools/javac/6948381/npe/B.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/6948381/npe/B.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 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 @@ -16,9 +16,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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 npe;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/T6956638.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,156 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringWriter; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +import javax.lang.model.element.Element; +import javax.tools.DiagnosticCollector; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; + +import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.util.JavacTask; + +/** + * @test + * @bug 6956638 + * @summary JavacTask.generate does not generate all required files + */ +public class T6956638 { + public static void main(String[] args) throws Exception { + new T6956638().run(); + } + + void run() throws Exception { + File srcDir = new File("src"); + + File[] files = { + writeFile(new File(srcDir, "T1.java"), + "public class T1 extends T2 {}\n"), + writeFile(new File(srcDir, "T2.java"), + "public class T2 extends T3 {}\n"), + writeFile(new File(srcDir, "T3.java"), + "public class T3 { public static final int C = 1; }\n"), + writeFile(new File(srcDir, "Test.java"), + "public class Test { public static final int D = T1.C; }\n") + }; + + for (File f1: files) { + for (File f2: files) { + if (f2 == f1) continue; + for (File f3: files) { + if (f3 == f2 || f3 == f1) continue; + for (File f4: files) { + if (f4 == f3 || f4 == f2 || f4 == f1) continue; + try { + test(f1, f2, f3, f4); + } catch (Exception e) { + error(e); + } + } + } + } + } + + if (errors > 0) + throw new Exception(errors + " tests failed"); + } + + void test(File... sourceFiles) throws Exception { + System.err.println("Test " + (++count) + ": " + Arrays.asList(sourceFiles)); + + File classesDir = new File("classes" + count); + classesDir.mkdirs(); + + StringWriter compilerOutputStream = new StringWriter(); + + List<String> compileOptions = Arrays.asList("-d", classesDir.getPath()); + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<JavaFileObject>(); + StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnosticCollector, null, null); + Iterable<? extends JavaFileObject> sourceFileObjects = fileManager.getJavaFileObjects(sourceFiles); + System.err.println("1- javac given java source JavaFileObjects " + sourceFileObjects); + JavaCompiler.CompilationTask task = compiler.getTask(compilerOutputStream, fileManager, null, compileOptions, null, sourceFileObjects); + JavacTask javacTask = (JavacTask) task; + + Iterable<? extends CompilationUnitTree> parsedTrees = javacTask.parse(); + Iterable<? extends Element> analyzedTrees = javacTask.analyze(); + Iterable<? extends JavaFileObject> generatedFiles = javacTask.generate(); + + System.err.println("2- parsed:" + size(parsedTrees) + " analysed:" + size(analyzedTrees) + " generated:" + size(generatedFiles)); + + System.err.print("3-"); + for (JavaFileObject f : generatedFiles) + System.err.print(" " + f); + System.err.println(""); + + System.err.print("5-"); + for (File f : classesDir.listFiles()) + System.err.print(" " + f); + System.err.println(""); + + System.err.println("----"); + System.err.println(compilerOutputStream.toString()); + + if (size(generatedFiles) != size(parsedTrees)) { + throw new Exception("wrong number of files generated: " + size(generatedFiles) + + " expected: " + size(parsedTrees)); + } + } + + private void error(Throwable t) { + t.printStackTrace(); + errors++; + } + + int count; + int errors; + + private static <E> int size(Iterable<E> x) { + int n = 0; + for (Iterator<E> iter = x.iterator(); iter.hasNext(); ++n) + iter.next(); + return n; + } + + private static File writeFile(File f, String str) throws IOException { + f.getParentFile().mkdirs(); + BufferedWriter fout = new BufferedWriter(new FileWriter(f)); + try { + fout.write(str); + fout.flush(); + } finally { + fout.close(); + } + return f; + } +}
--- a/langtools/test/tools/javac/api/TestOperators.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/api/TestOperators.java Thu Jul 08 11:28:01 2010 -0700 @@ -299,7 +299,7 @@ final Trees trees = Trees.instance(processingEnv); final Messager log = processingEnv.getMessager(); final Elements elements = processingEnv.getElementUtils(); - class Scan extends ElementScanner6<Void,Void> { + class Scan extends ElementScanner7<Void,Void> { @Override public Void visitExecutable(ExecutableElement e, Void p) { Object debug = e; // info for exception handler
--- a/langtools/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java Thu Jul 08 11:28:01 2010 -0700 @@ -28,7 +28,7 @@ /** * A class loader which loads classes from byte arrays. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/test/tools/javac/api/evalexpr/CompileFromString.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/api/evalexpr/CompileFromString.java Thu Jul 08 11:28:01 2010 -0700 @@ -32,7 +32,7 @@ /** * JSR 199 Demo application: compile from a String. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/test/tools/javac/api/evalexpr/MemoryFileManager.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/api/evalexpr/MemoryFileManager.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,7 +43,7 @@ * This file manager delegates to another file manager * to lookup classes on boot class path. * - * <p><b>This is NOT part of any API supported by Sun Microsystems. + * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own * risk. This code and its internal interfaces are subject to change * or deletion without notice.</b></p>
--- a/langtools/test/tools/javac/enum/6424358/T6424358.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/enum/6424358/T6424358.java Thu Jul 08 11:28:01 2010 -0700 @@ -48,7 +48,7 @@ final Messager log = processingEnv.getMessager(); final Elements elements = processingEnv.getElementUtils(); final TypeElement testMe = elements.getTypeElement("TestMe"); - class Scan extends ElementScanner6<Void,Void> { + class Scan extends ElementScanner7<Void,Void> { @Override public Void visitExecutable(ExecutableElement e, Void p) { System.err.println("Looking at " + e);
--- a/langtools/test/tools/javac/generics/diamond/T6951833.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/generics/diamond/T6951833.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 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 @@ -16,9 +16,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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. */ /*
--- a/langtools/test/tools/javac/generics/typevars/T6880344.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/generics/typevars/T6880344.java Thu Jul 08 11:28:01 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 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 @@ -16,9 +16,9 @@ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * 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. */ /*
--- a/langtools/test/tools/javac/meth/InvokeDyn.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/meth/InvokeDyn.java Thu Jul 08 11:28:01 2010 -0700 @@ -47,7 +47,7 @@ import java.dyn.InvokeDynamic; public class InvokeDyn { - void test() { + void test() throws Throwable { Object x = "hello"; InvokeDynamic.greet(x, "world", 123); InvokeDynamic.greet(x, "mundus", 456);
--- a/langtools/test/tools/javac/meth/InvokeMH.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/meth/InvokeMH.java Thu Jul 08 11:28:01 2010 -0700 @@ -48,28 +48,56 @@ void test(MethodHandle mh_SiO, MethodHandle mh_vS, MethodHandle mh_vi, - MethodHandle mh_vv) { + MethodHandle mh_vv) throws Throwable { Object o; String s; int i; // for return type testing // next five must have sig = (String,int)Object - mh_SiO.invoke("world", 123); - mh_SiO.invoke("mundus", 456); + mh_SiO.invokeExact("world", 123); + mh_SiO.invokeExact("mundus", 456); Object k = "kosmos"; - mh_SiO.invoke((String)k, 789); - o = mh_SiO.invoke((String)null, 000); - o = mh_SiO.<Object>invoke("arda", -123); + mh_SiO.invokeExact((String)k, 789); + o = mh_SiO.invokeExact((String)null, 000); + o = mh_SiO.<Object>invokeExact("arda", -123); // sig = ()String - s = mh_vS.<String>invoke(); + s = mh_vS.<String>invokeExact(); // sig = ()int - i = mh_vi.<int>invoke(); - o = mh_vi.<int>invoke(); - //s = mh_vi.<int>invoke(); //BAD - mh_vi.<int>invoke(); + i = mh_vi.<int>invokeExact(); + o = mh_vi.<int>invokeExact(); + //s = mh_vi.<int>invokeExact(); //BAD + mh_vi.<int>invokeExact(); // sig = ()void - //o = mh_vv.<void>invoke(); //BAD - mh_vv.<void>invoke(); + //o = mh_vv.<void>invokeExact(); //BAD + mh_vv.<void>invokeExact(); + } + + void testGen(MethodHandle mh_SiO, + MethodHandle mh_vS, + MethodHandle mh_vi, + MethodHandle mh_vv) throws Throwable { + Object o; String s; int i; // for return type testing + + // next five must have sig = (*,*)* + mh_SiO.invokeGeneric((Object)"world", (Object)123); + mh_SiO.<void>invokeGeneric((Object)"mundus", (Object)456); + Object k = "kosmos"; + mh_SiO.invokeGeneric(k, 789); + o = mh_SiO.invokeGeneric(null, 000); + o = mh_SiO.<Object>invokeGeneric("arda", -123); + + // sig = ()String + o = mh_vS.invokeGeneric(); + + // sig = ()int + i = mh_vi.<int>invokeGeneric(); + o = mh_vi.invokeGeneric(); + //s = mh_vi.<int>invokeGeneric(); //BAD + mh_vi.<void>invokeGeneric(); + + // sig = ()void + //o = mh_vv.<void>invokeGeneric(); //BAD + o = mh_vv.invokeGeneric(); } }
--- a/langtools/test/tools/javac/processing/model/6194785/T6194785.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/processing/model/6194785/T6194785.java Thu Jul 08 11:28:01 2010 -0700 @@ -43,7 +43,7 @@ { final Messager log = processingEnv.getMessager(); final Elements elements = processingEnv.getElementUtils(); - class Scan extends ElementScanner6<Void,Void> { + class Scan extends ElementScanner7<Void,Void> { @Override public Void visitExecutable(ExecutableElement e, Void ignored) { for (VariableElement p : e.getParameters())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,192 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/* + * @test + * @bug 6519115 + * @summary Verify MirroredTypeException vs MirroredTypesException is thrown + * @compile Plurality.java + * @compile -processor Plurality -proc:only Plurality.java + * @author Joseph D. Darcy + */ +import java.lang.annotation.*; +import java.math.BigDecimal; +import java.util.*; +import javax.annotation.processing.*; +import javax.lang.model.*; +import javax.lang.model.element.*; +import javax.lang.model.type.*; +import javax.lang.model.util.*; + +@SupportedAnnotationTypes("*") +@P0 +@P1 +@P2 +@S1 +public class Plurality extends AbstractProcessor { + private boolean executed = false; + + Elements elements; + Types types; + + @Override + public void init(ProcessingEnvironment penv) { + super.init(penv); + elements = penv.getElementUtils(); + types = penv.getTypeUtils(); + } + + + public boolean process(Set<? extends TypeElement> annotations, + RoundEnvironment roundEnv) { + if (!roundEnv.processingOver()) { + executed = true; + // Processing just this type + Element e = elements.getTypeElement("Plurality"); + Class[] classes = null; + + P0 p0 = e.getAnnotation(P0.class); + try { + classes = p0.value(); + } catch (MirroredTypesException mtse) { + if (mtse instanceof MirroredTypeException) { + throw new RuntimeException("Wrong exception type!"); + } + + List<? extends TypeMirror> types = mtse.getTypeMirrors(); + if (types.size() != 0) + throw new RuntimeException("List size != 0: " + + types); + } + + P1 p1 = e.getAnnotation(P1.class); + try { + classes = p1.value(); + } catch (MirroredTypesException mtse) { + if (mtse instanceof MirroredTypeException) { + throw new RuntimeException("Wrong exception type!"); + } + + List<? extends TypeMirror> types = mtse.getTypeMirrors(); + if (types.size() != 1) + throw new RuntimeException("List size != 1: " + + types); + checkTypeListMatchesClasses(types, + this.getClass().getAnnotation(P1.class).value()); + } + + + P2 p2 = e.getAnnotation(P2.class); + try { + classes = p2.value(); + } catch(MirroredTypesException mtse) { + if (mtse instanceof MirroredTypeException) { + throw new RuntimeException("Wrong exception type!"); + } + + List<? extends TypeMirror> types = mtse.getTypeMirrors(); + if (types.size() != 2) + throw new RuntimeException("List size != 2: " + + types); + checkTypeListMatchesClasses(types, + this.getClass().getAnnotation(P2.class).value()); + } + + Class<?> clazz = null; + S1 s1 = e.getAnnotation(S1.class); + try { + clazz = s1.value(); + } catch(MirroredTypesException mtse) { + List<? extends TypeMirror> types = mtse.getTypeMirrors(); + if (types.size() != 1) + throw new RuntimeException("List size != 1: " + + types); + Class<?>[] clazzes = new Class<?>[1]; + clazzes[0] = this.getClass().getAnnotation(S1.class).value(); + checkTypeListMatchesClasses(types, + clazzes); + } + + try { + clazz = s1.value(); + } catch(MirroredTypeException mte) { + TypeMirror type = mte.getTypeMirror(); + if (type == null) { + throw new RuntimeException("Expected null"); + } + List<TypeMirror> types = new ArrayList<>(); + types.add(type); + Class<?>[] clazzes = new Class<?>[1]; + clazzes[0] = this.getClass().getAnnotation(S1.class).value(); + checkTypeListMatchesClasses(types, clazzes); + } + } else { + if (!executed) { + throw new RuntimeException("Didn't seem to do anything!"); + } + } + return true; + } + + private static void checkTypeListMatchesClasses(List<? extends TypeMirror> types, + Class<?>[] classes) { + if (types.size() != classes.length) + throw new RuntimeException("Size mismatch:\n\t" + types + + "\n\t" + Arrays.toString(classes)); + int i = -1; + for(Class<?> clazz : classes) { + i++; + String canonicalName = clazz.getCanonicalName(); + String toStringName = types.get(i).toString(); + if (!canonicalName.equals(toStringName)) + throw new RuntimeException("Mismatched names: " + + canonicalName + "\t" + + toStringName); + } + } + + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latest(); + } +} + +@Retention(RetentionPolicy.RUNTIME) +@interface P0 { + Class[] value() default {}; +} + +@Retention(RetentionPolicy.RUNTIME) +@interface P1 { + Class[] value() default {Integer.class}; +} + +@Retention(RetentionPolicy.RUNTIME) +@interface P2 { + Class[] value() default {String.class, Number.class}; +} + +@Retention(RetentionPolicy.RUNTIME) +@interface S1 { + Class value() default BigDecimal.class; +}
--- a/langtools/test/tools/javac/processing/model/type/NoTypes.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/processing/model/type/NoTypes.java Thu Jul 08 11:28:01 2010 -0700 @@ -89,7 +89,7 @@ verifyKind(NONE, types.getNoType(NONE)); // The return type of a constructor or void method is VOID. - class Scanner extends ElementScanner6<Void, Void> { + class Scanner extends ElementScanner7<Void, Void> { @Override public Void visitExecutable(ExecutableElement e, Void p) { verifyKind(VOID, e.getReturnType()); @@ -104,10 +104,10 @@ /** * Verify that a NoType instance is of a particular kind, - * and that TypeKindVisitor6 properly dispatches on it. + * and that TypeKindVisitor7 properly dispatches on it. */ private void verifyKind(TypeKind kind, TypeMirror type) { - class Vis extends TypeKindVisitor6<TypeKind, Void> { + class Vis extends TypeKindVisitor7<TypeKind, Void> { @Override public TypeKind visitNoTypeAsVoid(NoType t, Void p) { return VOID;
--- a/langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java Thu Jul 08 11:28:01 2010 -0700 @@ -67,7 +67,7 @@ return true; } - private class DeprecationChecker extends ElementScanner6<Boolean,Void> { + private class DeprecationChecker extends ElementScanner7<Boolean,Void> { private Elements elementUtils; private boolean failure; DeprecationChecker() {
--- a/langtools/test/tools/javac/varargs/6730476/T6730476a.java Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/varargs/6730476/T6730476a.java Thu Jul 08 11:28:01 2010 -0700 @@ -27,7 +27,7 @@ * * @summary invalid "unchecked generic array" warning * @author mcimadamore - * @compile T6730476a.java -Xlint -Werror + * @compile T6730476a.java -Xlint:unchecked -Werror * */
--- a/langtools/test/tools/javac/varargs/6806876/T6806876.out Wed Jul 07 14:20:22 2010 +0400 +++ b/langtools/test/tools/javac/varargs/6806876/T6806876.out Thu Jul 08 11:28:01 2010 -0700 @@ -1,4 +1,6 @@ T6806876.java:11:32: compiler.warn.unchecked.generic.array.creation: java.lang.Number&java.lang.Comparable<? extends java.lang.Number&java.lang.Comparable<?>>[] - compiler.err.warnings.and.werror +- compiler.note.varargs.filename: T6806876.java +- compiler.note.varargs.recompile 1 error 1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/varargs/warning/Warn4.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,259 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/** + * @test + * @bug 6945418 + * @summary Project Coin: Simplified Varargs Method Invocation + * @author mcimadamore + * @run main Warn4 + */ +import com.sun.source.util.JavacTask; +import java.net.URI; +import java.util.Arrays; +import java.util.Set; +import java.util.HashSet; +import javax.tools.Diagnostic; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import javax.tools.ToolProvider; + +public class Warn4 { + + final static Warning[] error = null; + final static Warning[] none = new Warning[] {}; + final static Warning[] vararg = new Warning[] { Warning.VARARGS }; + final static Warning[] unchecked = new Warning[] { Warning.UNCHECKED }; + final static Warning[] both = new Warning[] { Warning.VARARGS, Warning.UNCHECKED }; + + enum Warning { + UNCHECKED("unchecked"), + VARARGS("varargs"); + + String category; + + Warning(String category) { + this.category = category; + } + + boolean isEnabled(XlintOption xlint, SuppressLevel suppressLevel) { + return Arrays.asList(xlint.enabledWarnings).contains(this); + } + + boolean isSuppressed(SuppressLevel suppressLevel) { + return Arrays.asList(suppressLevel.suppressedWarnings).contains(VARARGS); + } + } + + enum XlintOption { + NONE(), + UNCHECKED(Warning.UNCHECKED), + VARARGS(Warning.VARARGS), + ALL(Warning.UNCHECKED, Warning.VARARGS); + + Warning[] enabledWarnings; + + XlintOption(Warning... enabledWarnings) { + this.enabledWarnings = enabledWarnings; + } + + String getXlintOption() { + StringBuilder buf = new StringBuilder(); + String sep = ""; + for (Warning w : enabledWarnings) { + buf.append(sep); + buf.append(w.category); + sep=","; + } + return "-Xlint:" + + (this == NONE ? "none" : buf.toString()); + } + } + + enum SuppressLevel { + NONE(), + UNCHECKED(Warning.UNCHECKED), + VARARGS(Warning.VARARGS), + ALL(Warning.UNCHECKED, Warning.VARARGS); + + Warning[] suppressedWarnings; + + SuppressLevel(Warning... suppressedWarnings) { + this.suppressedWarnings = suppressedWarnings; + } + + String getSuppressAnnotation() { + StringBuilder buf = new StringBuilder(); + String sep = ""; + for (Warning w : suppressedWarnings) { + buf.append(sep); + buf.append("\""); + buf.append(w.category); + buf.append("\""); + sep=","; + } + return this == NONE ? "" : + "@SuppressWarnings({" + buf.toString() + "})"; + } + } + + enum Signature { + + EXTENDS_TVAR("<Z> void #name(List<? extends Z>#arity arg) { #body }", + new Warning[][] {both, both, both, both, error, both, both, both, error}), + SUPER_TVAR("<Z> void #name(List<? super Z>#arity arg) { #body }", + new Warning[][] {error, both, error, both, error, error, both, both, error}), + UNBOUND("void #name(List<?>#arity arg) { #body }", + new Warning[][] {none, none, none, none, none, none, none, none, error}), + INVARIANT_TVAR("<Z> void #name(List<Z>#arity arg) { #body }", + new Warning[][] {both, both, both, both, error, both, both, both, error}), + TVAR("<Z> void #name(Z#arity arg) { #body }", + new Warning[][] {both, both, both, both, both, both, both, both, vararg}), + EXTENDS("void #name(List<? extends String>#arity arg) { #body }", + new Warning[][] {error, error, error, error, error, both, error, both, error}), + SUPER("void #name(List<? super String>#arity arg) { #body }", + new Warning[][] {error, error, error, error, error, error, both, both, error}), + INVARIANT("void #name(List<String>#arity arg) { #body }", + new Warning[][] {error, error, error, error, error, error, error, both, error}), + UNPARAMETERIZED("void #name(String#arity arg) { #body }", + new Warning[][] {error, error, error, error, error, error, error, error, none}); + + String template; + Warning[][] warnings; + + Signature(String template, Warning[][] warnings) { + this.template = template; + this.warnings = warnings; + } + + boolean isApplicableTo(Signature other) { + return warnings[other.ordinal()] != null; + } + + boolean giveUnchecked(Signature other) { + return warnings[other.ordinal()] == unchecked || + warnings[other.ordinal()] == both; + } + + boolean giveVarargs(Signature other) { + return warnings[other.ordinal()] == vararg || + warnings[other.ordinal()] == both; + } + } + + public static void main(String... args) throws Exception { + for (XlintOption xlint : XlintOption.values()) { + for (SuppressLevel suppressLevel : SuppressLevel.values()) { + for (Signature vararg_meth : Signature.values()) { + for (Signature client_meth : Signature.values()) { + if (vararg_meth.isApplicableTo(client_meth)) { + test(xlint, + suppressLevel, + vararg_meth, + client_meth); + } + } + } + } + } + } + + static void test(XlintOption xlint, SuppressLevel suppressLevel, + Signature vararg_meth, Signature client_meth) throws Exception { + final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); + JavaSource source = new JavaSource(suppressLevel, vararg_meth, client_meth); + DiagnosticChecker dc = new DiagnosticChecker(); + JavacTask ct = (JavacTask)tool.getTask(null, null, dc, + Arrays.asList(xlint.getXlintOption()), null, Arrays.asList(source)); + ct.generate(); //to get mandatory notes + check(dc.warnings, + dc.notes, + new boolean[] {vararg_meth.giveUnchecked(client_meth), + vararg_meth.giveVarargs(client_meth)}, + source, xlint, suppressLevel); + } + + static void check(Set<Warning> warnings, Set<Warning> notes, boolean[] warnArr, JavaSource source, XlintOption xlint, SuppressLevel suppressLevel) { + boolean badOutput = false; + for (Warning wkind : Warning.values()) { + badOutput |= (warnArr[wkind.ordinal()] && !wkind.isSuppressed(suppressLevel)) != + (wkind.isEnabled(xlint, suppressLevel) ? + warnings.contains(wkind) : + notes.contains(wkind)); + } + if (badOutput) { + throw new Error("invalid diagnostics for source:\n" + + source.getCharContent(true) + + "\nOptions: " + xlint.getXlintOption() + + "\nExpected unchecked warning: " + warnArr[0] + + "\nExpected unsafe vararg warning: " + warnArr[1] + + "\nWarnings: " + warnings + + "\nNotes: " + notes); + } + } + + static class JavaSource extends SimpleJavaFileObject { + + String source; + + public JavaSource(SuppressLevel suppressLevel, Signature vararg_meth, Signature client_meth) { + super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); + String meth1 = vararg_meth.template.replace("#arity", "..."); + meth1 = meth1.replace("#name", "m"); + meth1 = meth1.replace("#body", ""); + meth1 = suppressLevel.getSuppressAnnotation() + meth1; + String meth2 = client_meth.template.replace("#arity", ""); + meth2 = meth2.replace("#name", "test"); + meth2 = meth2.replace("#body", "m(arg);"); + source = "import java.util.List;\n" + + "class Test {\n" + meth1 + + "\n" + meth2 + "\n}\n"; + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) { + return source; + } + } + + static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> { + + Set<Warning> warnings = new HashSet<>(); + Set<Warning> notes = new HashSet<>(); + + public void report(Diagnostic<? extends JavaFileObject> diagnostic) { + if (diagnostic.getKind() == Diagnostic.Kind.MANDATORY_WARNING || + diagnostic.getKind() == Diagnostic.Kind.WARNING) { + warnings.add(diagnostic.getCode().contains("varargs") ? + Warning.VARARGS : + Warning.UNCHECKED); + } + else if (diagnostic.getKind() == Diagnostic.Kind.NOTE) { + notes.add(diagnostic.getCode().contains("varargs") ? + Warning.VARARGS : + Warning.UNCHECKED); + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javadoc/6958836/Test.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,120 @@ +/* + * Copyright (c) 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. + * + * 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. + */ + +/* + * @test + * @bug 6958836 + * @summary javadoc should support -Xmaxerrs and -Xmaxwarns + */ + +import java.io.*; +import java.util.*; + +public class Test { + public static void main(String... args) throws Exception { + new Test().run(); + } + + void run() throws Exception { + javadoc("errs", list(), 10, 0); + javadoc("errs", list("-Xmaxerrs", "0"), 10, 0); + javadoc("errs", list("-Xmaxerrs", "2"), 2, 0); + javadoc("errs", list("-Xmaxerrs", "4"), 4, 0); + javadoc("errs", list("-Xmaxerrs", "20"), 10, 0); + + javadoc("warns", list(), 0, 10); + javadoc("warns", list("-Xmaxwarns", "0"), 0, 10); + javadoc("warns", list("-Xmaxwarns", "2"), 0, 2); + javadoc("warns", list("-Xmaxwarns", "4"), 0, 4); + javadoc("warns", list("-Xmaxwarns", "20"), 0, 10); + + if (errors > 0) + throw new Exception(errors + " errors occurred."); + } + + void javadoc(String pkg, List<String> testOpts, + int expectErrs, int expectWarns) { + System.err.println("Test " + (++count) + ": " + pkg + " " + testOpts); + File testOutDir = new File("test" + count); + + List<String> opts = new ArrayList<String>(); + // Force en_US locale in lieu of something like -XDrawDiagnostics. + // For some reason, this must be the first option when used. + opts.addAll(list("-locale", "en_US")); + opts.addAll(list("-classpath", System.getProperty("test.src"))); + opts.addAll(list("-d", testOutDir.getPath())); + opts.addAll(testOpts); + opts.add(pkg); + + StringWriter errSW = new StringWriter(); + PrintWriter errPW = new PrintWriter(errSW); + StringWriter warnSW = new StringWriter(); + PrintWriter warnPW = new PrintWriter(warnSW); + StringWriter noteSW = new StringWriter(); + PrintWriter notePW = new PrintWriter(noteSW); + + int rc = com.sun.tools.javadoc.Main.execute("javadoc", + errPW, warnPW, notePW, + "com.sun.tools.doclets.standard.Standard", + getClass().getClassLoader(), + opts.toArray(new String[opts.size()])); + System.err.println("rc: " + rc); + + errPW.close(); + String errOut = errSW.toString(); + System.err.println("Errors:\n" + errOut); + warnPW.close(); + String warnOut = warnSW.toString(); + System.err.println("Warnings:\n" + warnOut); + notePW.close(); + String noteOut = noteSW.toString(); + System.err.println("Notes:\n" + noteOut); + + check(errOut, "Errors.java", expectErrs); + check(warnOut, " warning ", expectWarns); // requires -locale en_US + } + + void check(String text, String expectText, int expectCount) { + int foundCount = 0; + for (String line: text.split("[\r\n]+")) { + if (line.contains(expectText)) + foundCount++; + } + if (foundCount != expectCount) { + error("incorrect number of matches found: " + foundCount + + ", expected: " + expectCount); + } + } + + private List<String> list(String... args) { + return Arrays.asList(args); + } + + void error(String msg) { + System.err.println(msg); + errors++; + } + + int count; + int errors; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javadoc/6958836/errs/Errors.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 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. + * + * 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 errs; + +// class with 10 errors +class Errors { + X m0() { } + X m1() { } + X m2() { } + X m3() { } + X m4() { } + X m5() { } + X m6() { } + X m7() { } + X m8() { } + X m9() { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javadoc/6958836/warns/Warnings.java Thu Jul 08 11:28:01 2010 -0700 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 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. + * + * 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 warns; + +// class with 10 warnings +public class Warnings { + /** @param x */ + public void m0() { } + + /** @param x */ + public void m1() { } + + /** @param x */ + public void m2() { } + + /** @param x */ + public void m3() { } + + /** @param x */ + public void m4() { } + + /** @param x */ + public void m5() { } + + /** @param x */ + public void m6() { } + + /** @param x */ + public void m7() { } + + /** @param x */ + public void m8() { } + + /** @param x */ + public void m9() { } +}
--- a/make/Defs-internal.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/make/Defs-internal.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -52,7 +52,6 @@ endif # Define absolute paths to TOPDIRs -ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)")
--- a/make/jprt.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/make/jprt.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -45,11 +45,11 @@ endif jprt_build_fastdebug: fastdebug_build - ( $(CD) $(OUTPUTDIR)-fastdebug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) jprt_build_debug: debug_build - ( $(CD) $(OUTPUTDIR)-debug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) ################################################################
--- a/make/sanity-rules.gmk Wed Jul 07 14:20:22 2010 +0400 +++ b/make/sanity-rules.gmk Thu Jul 08 11:28:01 2010 -0700 @@ -281,7 +281,6 @@ @$(ECHO) "Build Directory Structure:" >> $(MESSAGE_FILE) @$(ECHO) " CWD = `$(PWD)`" >> $(MESSAGE_FILE) @$(ECHO) " TOPDIR = $(TOPDIR)" >> $(MESSAGE_FILE) - @$(ECHO) " CONTROL_TOPDIR = $(CONTROL_TOPDIR)" >> $(MESSAGE_FILE) ifeq ($(LANGTOOLS_SRC_AVAILABLE), true) @$(ECHO) " LANGTOOLS_TOPDIR = $(LANGTOOLS_TOPDIR)" >> $(MESSAGE_FILE) endif
--- a/test/Makefile Wed Jul 07 14:20:22 2010 +0400 +++ b/test/Makefile Thu Jul 08 11:28:01 2010 -0700 @@ -54,30 +54,33 @@ # Test target list for jdk repository JDK_TEST_LIST = \ - jdk_awt \ - jdk_beans jdk_beans1 jdk_beans2 jdk_beans3 \ + jdk_beans1 jdk_beans2 jdk_beans3 \ jdk_io \ jdk_lang \ - jdk_management jdk_management1 jdk_management2 \ + jdk_management1 jdk_management2 \ jdk_math \ jdk_misc \ jdk_net \ - jdk_nio jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_nio1 jdk_nio2 jdk_nio3 \ + jdk_security1 jdk_security2 jdk_security3 \ + jdk_text \ + jdk_tools1 jdk_tools2 \ + jdk_util + +# These tests need a DISPLAY and can create window interaction complications +JDK_TEST_LIST2 = \ + jdk_awt \ jdk_rmi \ - jdk_security jdk_security1 jdk_security2 jdk_security3 \ - jdk_swing \ - jdk_text \ - jdk_tools jdk_tools1 jdk_tools2 \ - jdk_util + jdk_swing # Default test target (everything) all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST) # Test targets $(LANGTOOLS_TEST_LIST): - @$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) $(JDK_TEST_LIST): - @$(call SUBDIR_TEST, $(JDK_DIR), $@) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) clean: