Merge

6773078: UseCompressedOops: assert(kid == 0L || s->_leaf->in(0) == 0L,"internal operands have no control") Summary: Don't set the control edge of a klass load node. Reviewed-by: never

6766316: assert(!nocreate,"Cannot build a phi for a block already parsed.") Summary: Don't use the invariant local information if there are irreducible loops. Reviewed-by: never

6772413: code cleanup Summary: Removed lines in adm64.make with interpret.o and moved few constant strings from header files. Reviewed-by: never

6767659: Conversion from i486 to x86 missed some entries in makefiles Summary: Fixed missed entries. Reviewed-by: never

6770949: minor tweaks before 6655638 Summary: minor cleanups & tuning of array.hpp, debug.cpp, growableArray.hpp, hashtable.cpp Reviewed-by: kvn

6653858: dynamic languages need to be able to load anonymous classes Summary: low-level privileged sun.misc.Unsafe.defineAnonymousClass Reviewed-by: kvn

6769748: Fix solaris makefiles for the case when "CC -V" produces several lines Summary: Fix solaris makefiles for 5.10 compilers Reviewed-by: jcoomes

Merge

6758445: loop heads that are exception entry points can crash during count_edges/mark_loops Reviewed-by: kvn, jrose

6764892: VS2008 changes required to compile hotspot sources Summary: Minor changes required to build using the Visual Studio 2008 compiler Reviewed-by: kvn, ohair

Added tag jdk7-b40 for changeset d9cee294e5e4

6750229: Upgrade Recommended Linux and Windows Build OS Reviewed-by: xdono

Added tag jdk7-b40 for changeset 4e9ce4796705

Added tag jdk7-b40 for changeset 3c53424bbe3b

Merge

Merge

Merge

6763518: Impossible to suppress raw-type warnings Summary: Check.validate(Type) should be invoked after -Xlint is augmented in Attr.visitVarDef Reviewed-by: darcy

6764226: ListTest fails on javap output with bad characters Reviewed-by: darcy

Merge

6762569: Javac crashes with AssertionError in Types.containedBy Summary: Types.containedBy should be more liberal with UndetVars Reviewed-by: jjg

6758789: Some method resolution diagnostic should be improved Summary: Recent work on diagnostics left out some resolution corner cases Reviewed-by: jjg

6746184: javac fails to compile call to public varargs method Summary: javac's resolution process should go through all steps described in JLS 15.12.2.2 Reviewed-by: jjg

6680106: StackOverFlowError for Cyclic inheritance in TypeParameters with ArrayType Bounds Summary: Javac ends up in an infinite loop while attributing mutually referring array type-parameter bounds Reviewed-by: jjg

6557954: Inner class type parameters doesn't get substituted when checking type well-formedness Summary: Validator.visitTypeApply should substitute all formal typevars with actual parameters Reviewed-by: jjg

6548436: Incorrect inconvertible types error Summary: Types.rewrite quantifiers should cope with captured type-variables properly Reviewed-by: jjg

6487370: javac incorrectly gives ambiguity warning with override-equivalent abstract inherited methods Summary: Javac should not compare erased return types when checking for ambiguity errors during overload resolution Reviewed-by: jjg