Skip to content

Commit a532e50

Browse files
committed
8377395: serviceability/sa/TestJhsdbJstackMixedCore.java fails due to NPE because "because "this.cfa" is null"
Reviewed-by: cjplummer, kevinw
1 parent 0097db5 commit a532e50

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -187,9 +187,8 @@ static bool fill_addr_info(lib_info* lib) {
187187
lib->exec_end = (uintptr_t)-1L;
188188
for (ph = phbuf, cnt = 0; cnt < ehdr.e_phnum; cnt++, ph++) {
189189
if (ph->p_type == PT_LOAD) {
190-
uintptr_t unaligned_start = lib->base + ph->p_vaddr;
191-
uintptr_t aligned_start = align_down(unaligned_start, ph->p_align);
192-
uintptr_t aligned_end = align_up(unaligned_start + ph->p_memsz, ph->p_align);
190+
uintptr_t aligned_start = lib->base + align_down(ph->p_vaddr, ph->p_align);
191+
uintptr_t aligned_end = aligned_start + align_up(ph->p_memsz, ph->p_align);
193192
if ((lib->end == (uintptr_t)-1L) || (lib->end < aligned_end)) {
194193
lib->end = aligned_end;
195194
}

test/hotspot/jtreg/ProblemList.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ serviceability/sa/TestJmapCore.java 8318754 macosx-aarch64
140140
serviceability/sa/TestJmapCoreMetaspace.java 8318754 macosx-aarch64
141141

142142
serviceability/sa/ClhsdbThreadContext.java 8356704 windows-x64
143-
serviceability/sa/TestJhsdbJstackMixedCore.java 8377395 linux-x64
144143

145144
serviceability/jvmti/stress/StackTrace/NotSuspended/GetStackTraceNotSuspendedStressTest.java 8315980 linux-all,windows-x64
146145

test/hotspot/jtreg/serviceability/sa/TestJhsdbJstackMixedCore.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* @test
40-
* @bug 8374482 8376264 8376284
40+
* @bug 8374482 8376264 8376284 8377395
4141
* @requires (os.family == "linux") & (vm.hasSA)
4242
* @requires os.arch == "amd64"
4343
* @library /test/lib
@@ -66,7 +66,7 @@ private static void runJstackMixed(String coreFileName) throws Exception {
6666

6767
out.shouldContain("__restore_rt <signal trampoline>");
6868
out.shouldContain("Java_jdk_test_lib_apps_LingeredApp_crash");
69-
out.shouldContain("* jdk.test.lib.apps.LingeredApp.crash()");
69+
out.shouldContain("jdk.test.lib.apps.LingeredApp.crash()");
7070
}
7171

7272
public static void main(String... args) throws Throwable {

0 commit comments

Comments
 (0)