Skip to content

Commit 40a903d

Browse files
committed
8359126: [AIX] new test TestImplicitNullChecks.java fails
1 parent 0582bd2 commit 40a903d

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

test/hotspot/jtreg/compiler/gcbarriers/TestImplicitNullChecks.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ public static void main(String[] args) {
6767
}
6868

6969
@Test
70-
@IR(applyIfOr = {"UseZGC", "true", "UseG1GC", "true"},
70+
// On AIX, implicit null checks are limited because the zero page is
71+
// readable (but not writable). See os::zero_page_read_protected().
72+
@IR(applyIfPlatform = {"aix", "false"},
73+
applyIfOr = {"UseZGC", "true", "UseG1GC", "true"},
7174
counts = {IRNode.NULL_CHECK, "1"},
7275
phase = CompilePhase.FINAL_CODE)
7376
static Object testLoad(Outer o) {

test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public class IREncodingPrinter {
6262
// as adding non-existent platforms can lead to skipped tests.
6363
private static final List<String> irTestingPlatforms = new ArrayList<String>(Arrays.asList(
6464
// os.family
65+
"aix",
6566
"linux",
6667
"mac",
6768
"windows",
@@ -346,7 +347,9 @@ private boolean checkPlatform(String platform, String value) {
346347
}
347348

348349
String os = "";
349-
if (Platform.isLinux()) {
350+
if (Platform.isAix()) {
351+
os = "aix";
352+
} else if (Platform.isLinux()) {
350353
os = "linux";
351354
} else if (Platform.isOSX()) {
352355
os = "mac";

0 commit comments

Comments
 (0)