From 6bad10bac7a1dbdbf8e084041864ad9c0aec1046 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Fri, 3 May 2024 09:31:01 +0200 Subject: [PATCH] JDK-8331428 --- src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp | 6 +++--- src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp | 6 +++--- .../share/runtime/flags/jvmFlagConstraintsCompiler.cpp | 6 +++--- .../share/runtime/flags/jvmFlagConstraintsCompiler.hpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp index 6c6f83177d204..cb36962e61e58 100644 --- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp +++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -174,7 +174,7 @@ JVMFlag::Error MaxMetaspaceFreeRatioConstraintFunc(uint value, bool verbose) { } } -JVMFlag::Error InitialTenuringThresholdConstraintFunc(uintx value, bool verbose) { +JVMFlag::Error InitialTenuringThresholdConstraintFunc(uint value, bool verbose) { #if INCLUDE_PARALLELGC JVMFlag::Error status = InitialTenuringThresholdConstraintFuncParallel(value, verbose); if (status != JVMFlag::SUCCESS) { @@ -185,7 +185,7 @@ JVMFlag::Error InitialTenuringThresholdConstraintFunc(uintx value, bool verbose) return JVMFlag::SUCCESS; } -JVMFlag::Error MaxTenuringThresholdConstraintFunc(uintx value, bool verbose) { +JVMFlag::Error MaxTenuringThresholdConstraintFunc(uint value, bool verbose) { #if INCLUDE_PARALLELGC JVMFlag::Error status = MaxTenuringThresholdConstraintFuncParallel(value, verbose); if (status != JVMFlag::SUCCESS) { diff --git a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp index 591838c071753..a89f42959e1b6 100644 --- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp +++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,8 +49,8 @@ f(size_t, MarkStackSizeConstraintFunc) \ f(uint, MinMetaspaceFreeRatioConstraintFunc) \ f(uint, MaxMetaspaceFreeRatioConstraintFunc) \ - f(uintx, InitialTenuringThresholdConstraintFunc) \ - f(uintx, MaxTenuringThresholdConstraintFunc) \ + f(uint, InitialTenuringThresholdConstraintFunc) \ + f(uint, MaxTenuringThresholdConstraintFunc) \ \ f(uintx, MaxGCPauseMillisConstraintFunc) \ f(uintx, GCPauseIntervalMillisConstraintFunc) \ diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp index c32177224a59e..2cd7371909d1e 100644 --- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp +++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -67,11 +67,11 @@ JVMFlag::Error CICompilerCountConstraintFunc(intx value, bool verbose) { } } -JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(intx value, bool verbose) { +JVMFlag::Error AllocatePrefetchStepSizeConstraintFunc(int value, bool verbose) { if (AllocatePrefetchStyle == 3) { if (value % wordSize != 0) { JVMFlag::printError(verbose, - "AllocatePrefetchStepSize (" INTX_FORMAT ") must be multiple of %d\n", + "AllocatePrefetchStepSize (%d) must be multiple of %d\n", value, wordSize); return JVMFlag::VIOLATES_CONSTRAINT; } diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp index 8538c836ca937..60adf4903a328 100644 --- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp +++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ #define COMPILER_CONSTRAINTS(f) \ f(intx, CICompilerCountConstraintFunc) \ f(intx, AllocatePrefetchInstrConstraintFunc) \ - f(intx, AllocatePrefetchStepSizeConstraintFunc) \ + f(int, AllocatePrefetchStepSizeConstraintFunc) \ f(intx, CompileThresholdConstraintFunc) \ f(intx, OnStackReplacePercentageConstraintFunc) \ f(uintx, CodeCacheSegmentSizeConstraintFunc) \