stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8298128: runtime/ErrorHandling/TestSigInfoInHsErrFile.java fails to find pattern with slowdebug

Browse Source 
Reviewed-by: dcubed, dholmes, stuefe
This commit is contained in:
Afshin Zafari 2023-01-16 12:36:45 +00:00 committed by Robbin Ehn
parent a2f67660f0
commit 289aed465e
2 changed files with 4 additions and 4 deletions
src/hotspot/share/utilities
vmError.cpp
test/hotspot/jtreg/runtime/ErrorHandling
HsErrFileUtils.java

6
src/hotspot/share/utilities/vmError.cpp

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2020 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@ -1803,7 +1803,7 @@ typedef void (*voidfun_t)();
// Crash with an authentic sigfpe
volatile int sigfpe_int = 0;
static void crash_with_sigfpe() {
static void ALWAYSINLINE crash_with_sigfpe() {
// generate a native synchronous SIGFPE where possible;
sigfpe_int = sigfpe_int/sigfpe_int;
@ -1819,7 +1819,7 @@ static void crash_with_sigfpe() {
} // end: crash_with_sigfpe
// crash with sigsegv at non-null address.
static void crash_with_segfault() {
static void ALWAYSINLINE crash_with_segfault() {
int* crash_addr = reinterpret_cast<int*>(VMError::segfault_address);
*crash_addr = 1;

2
test/hotspot/jtreg/runtime/ErrorHandling/HsErrFileUtils.java

@ -132,7 +132,7 @@ public class HsErrFileUtils {
}
// Found all positive pattern?
if (!positivePatternStack.isEmpty()) {
throw new RuntimeException("hs-err file incomplete (first missing pattern: " + positivePatternStack.peek() + ")");
throw new RuntimeException("hs-err file incomplete (first missing pattern: " + currentPositivePattern.pattern() + ")");
}
if (checkEndMarker && !lastLine.equals("END.")) {
throw new RuntimeException("hs-err file incomplete (missing END marker.)");