mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 01:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

8372802: PrintFlagsFinal should also print locked flags

Browse Source 
Reviewed-by: dholmes, stuefe, lmesnik
This commit is contained in:
Frederic Thevenet
2025-12-04 08:23:33 +00:00
committed by David Holmes
parent 63a10e0099
commit 771253e285
2 changed files with 70 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/runtime/flags/jvmFlag.cpp
View File

@@ -711,7 +711,7 @@ void JVMFlag::printFlags(outputStream* out, bool withComments, bool printRanges,
for (size_t i = 0; i < length; i++) {
const bool skip = (skipDefaults && flagTable[i].is_default());
const bool visited = iteratorMarkers.at(i);
if (!visited && flagTable[i].is_unlocked() && !skip) {
if (!visited && !skip) {
if ((bestFlag == nullptr) || (strcmp(bestFlag->name(), flagTable[i].name()) > 0)) {
bestFlag = &flagTable[i];
bestFlagIndex = i;

69
test/hotspot/jtreg/runtime/CommandLine/PrintAllFlags.java Normal file
View File

@@ -0,0 +1,69 @@
/*
* Copyright (c) 2025, IBM Corporation.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8372802
* @summary Test that +PrintFlagsFinal print the same options when +UnlockExperimentalVMOptions and
* +UnlockDiagnosticVMOptions are set than when they aren't.
* @requires vm.flagless
* @library /test/lib
* @run driver PrintAllFlags
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
import java.io.IOException;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
public class PrintAllFlags {
private static final Pattern optPattern = Pattern.compile("\\s*\\w+\\s\\w+\\s+=");
public static void main(String args[]) throws Exception {
var flagsFinal = runAndMakeVMOptionSet("-XX:+PrintFlagsFinal", "-version");
var flagsFinalUnlocked = runAndMakeVMOptionSet(
"-XX:+UnlockExperimentalVMOptions", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintFlagsFinal", "-version");
if (!flagsFinal.equals(flagsFinalUnlocked)) {
throw new RuntimeException("+PrintFlagsFinal should produce the same output" +
" whether or not UnlockExperimentalVMOptions and UnlockDiagnosticVMOptions are set");
}
}
private static Set<String> runAndMakeVMOptionSet(String... args) throws IOException {
var output = new OutputAnalyzer(ProcessTools.createLimitedTestJavaProcessBuilder(args).start());
Set<String> optNameSet = output.asLines().stream()
.map(optPattern::matcher)
.filter(Matcher::find)
.map(Matcher::group)
.collect(Collectors.toSet());
if (optNameSet.isEmpty()) {
throw new RuntimeException("Sanity test failed: no match for option pattern in process output");
}
return optNameSet;
}
}