Merge

7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests Reviewed-by: kvn, kamg, jcoomes

7032696: Fix for 7029152 broke VM Summary: StrIntrinsicNode::Ideal() should not optimize memory during Parse. Reviewed-by: jrose, never

6817525: turn on method handle functionality by default for JSR 292 Summary: After appropriate testing, we need to turn on EnableMethodHandles and EnableInvokeDynamic by default. Reviewed-by: never, kvn, jrose, phh

7032388: guarantee(VM_Version::supports_cmov()) failed: illegal instruction on i586 after 6919934 Summary: 6919934 added some unguarded cmov instructions which hit a guarantee on older hardware. Reviewed-by: never, iveresov, kvn, phh

Merge

6564610: assert(UseCompiler || CompileTheWorld, "UseCompiler should be set by now.") Summary: Remove invalid asserts Reviewed-by: never, kvn

7029152: Ideal nodes for String intrinsics miss memory edge optimization Summary: In Ideal() method of String intrinsics nodes look for TypeAryPtr::CHARS memory slice if memory is MergeMem. Do not unroll a loop with String intrinsics code. Reviewed-by: never

7031614: jmap -permstat fails with java.lang.InternalError in sun.jvm.hotspot.oops.OopField.getValue Reviewed-by: kvn, dcubed

Merge

7026307: DEBUG MESSAGE: broken null klass on amd64 Summary: Correct typo introduces in 7020521 Reviewed-by: never, kvn

7032306: Fastdebug build failure on Solaris with SS11 compilers Reviewed-by: kvn, iveresov

6741940: Nonvolatile XMM registers not preserved across JNI calls Summary: Save xmm6-xmm15 in call stub on win64 Reviewed-by: kvn, never

7032133: Enable sse4.2 for new AMD processors Summary: New AMD processors support sse4.2. Enable corresponding instructions in Hotspot. Reviewed-by: kvn Contributed-by: eric.caspole@amd.com

7022998: JSR 292 recursive method handle calls inline themselves infinitely Reviewed-by: never, kvn

6964776: c2 should ensure the polling page is reachable on 64 bit Summary: Materialize the pointer to the polling page in a register instead of using rip-relative addressing when the distance from the code cache is larger than disp32. Reviewed-by: never, kvn

7024475: loop doesn't terminate when compiled Reviewed-by: kvn

Merge

7029017: Additional architecture support for c2 compiler Summary: Enables cross building of a c2 VM. Support masking of shift counts when the processor architecture mandates it. Reviewed-by: kvn, never

7022204: LogFile wildcarding should use %p instead of star Reviewed-by: coleenp, jrose

Merge

7025708: Assertion if using "-XX:+CITraceTypeFlow -XX:+Verbose" together Reviewed-by: never Contributed-by: volker.simonis@gmail.com

Merge

Merge

7030207: Zero tweak to remove accidentally incorporated code Summary: IcedTea contains a now-unmaintained ARM-specific interpreter and part of that interpreter was accidentally incorporated in one of the webrevs when Zero was initially imported. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

Merge

7031571: Generate native VS2010 project files Reviewed-by: hosterda, stefank, brutisso

Added tag hs21-b06 for changeset 8908d8654a39

Added tag jdk7-b136 for changeset 8908d8654a39

Added tag jdk7-b136 for changeset 9186e0e62eea

Added tag jdk7-b136 for changeset 46acf76a5339

Merge

Merge

Merge

Merge

6930508: Passing nested class names on javac command line interfere with subsequent name -> class lookup Reviewed-by: darcy

7026359: (langtools) fix big jar test Reviewed-by: jjg

6558548: The compiler needs to be aligned with clarified specification of throws Summary: Javac should issue unconditional warnings when 'dead' catch clauses are detected Reviewed-by: jjg

4743537: Help doesn't say what "All Classes" and other links really mean Reviewed-by: jjg

6988079: Errors reported via Messager.printMessage(ERROR,"error message") are not tallied correctly Reviewed-by: darcy

6987384: -XprintProcessorRoundsInfo message printed with different timing than previous Reviewed-by: darcy

6993311: annotations on packages are not validated Reviewed-by: mcimadamore

7026509: Cannot use JavaCompiler to create multiple CompilationTasks for partial compilations Reviewed-by: mcimadamore

7010608: the string 'error' should appear in error messages Reviewed-by: mcimadamore

7026414: Types.asElement() returns null for ErrorType Reviewed-by: darcy

7006178: findbugs high priority issues in new javadoc Reviewed-by: jjg

7026868: Apply specification changes fro 6505047 Reviewed-by: jjg

6776656: Incorrect number in 'generated' help-doc.html Reviewed-by: jjg

7025988: Test test/tools/javac/file/zip/T6836682.java takes too long to complete Summary: added @ignore tag to temporarily disable the test Reviewed-by: jjg

7021927: javac: regression in performance Reviewed-by: jjg

Added tag jdk7-b135 for changeset bf9507aab301

Merge

Added tag jdk7-b135 for changeset 88216c3c4af7

Merge

Added tag jdk7-b135 for changeset ef8d7bf5bc99

Merge

Added tag jdk7-b135 for changeset 9ee26678bf4e

Merge

Merge

7011718: VS2010, remove makefile logic with regards to use of VC6, VS2003, VS2005, VS2008 Reviewed-by: prr, weijun

Merge

7032327: Fix overview-core.html file, refers to version 6 Reviewed-by: wetmore

Merge

Merge

7012648: move JSR 292 to package java.lang.invoke and adjust names Summary: package and class renaming only; delete unused methods and classes; add @since tags; no code changes Reviewed-by: twisti

6839872: remove implementation inheritance from JSR 292 APIs Summary: move everything into a single package; remove all multi-package machinery Reviewed-by: twisti, forax

Merge

7031238: Problem with fix for 6981922 Reviewed-by: chegar

Merge

6981922: DNS cache poisoning by untrusted applets Reviewed-by: chegar

6907662: System clipboard should ensure access restrictions Reviewed-by: alexp

6997851: Create NTLM AuthenticationCallBack class to avoid NTLM info leakage on client side Reviewed-by: michaelm

6994263: Untrusted code can replace JRE's XML DSig Transform or C14N algorithm implementations Reviewed-by: xuelei

6985453: Font.createFont may expose some system properties in exception text Reviewed-by: prr, hawtin

Merge

Merge

7029491: fix broken test file committed with CR 5045147. Summary: an incorrect file was committed with CR 5045147. This commit corrects that error and also applies minor review suggestions. Reviewed-by: alanb

Merge

7017446: (fs) Updates to file system API (3/2011) Reviewed-by: sherman

7028468: (fs) FileSystems.getDefault() fails when kernel micro version contains/ends non-numeric characters Reviewed-by: forax, chegar

7026184: (launcher) Regression: class with unicode name can't be launched by java. Reviewed-by: mchung, sherman

Merge

7028668: 3/4 improve diagnosibility and robustness of sun.tools.attach.WindowsVirtualMachine.openProcess() Summary: Add more info to OpenProcess default detail error message. Try a different technique when a Java process is attaching to itself. Reviewed-by: zgu, ohair, alanb

7022382: convert pack200 library code to use try-with-resources Reviewed-by: ksrini

5045147: Prevent insertion of null Key into empty TreeMap (and null element into TreeSet) when no Comparator is used. Prevent insertion of key of incorrect type into empty TreeMap and incorrect type element into TreeSet and incorrect type when Comparator is used. Reviewed-by: alanb, dl, mduigou

Merge

7028133: Specify serialVersionUID for RegularEnumSet and JumboEnumSet Reviewed-by: alanb, mduigou Contributed-by: Neil Richards <neil.richards@ngmr.net>

6796662: (fmt spec) Formatter spec on BigDecimal output should not reference Float a Summary: updated the spec doc Reviewed-by: alanb

7028422: regression: SKID miss-matching Summary: Do not override the previous setting for initial selection. Reviewed-by: mullan

7026898: DriverManager to now use CopyOnWriteArrayList Reviewed-by: alanb, briangoetz

7027910: Add basic cross-compilation support and add ARM/PPC to the known architectures in the open code Summary: Cross-compilation support Reviewed-by: ohair, andrew

6803681: RFE: Need new codeset converter for IBM Cp1364 Summary: forward port the Cp1364 Reviewed-by: alanb

Merge

Merge

7027897: Build support for client-VM only configurations Summary: Support builds for which only the client VM is required and/or available Reviewed-by: ohair, andrew

7022855: Export "PKIX" as the standard algorithm name of KeyManagerFactory Summary: export the existing "NewSunX509" algorithm implementation using the standard name "PKIX" Reviewed-by: weijun, wetmore

7025073: Stricter check on trust anchor makes VerifyCACerts.java test fail Summary: loosen the check for version 1 and 2 X.509 certificate Reviewed-by: mullan, weijun

7001933: Deadlock in java.lang.classloader.getPackage() Summary: Modified to not holding the "packages" lock when calling parent CL. Reviewed-by: dholmes, alanb

7026376: (dc) DatagramChannel created without specifying protocol family fails to join IPv4 group Reviewed-by: chegar

7014637: Improve behavior of EnumSet Iterator.remove() Reviewed-by: mduigou, alanb Contributed-by: Neil Richards <neil.richards@ngmr.net>

7027362: Project Coin: warn of throwing InterruptedException in AutoCloseable.close javadoc Reviewed-by: jjb

Merge

6686215: Some mutables not defensively copied when deserializing java.security.CodeSource & Timestamp objects Reviewed-by: mullan

7027288: (launcher) remove jkernel test from MiscTests Reviewed-by: mchung, herrick

7009794: misleading text in SSLHandshakeException exception message Summary: update the warning message Reviewed-by: weijun

6990848: JGSS/windows security code native code compiler warnings Reviewed-by: valeriep

7023613: (lc) Incorrect string returned by Locale.toString() with non-empty script field Reviewed-by: srl

7023416: (pack200) fix parfait issues Reviewed-by: jrose

7023363: URI("ftp", "[www.abc.com]", "/dir1/dir2", "query", "frag") should throw URISyntaxException Reviewed-by: alanb, michaelm

Merge

6986477: sun/security/mscapi/AccessKeyStore.sh test is failing on jdk7 Reviewed-by: valeriep

7026346: URLConnection.guessContentTypeFromStream does not support UTF-8 and UTF-32 xml streams with BOM Reviewed-by: alanb Contributed-by: Charles Lee <littlee@linux.vnet.ibm.com>

7024560: InetAddress.getLocalHost().getHostName() returns localhost for hostnames of length HOST_NAME_MAX Reviewed-by: alanb, michaelm

7016078: javax.net.ssl.SSLException: Received fatal alert: internal_error starting JDK 7 b126 Reviewed-by: valeriep

6960211: JavaScript engine allows creation of interface although methods not available Reviewed-by: jjh

Merge

6635776: Regression in jaxb tests with JDk6 U4 6741058: Move org/relaxng/datatype sources from jdk to jaxws workspace Reviewed-by: ohair, alanb

7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security Reviewed-by: ohair, alanb

7022370: Launcher ergonomics should provide simple default implementation Summary: Use a common, platform independent, implementation unless an architecture specific implementation exists Reviewed-by: ksrini, mchung, ohair, gbenson

Merge

6611830: UUID thread-safety and performance improvements Reviewed-by: mduigou, jjb, alanb, briangoetz, dholmes, peterjones Contributed-by: Daniel Aioanei <danielaioanei@google.com>

7023006: Reduce unnecessary thread activity in ForkJoinPool Reviewed-by: chegar, dholmes

6495521: (doc) ConcurrentSkipListMap links to web page NOT describing SkipList Summary: update link, and minor implementation comment in Exchanger Reviewed-by: chegar, mduigou

Merge

Merge

7027387: (tz) Support tzdata2011d Reviewed-by: okutsu

7021517: java.beans code comments have issues with HTML4 compliance Reviewed-by: rupashka

7027043: (doc) Confusing typo at java/beans/VetoableChangeSupport.java Reviewed-by: rupashka

7016150: 6246816 refers to the Laffy demo which is not present in the JDK 7 demo/jfc directory Reviewed-by: peterz

6464022: Memory leak in JOptionPane.createDialog Reviewed-by: alexp

Merge

Merge

7016131: JDK 7 b127: 8 crashes in native frame:awt_DrawingSurface_FreeDrawingSurfaceInfo+0xc on linux amd64 Reviewed-by: dcherepanov, art

7022931: GradientPaint class spec clarification: 7022931, 7016391, 7017246, 7019386 Reviewed-by: flar

7023019: Constructor of class java.awt.Component.FlipBufferStrategy throws unspecified IAE Reviewed-by: dcherepanov, art

Merge

7014528: ColorModel and SampleModel gotten from the same ImageTypeSpecifier instance can be not compatible Reviewed-by: jgodinez, prr

6989760: cmm native compiler warnings Reviewed-by: prr, ohair

7019861: Last scanline is skipped in pisces.Renderer. Summary: not skipping it anymore. Reviewed-by: flar

7027667: clipped aa rectangles are not drawn properly. Summary: Already fixed. This is just a regression test for it. Reviewed-by: prr

6710434: PIT: Reg test java/awt/Graphics2D/ClipPrimitivesTest.java fails in pit build 6u10_b26 Reviewed-by: flar, prr

7022280: Parfait reports Format string argument mismatch in /jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Reviewed-by: jgodinez, prr

7020528: closed/java/awt/print/PageFormat/PageFormatFromAttributes.java failed Reviewed-by: igor, prr

6962082: merge back in lines from bad merge in CR 6501644 and open up a test Reviewed-by: igor, prr

7017324: Kerning crash in JDK 7 since ICU layout update Reviewed-by: igor, prr

Added tag jdk7-b135 for changeset 81eebf5a4f77

Merge

7031227: Bump the HS21 build number to 06 Summary: Update the HS21 build number to 06 Reviewed-by: jcoomes

Merge

Merge

7025628: Remove the temporary hack added for jdk modularization in hotspot Summary: Removed Reviewed-by: ohair, coleenp

6535709: interrupt of wait()ing thread isn't triggerring InterruptedException - test intwait3 Summary: only clear the interrupt state if we will report that it was set Reviewed-by: dcubed, alanb, phh, coleenp, dice

Merge

7029805: JSR 292 compiler/6991596/Test6991596.java fails in nightly Summary: Both JSR 292 compiler tests were moved with 6839872 to the jdk repository Reviewed-by: never

7008866: Missing loop predicate for loop with multiple entries Summary: Add predicates when loop head bytecode is parsed instead of when back branch bytecode is parsed. Reviewed-by: never

7027232: JSR 292: wrong numeric value returned by MH on solaris-sparc Reviewed-by: kvn, never

Merge

7030300: more nightly failures after statics in Class changes Reviewed-by: iveresov, jcoomes, dcubed

6962931: move interned strings out of the perm gen Reviewed-by: never, coleenp, ysr, jwilhelm

6962930: make the string table size configurable Reviewed-by: never, phh, stefank, kamg, dholmes, coleenp

7029509: nightly failures after static fields in Class Reviewed-by: kvn

7017732: move static fields into Class to prepare for perm gen removal Reviewed-by: kvn, coleenp, twisti, stefank

7028374: race in fix_oop_relocations for scavengeable nmethods Reviewed-by: kvn

Added tag hs21-b05 for changeset 0001aa6ce1bf

Added tag jdk7-b135 for changeset 0001aa6ce1bf

Merge

7030131: Update README-builds.html to cover changes introduced by SE-Embedded integration Reviewed-by: ohair

Added tag jdk7-b135 for changeset e9c5ee40c666

Added tag jdk7-b135 for changeset f75a1efb1412

Merge

Merge

Added tag jdk7-b134 for changeset fbf4a969ccba

Merge

Added tag jdk7-b134 for changeset 0cea4fe308ee

Merge

Added tag jdk7-b134 for changeset 74c6fa05df57

Merge

Added tag jdk7-b134 for changeset 0c806e137e3f

Merge

Merge

Merge

7020960: CurrencyNames_sr_RS.properties is missing. Reviewed-by: naoto

Merge

Merge

7019267: Currency Display Names are not localized into pt_BR. Reviewed-by: naoto

Merge

7025303: NLS: t13y fix for 7021691 Most log level words are not translated in java logging Reviewed-by: yhuang

7021693: [ja, zh_CN] jconsole throws exception and fail to start in ja and zh_CN locales Reviewed-by: ogino

7025267: NLS: t13y fix for 7021689 [ja] Notepad demo throws NPE Reviewed-by: ogino

7016542: NLS: obsolete resources in MsgAppletViewer.java should be removed Reviewed-by: igor

Merge

6998391: Serbian (Latin) locale support Reviewed-by: naoto

7029704: JFB: Refix JFB Custom Revision Version Build/Makefile changes Reviewed-by: mr, ohair

Added tag jdk7-b134 for changeset d7436373981b

Merge

7028846: Bump the HS21 build number to 05 Summary: Update the HS21 build number to 05 Reviewed-by: jcoomes

Merge

Merge

6668573: CMS: reference processing crash if ParallelCMSThreads > ParallelGCThreads Summary: Use _max_num_q = max(discovery_degree, processing_degree), and let balance_queues() redistribute from discovery_degree to processing_degree of queues. This should also allow a more dynamic and flexible parallelism policy in the future. Reviewed-by: jmasa, johnc

6896099: Integrate CMS heap ergo with default heap sizing ergo 6627787: CMS: JVM refuses to start up with -Xms16m -Xmx16m 7000125: CMS: Anti-monotone young gen sizing with respect to maximum whole heap size specification 7027529: CMS: retire CMSUseOldDefaults flag Summary: Simplify CMS heap sizing code, relying on ergonomic initial sizing consistent with other collectors for the most part, controlling only young gen sizing to rein in pause times. Make CMS young gen sizing default statically cpu-dependant. Remove inconsistencies wrt generation sizing and policy code, allowing for the fixing for 6627787 and 7000125. For 7027529, retire the flag CMSUseOldDefaults which had been introduced as a bridge from JDK 5 to JDK 6 a number of years ago. Reviewed-by: brutisso, poonam

Merge

6820066: Check that -XX:ParGCArrayScanChunk has a value larger than zero. Summary: Check that -XX:ParGCArrayScanChunk has a value larger than zero. Reviewed-by: johnc, jmasa, ysr

6987703: iCMS: Intermittent hang with gc/gctests/CallGC/CallGC01 and +ExplicitGCInvokesConcurrent Summary: Count enable_icms() and disable_icms() events so as to prevent inteference between concurrent calls, which can cause the iCMS thread to be left stranded in icms_wait() with an unserviced request and no young allocations to unwedge it. Reviewed-by: jcoomes, poonam

7023747: G1: too strict assert in RefineRecordRefsIntoCSCardTableEntryClosure::do_card_ptr in g1RemSet.cpp Summary: Made sure that the assert looks at ParallelGCThreads. Reviewed-by: stefank, tonyp, jwilhelm, johnc

7022943: G1: improve logging to avoid interleaved numbers Summary: Introduced buffered loggging to make sure that log lines are logged one line at a time Reviewed-by: stefank, johnc, dsamersoff

7018056: large pages not always enabled by default Reviewed-by: phh, kvn

7014923: G1: code cleanup Summary: Some G1 code cleanup. Reviewed-by: johnc, jcoomes, jwilhelm

Merge

7011865: JSR 292 CTW fails: !THREAD->is_Compiler_thread() failed: Can not load classes with the Compiler thre Reviewed-by: kvn, never

7028394: Newer AMD Processor Prefetch Defaults Summary: This new default has shown improvement across many workloads. Reviewed-by: kvn Contributed-by: tom.deneau@amd.com

7012648: move JSR 292 to package java.lang.invoke and adjust names Summary: package and class renaming only; delete unused methods and classes Reviewed-by: twisti

6839872: remove implementation inheritance from JSR 292 APIs Summary: consolidate runtime support in java.dyn.MethodHandleNatives; include transitional compatibility logic Reviewed-by: twisti

Merge

7026631: field _klass is incorrectly set for dual type of TypeAryPtr::OOPS Summary: add missing check this->dual() != TypeAryPtr::OOPS into TypeAryPtr::klass(). Reviewed-by: never

7025742: Can not use CodeCache::unallocated_capacity() with fragmented CodeCache Summary: Use largest_free_block() instead of unallocated_capacity(). Reviewed-by: iveresov, never, ysr

6965570: assert(!needs_patching && x->is_loaded(),"how do we know it's volatile if it's not loaded") Reviewed-by: iveresov

6589823: Error: meet not symmetric Summary: arrays pointers meet must fall to bottom if exact array klasses in upper lattice are not equal or super klass is exact. Reviewed-by: never

Merge

7024866: # assert(limit == NULL || limit <= nm->code_end()) failed: in bounds Reviewed-by: kvn, iveresov

7020403: Add AdvancedCompilationPolicy for tiered Summary: This implements adaptive tiered compilation policy. Reviewed-by: kvn, never

Merge

Merge

7011490: Wrong computation results in Test6880034 Summary: incorrect handling of c2i deoptimization on little endian architectures Reviewed-by: never

7019165: Incorrect symbols in pstack output after SymbolTable changes Summary: And out lsb which is set for symbols in constant pool slots to distinguish them from strings Reviewed-by: phh, dholmes, never, dcubed