Merge

6736461: ThreadMXBean Locks.java fails intermittently. Summary: Fixed the test to wait for the right state before calling check thread information. Reviewed-by: jjh

6705893: javax.script tests should not require a js engine on OpenJDK Summary: Fixed the tests to pass with open JDK. Reviewed-by: darcy

Merge

6496269: Many warnings generated from com/sun/java/util/jar/pack/*.cpp when compiled on Linux Summary: Removal of compiler warnings and fixing of assert logic. Reviewed-by: jrose, ksrini, bristor

6737900: TEST: Some JDI regression tests timeout on slow machines Summary: Don't execute useless code, and split test into multiple @runs. Reviewed-by: tbell

Added tag jdk7-b34 for changeset 8810ae8edcd1

Merge

Merge

6745064: Update Hotspot build number for HS14 Summary: Bump build number for hs14-b04 Reviewed-by: jcoomes

6744422: incorrect handling of -1 in set_jump_destination Reviewed-by: rasbold

Merge

Merge

6731958: Include all the SA classes into sa-jdi.jar Summary: sa-jdi.jar bundled with JDK should include all the SA classes. Reviewed-by: swamyv

Merge

6732698: crash with dead code from compressed oops in gcm Reviewed-by: rasbold

6611837: block frequency is zero Summary: insert_goto_at should set frequency for newly created blocks Reviewed-by: never

6732732: CTW with EA: assert(n != 0L,"Bad immediate dominator info.") Summary: Missing edge to a call's return value in EA Connection Graph. Reviewed-by: never

6741738: TypePtr::add_offset() set incorrect offset when the add overflows Summary: Set offset to OffsetBot when the add overflows in TypePtr::add_offset() Reviewed-by: jrose, never

6736417: Fastdebug C2 crashes in StoreBNode::Ideal Summary: The result of step_through_mergemem() and remove_dead_region() is not checked in some cases. Reviewed-by: never

5108146: Merge i486 and amd64 cpu directories 6459804: Want client (c1) compiler for x86_64 (amd64) for faster start-up Reviewed-by: kvn

6741642: bad enum definition in ciTypeFlow.hpp Reviewed-by: rasbold, martin Contributed-by: doko@ubuntu.com

Merge

6728478: Assertion at parallel promotion from young to old generation Summary: The fix avoids a call to address_for_index() in this particular situation where it is not known if the passed index is in bounds. Reviewed-by: tonyp

6739357: CMS: Switch off CMSPrecleanRefLists1 until 6722113 can be fixed Summary: Temporarily switch off the precleaning of Reference lists completely until related issues are fixed in 6722113. Reviewed-by: jmasa, poonam, tonyp

Merge

6736341: PermGen size is insufficient for jconsole Summary: Removing two buggy methods that should not be used, but ended up being used due to a re-organization in the class hierarchy. Reviewed-by: jmasa, ysr, kamg, coleenp

Merge

6730716: nulls from two unrelated classes compare not equal Summary: check for not-nullness after proving that types are unrelated Reviewed-by: kvn, never

6732194: Data corruption dependent on -server/-client/-Xbatch Summary: rematerializing nodes results in incorrect inputs Reviewed-by: rasbold

6732154: REG: Printing an Image using image/gif doc flavor crashes the VM, Solsparc Summary: delay transform call until uses of t2 are constructed Reviewed-by: never

6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type") Summary: fixed few addP node type and narrow oop type problems. Reviewed-by: rasbold, never

Added tag jdk7-b34 for changeset fff241969646

Added tag jdk7-b34 for changeset 5d6b06900843

Added tag jdk7-b34 for changeset 90cf935adb35

Merge

Merge

Merge

Merge

6732461: broken message file for annotation processing Summary: Regression in sqe test introduced in 6720185 Reviewed-by: jjg

6734819: Javac performs flows analysis on already translated classes Summary: Regression in JavaCompiler.desugar introduced in 6726015 Reviewed-by: jjg

6676362: Spurious forward reference error with final var + instance variable initializer Summary: Some javac forward reference errors aren't compliant with the JLS Reviewed-by: jjg

6718364: inference fails when a generic method is invoked with raw arguments Summary: Bug in the implementation of Types.isSubtypeUnchecked Reviewed-by: jjg

6695838: javac does not detect cyclic inheritance involving static inner classes after import clause Summary: Javac fails to detect some errors due to the order in which a class' static imports are entered Reviewed-by: jjg

Merge

6733995: legal notice repair on langtools/src/share/classes/com/sun/tools/javap/JavapTask.java Reviewed-by: ksrini

6730423: Diagnostic formatter should be an instance field of JCDiagnostic Summary: JCDiagnostic.fragment should be deprecated and the diagnostic factory should be used instead Reviewed-by: jjg

4884240: additional option required for javap Reviewed-by: ksrini

4111861: static final field contents are not displayed Reviewed-by: ksrini

6627362: javac generates code that uses array.clone, which is not available on JavaCard 6627364: javac needs Float and Double on the bootclasspath even when not directly used 6627366: javac needs Cloneable and Serializable on the classpath even when not directly used Reviewed-by: darcy

Added tag jdk7-b33 for changeset e1305f648e12

Merge

Added tag jdk7-b33 for changeset 31ff14943017

Merge

Added tag jdk7-b33 for changeset f0165b195228

Merge

Merge

Merge

Added tag jdk7-b33 for changeset d958f883b42a

Merge

Merge

6614210: JPRT Windows 32bit msival2 build failure when building 'install' workspace Summary: suppresses wscript's modal dialog on error and no msi validation for jprt. Reviewed-by: ohair, jmelvin

Merge

6674227: Missing LICENSE file during build Summary: Just a JPRT usage issue. The top level files (like LICENSE) are needed to create the jdk image (j2sdk-image directory). Reviewed-by: tbell