Merge

7019689: Non-dependent name is found in dependent base class although it should be rejected Summary: fix hashtable.hpp to qualify non-dependant name with "this" Reviewed-by: phh, never, poonam Contributed-by: volker.simonis@gmail.com

6840152: JVM crashes when heavyweight monitors are used Summary: Turn off biased locking if !UseFastLocking or UseHeavyMonitors options are requested. Reviewed-by: phh, never, dcubed, dholmes

Merge

7018429: JPRT: Update Makefile to use ALT_JDK_TARGET_IMPORT_PATH for copying JDK Summary: Set JDK_IMPORT_PATH to ALT_JDK_TARGET_IMPORT_PATH if it is defined Reviewed-by: phh, ohair

6954420: 2/4 jps shows "process information unavailable" sometimes Summary: Make sure the backing store file is flushed in create_sharedmem_resources() and get_user_name_slow() no longer checks the size of the backing store file. Reviewed-by: briand, swamyv, acorn, poonam

Merge

7019157: errorHandler doesn't compile with super old gcc without precompiled headers Summary: old gccs don't support precompiled headers so have to supply includes Reviewed-by: phh, kamg

7017824: Add support for creating 64-bit Visual Studio projects Summary: Updated create.bat and ProjectCreator Reviewed-by: brutisso, stefank, ohair

Merge

Merge

7018257: jmm_DumpThreads allocates into permgen Summary: Don't allocate in permgen Reviewed-by: ysr, sla

7018302: newly added assert related to size of constantPoolOop causes secondary assertions or crashes Summary: 6912621 used a raw oop in the newly added assert following an allocation attempt that could result in a GC. Reviewed-by: jmasa

7017008: G1: Turn on compressed oops by default. Summary: Normally compressed oops is enabled when the maximum heap size is under a certain limit, except when G1 is also enabled. Remove this limitation. Also re-enable GCBasher testing with G1 on 64 bit windows in jprt. Reviewed-by: jcoomes, brutisso, tonyp

7014851: Remove unused parallel compaction code Summary: Removed. Reviewed-by: jcoomes, brutisso

6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?") Summary: Fix block_size_if_printezis_bits() so it does not expect the bits, only uses them when available. Fix block_size_no_stall() so it does not stall when the bits are missing such cases, letting the caller deal with zero size returns. Constant pool cache oops do not need to be unparsable or conc_unsafe after their klass pointer is installed. Some cosmetic clean-ups and some assertion checking for conc-usafety which, in the presence of class file redefinition, has no a-priori time boundedness, so all GCs must be able to safely deal with putatively conc-unsafe objects in a stop-world pause. Reviewed-by: jmasa, johnc

7015169: GC Cause not always set Summary: Sometimes the gc cause was not always set. This caused JStat to print the wrong information. Reviewed-by: tonyp, ysr Contributed-by: suenaga.yasumasa@oss.ntt.co.jp

7022659: errorHandler doesn't compile without precompiled headers Summary: add proper includes in errorHandler.hpp Reviewed-by: phh, kamg

Added tag hs21-b02 for changeset 70ed6d8368bc

Added tag jdk7-b131 for changeset e0205cb94879

Added tag jdk7-b131 for changeset 836de2e4bdee

Added tag jdk7-b131 for changeset d8af56da89bc

Merge

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset 09e47b898040

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset 1607780fe197

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset b0a4325b9ef5

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset 04b2533d5d44

Merge

Merge

7021314: Build should not install javaws man page Summary: Only install javaws.1 when not building OpenJDK Reviewed-by: alanb, ohair

7010594: Add /SAFESEH to links on windows to verify safe exceptions Reviewed-by: alanb

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset 8924242a88c8

Merge

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Added tag jdk7-b130 for changeset 70ed6d8368bc

Merge

7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg

Merge

7019371: JDK7 is not building UPX. IFTW wrappers are not compressed. Reviewed-by: billyh, jqzuo

Merge

Merge

Merge

Merge

Merge

Merge

Added tag jdk7-b130 for changeset 00d174cbd0bb

Added tag jdk7-b130 for changeset a36beda9b9de

Merge

Merge

Merge

Merge

Merge

7017734: jdk7 message drop 1 translation integration Reviewed-by: ogino, yhuang

Merge

7017675: typo in JavacParser for allowUnderscoresInLiterals Reviewed-by: dlsmith Contributed-by: peter.b.kessler@oracle.com

7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123. Summary: override clash algorithm is not implemented correctly Reviewed-by: jjg

7017414: before the move of JSR 292 to package java.lang.invoke, javac must recognize the new package Summary: added support for future 292 package (support for old location 'java.dyn' will be removed in followup changeset) Reviewed-by: jjg

Merge

7014715: javac returns different error code for certain failure(s) Summary: javac silently crashes when emitting certain kinds of resolution diagnostics Reviewed-by: jjg

6969184: poor error recovery after symbol not found Summary: generic type-well formedness check should ignore erroneous symbols Reviewed-by: jjg

5017953: spurious cascaded diagnostics when name not found Summary: when an operator is applied to one or more erroneous operands, spurious diagnostics are generated Reviewed-by: jjg

6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable Summary: Lint warnings generated during MemberEnter might ignore @SuppressWarnings annotations Reviewed-by: jjg

6961571: Update visitors to support ARM's ElementKind.RESOURCE_VARIABLE Reviewed-by: jjg

7014734: Project Coin: Allow optional trailing semicolon to terminate resources list in try-with-resources Reviewed-by: jjg

7015530: Reiterate API specializations in javax.lang.model.elment subinterfaces Reviewed-by: jjg

Merge

7006126: (fs) Updates to file system API (1/2011) Reviewed-by: jjg

6838943: inference: javac is not handling type-variable substitution properly Summary: free type-variables are being replaced with type-variables bound to forall type leading to unsoundness Reviewed-by: jjg, dlsmith

6313164: javac generates code that fails byte code verification for the varargs feature Summary: method applicability check should fail if formal varargs element type is not accessible Reviewed-by: jjg

6910550: javac 1.5.0_17 fails with incorrect error message Summary: multiple clashing members declared in same class should be added to the class' scope in order to avoid downstream spurious diagnostics Reviewed-by: jjg

7015482: jtreg test tools/javac/diags/MessageInfo.java fails when test/ dir is not in langtools repo Summary: Don't fail if the needed file isn't present, if running under jtreg. Reviewed-by: jjg

7013272: Automatically generate info about how compiler resource keys are used Reviewed-by: mcimadamore

6554097: "final" confuses @SuppressWarnings Reviewed-by: mcimadamore

7013420: Project Coin: remove general expression support from try-with-resources statement Reviewed-by: mcimadamore, jjg

6988106: javac report 'java.lang.IllegalMonitorStateException' Reviewed-by: ksrini

6581775: Fix the white space problem in javac shell tests Reviewed-by: mcimadamore

6963934: JCCompilationUnit.getImports does not report all imports Reviewed-by: mcimadamore

Added tag jdk7-b129 for changeset 22e1f19ae95c

Merge

Added tag jdk7-b129 for changeset be4f18a6d7c5

Merge

Added tag jdk7-b129 for changeset ff78798ebd0e