archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8066448: SmallCodeCacheStartup.java exits with exit code 1

Browse source 
Check for VirtualMachineError in case VM initialization fails.

Reviewed-by: kvn
This commit is contained in:
Tobias Hartmann 2014-12-04 09:52:15 +01:00
parent 65fe921d3d
commit f9806ff009
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/oops/method.cpp
View file

@ -936,7 +936,7 @@ address Method::make_adapters(methodHandle mh, TRAPS) {
// so making them eagerly shouldn't be too expensive. // so making them eagerly shouldn't be too expensive.
AdapterHandlerEntry* adapter = AdapterHandlerLibrary::get_adapter(mh); AdapterHandlerEntry* adapter = AdapterHandlerLibrary::get_adapter(mh);
if (adapter == NULL ) { if (adapter == NULL ) {
THROW_MSG_NULL(vmSymbols::java_lang_VirtualMachineError(), "out of space in CodeCache for adapters"); THROW_MSG_NULL(vmSymbols::java_lang_VirtualMachineError(), "Out of space in CodeCache for adapters");
} }
mh->set_adapter_entry(adapter); mh->set_adapter_entry(adapter);

11
hotspot/test/compiler/startup/SmallCodeCacheStartup.java
View file

@ -24,12 +24,13 @@
/* /*
* @test * @test
* @bug 8023014 * @bug 8023014
* @summary Test ensures that there is no crash if there is not enough ReservedCodeacacheSize * @summary Test ensures that there is no crash if there is not enough ReservedCodeCacheSize
* to initialize all compiler threads. The option -Xcomp gives the VM more time to * to initialize all compiler threads. The option -Xcomp gives the VM more time to
* to trigger the old bug. * trigger the old bug.
* @library /testlibrary * @library /testlibrary
*/ */
import com.oracle.java.testlibrary.*; import com.oracle.java.testlibrary.*;
import static com.oracle.java.testlibrary.Asserts.assertTrue;
public class SmallCodeCacheStartup { public class SmallCodeCacheStartup {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
@ -38,7 +39,13 @@ public class SmallCodeCacheStartup {
"-Xcomp", "-Xcomp",
"-version"); "-version");
OutputAnalyzer analyzer = new OutputAnalyzer(pb.start()); OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
try {
analyzer.shouldHaveExitValue(0); analyzer.shouldHaveExitValue(0);
} catch (RuntimeException e) {
// Error occurred during initialization, did we run out of adapter space?
assertTrue(analyzer.getOutput().contains("VirtualMachineError: Out of space in CodeCache"),
"Expected VirtualMachineError");
}
System.out.println("TEST PASSED"); System.out.println("TEST PASSED");
} }