Merge

Merge

8060454: [TESTBUG] Whitebox tests fail with -XX:CompileThreshold=100 Summary: Move the call to 'waitAndDeoptimize' from the warmup methods to the osr triggering methods to make sure that no non-osr compilation is in the queue after warmup. Reviewed-by: kvn

8060196: 'CodeHeap is full' warning suggests to increase wrong code heap size Summary: Fixed 'CodeHeap is full' warning to output the right CodeHeapSize flag. Reviewed-by: kvn, anoll

8059846: InstanceKlass should use MutexLockerEx to acquire OsrList_lock Summary: Replace explicit locking of OsrList_lock by a MutexLockerEx instantiation. Reviewed-by: kvn, anoll, drchase, dholmes, dlong, coleenp

8058093: Test nsk/stress/jck60/jck60014: assert in src/share/vm/oops/constantPool.cpp: should not be resolved otherwise 8044209: nsk/split_verifier/security/coglio06 fails with exit code 97 - missing 'prohibited package name' Summary: Fix resolution error saving. Reviewed-by: lfoltan, sspitsyn, hseigel, ctornqvi

Merge

8061962: classFileParser.cpp.orig got erroneously added to the hotspot source repository Summary: Remove the file Reviewed-by: coleenp, ccheung

6191224: (reflect) Misleading detail string in IllegalArgumentException thrown by Array.get<Type> Summary: The test case shows that an exception is thrown with the message "Argument is not an array", when in fact the argument is an array, but an array of a primitive type is actually what was expected. Fixed by differentiating between failing because an array was expected and failing because an array of a primitive type was expected. Reviewed-by: dholmes, ctornqvi, lfoltan

8038268: VM Crashes in MetaspaceShared::generate_vtable_methods while creating CDS archive with limiting SharedMiscCodeSize Summary: estimate the minimum required size for the misc code region and check if the specified misc code region size meets the minimum size requirement Reviewed-by: jiangli, dholmes

Merge

8043275: Fix interface initialization for default methods. Summary: Initialize interfaces that declare concrete instance methods. Reviewed-by: kamg, coleenp, psandoz

8057043: Type annotations not retained during class redefine / retransform Reviewed-by: coleenp, sspitsyn, jfranck

8061618: Removed unused networking functions from os class Reviewed-by: lfoltan, hseigel, dholmes

Added tag jdk9-b39 for changeset 4d506c3aaee1

Merge

8064372: CompileJavaModules overwrites settings from custom Reviewed-by: mchung, erikj

Added tag jdk9-b39 for changeset 940ac2683a10

Added tag jdk9-b39 for changeset 4e7c4d692e93

Merge

Merge

Merge

8062977: Inference: NullPointerException during bound incorporation Summary: Bogus Types.asSuper call on array type symbol Reviewed-by: vromero

6987475: Order of declarations affects whether abstract method considered overridden Summary: Types.implementation erroneously returns first matching method in hierarchy. Reviewed-by: vromero

8063074: test/tools/javac/plugin/showType/Test.java fails on Windows Reviewed-by: ksrini

8062676: Tests which leak lots of file managers should be fixed (group 2) Reviewed-by: darcy

8063039: incorrect message reference or broken message file Reviewed-by: ksrini

8035259: javac, incorrect shadowing of classes vs type parameters Summary: Cause javac to look at type variables first when resolving names in an extends/implements list Reviewed-by: mcimadamore, jlahoda