Skip to content

Commit 9697bc3

Browse files
committed
8331428: ubsan: JVM flag checking complains about MaxTenuringThresholdConstraintFunc, InitialTenuringThresholdConstraintFunc and AllocatePrefetchStepSizeConstraintFunc
Reviewed-by: stefank, aboldtch, tschatzl
1 parent ce73fec commit 9697bc3

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2024, 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
@@ -174,7 +174,7 @@ JVMFlag::Error MaxMetaspaceFreeRatioConstraintFunc(uint value, bool verbose) {
174174
}
175175
}
176176

177-
JVMFlag::Error InitialTenuringThresholdConstraintFunc(uintx value, bool verbose) {
177+
JVMFlag::Error InitialTenuringThresholdConstraintFunc(uint value, bool verbose) {
178178
#if INCLUDE_PARALLELGC
179179
JVMFlag::Error status = InitialTenuringThresholdConstraintFuncParallel(value, verbose);
180180
if (status != JVMFlag::SUCCESS) {
@@ -185,7 +185,7 @@ JVMFlag::Error InitialTenuringThresholdConstraintFunc(uintx value, bool verbose)
185185
return JVMFlag::SUCCESS;
186186
}
187187

188-
JVMFlag::Error MaxTenuringThresholdConstraintFunc(uintx value, bool verbose) {
188+
JVMFlag::Error MaxTenuringThresholdConstraintFunc(uint value, bool verbose) {
189189
#if INCLUDE_PARALLELGC
190190
JVMFlag::Error status = MaxTenuringThresholdConstraintFuncParallel(value, verbose);
191191
if (status != JVMFlag::SUCCESS) {

src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2024, 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
@@ -49,8 +49,8 @@
4949
f(size_t, MarkStackSizeConstraintFunc) \
5050
f(uint, MinMetaspaceFreeRatioConstraintFunc) \
5151
f(uint, MaxMetaspaceFreeRatioConstraintFunc) \
52-
f(uintx, InitialTenuringThresholdConstraintFunc) \
53-
f(uintx, MaxTenuringThresholdConstraintFunc) \
52+
f(uint, InitialTenuringThresholdConstraintFunc) \
53+
f(uint, MaxTenuringThresholdConstraintFunc) \
5454
\
5555
f(uintx, MaxGCPauseMillisConstraintFunc) \
5656
f(uintx, GCPauseIntervalMillisConstraintFunc) \

src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2024, 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
@@ -67,11 +67,11 @@ JVMFlag::Error CICompilerCountConstraintFunc(intx value, bool verbose) {
6767
}
6868
}
6969

70-
JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(intx value, bool verbose) {
70+
JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(int value, bool verbose) {
7171
if (AllocatePrefetchStyle == 3) {
7272
if (value % wordSize != 0) {
7373
JVMFlag::printError(verbose,
74-
"AllocatePrefetchStepSize (" INTX_FORMAT ") must be multiple of %d\n",
74+
"AllocatePrefetchStepSize (%d) must be multiple of %d\n",
7575
value, wordSize);
7676
return JVMFlag::VIOLATES_CONSTRAINT;
7777
}

src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, 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
@@ -37,7 +37,7 @@
3737
#define COMPILER_CONSTRAINTS(f) \
3838
f(intx, CICompilerCountConstraintFunc) \
3939
f(intx, AllocatePrefetchInstrConstraintFunc) \
40-
f(intx, AllocatePrefetchStepSizeConstraintFunc) \
40+
f(int, AllocatePrefetchStepSizeConstraintFunc) \
4141
f(intx, CompileThresholdConstraintFunc) \
4242
f(intx, OnStackReplacePercentageConstraintFunc) \
4343
f(uintx, CodeCacheSegmentSizeConstraintFunc) \

0 commit comments

Comments
 (0)