OpenJDK / amber / amber
changeset 26818:3b18f9dd1a31
Merge
| author | iklam |
|---|---|
| date | Wed, 24 Sep 2014 09:48:15 -0700 |
| parents | c2515f50cdb3 762da4499429 |
| children | 70aa736ff6aa 07ce0e66e6ea |
| files | hotspot/test/TEST.groups |
| diffstat | 3 files changed, 17 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/classfile/verifier.cpp Tue Sep 23 14:19:55 2014 +0200 +++ b/hotspot/src/share/vm/classfile/verifier.cpp Wed Sep 24 09:48:15 2014 -0700 @@ -1694,8 +1694,6 @@ constantPoolHandle cp (THREAD, _method->constants()); for(int i = 0; i < exlength; i++) { - //reacquire the table in case a GC happened - ExceptionTable exhandlers(_method()); u2 start_pc = exhandlers.start_pc(i); u2 end_pc = exhandlers.end_pc(i); u2 handler_pc = exhandlers.handler_pc(i); @@ -1803,8 +1801,6 @@ ExceptionTable exhandlers(_method()); int exlength = exhandlers.length(); for(int i = 0; i < exlength; i++) { - //reacquire the table in case a GC happened - ExceptionTable exhandlers(_method()); u2 start_pc = exhandlers.start_pc(i); u2 end_pc = exhandlers.end_pc(i); u2 handler_pc = exhandlers.handler_pc(i);
--- a/hotspot/test/TEST.groups Tue Sep 23 14:19:55 2014 +0200 +++ b/hotspot/test/TEST.groups Wed Sep 24 09:48:15 2014 -0700 @@ -578,7 +578,7 @@ -runtime/SharedArchiveFile/CdsSameObjectAlignment.java \ -runtime/SharedArchiveFile/DefaultUseWithClient.java \ -runtime/Thread/CancellableThreadTest.java \ - -runtime/runtime/7158988/FieldMonitor.java + -runtime/7158988/FieldMonitor.java hotspot_runtime_closed = \ sanity/ExecuteInternalVMTests.java
--- a/hotspot/test/runtime/CompressedOops/UseCompressedOops.java Tue Sep 23 14:19:55 2014 +0200 +++ b/hotspot/test/runtime/CompressedOops/UseCompressedOops.java Wed Sep 24 09:48:15 2014 -0700 @@ -52,18 +52,17 @@ .shouldContain("Compressed Oops mode") .shouldHaveExitValue(0); - // Larger than 4gb heap should result in zero based with shift 3 - testCompressedOops("-XX:+UseCompressedOops", "-Xmx5g") - .shouldContain("Zero based") - .shouldContain("Oop shift amount: 3") - .shouldHaveExitValue(0); + // Skip the following three test cases if we're on OSX or Solaris. + // + // OSX doesn't seem to care about HeapBaseMinAddress and Solaris + // puts the heap way up, forcing different behaviour. + if (!Platform.isOSX() && !Platform.isSolaris()) { + // Larger than 4gb heap should result in zero based with shift 3 + testCompressedOops("-XX:+UseCompressedOops", "-Xmx5g") + .shouldContain("Zero based") + .shouldContain("Oop shift amount: 3") + .shouldHaveExitValue(0); - // Skip the following three test cases if we're on OSX or Solaris Sparc. - // - // OSX doesn't seem to care about HeapBaseMinAddress and Solaris Sparc - // puts the heap way up, forcing different behaviour. - - if (!Platform.isOSX() && !(Platform.isSolaris() && Platform.isSparc())) { // Small heap above 4gb should result in zero based with shift 3 testCompressedOops("-XX:+UseCompressedOops", "-Xmx32m", "-XX:HeapBaseMinAddress=4g") .shouldContain("Zero based") @@ -83,6 +82,12 @@ .shouldContain("Non-zero based") .shouldContain("Oop shift amount: 4") .shouldHaveExitValue(0); + + // 32gb heap with object alignment set to 16 bytes should result in zero based with shift 4 + testCompressedOops("-XX:+UseCompressedOops", "-Xmx32g", "-XX:ObjectAlignmentInBytes=16") + .shouldContain("Zero based") + .shouldContain("Oop shift amount: 4") + .shouldHaveExitValue(0); } // Explicitly enabling compressed oops with 32gb heap should result a warning @@ -106,12 +111,6 @@ .shouldContain("Max heap size too large for Compressed Oops") .shouldHaveExitValue(0); - // 32gb heap with object alignment set to 16 bytes should result in zero based with shift 4 - testCompressedOops("-XX:+UseCompressedOops", "-Xmx32g", "-XX:ObjectAlignmentInBytes=16") - .shouldContain("Zero based") - .shouldContain("Oop shift amount: 4") - .shouldHaveExitValue(0); - } else { // Compressed oops should only apply to 64bit platforms testCompressedOops("-XX:+UseCompressedOops", "-Xmx32m")