archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 08:34:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8263206: assert(*error_msg != '\0') failed: Must have error_message while parsing -XX:CompileCommand=unknown

Browse source 
Reviewed-by: neliasso
This commit is contained in:
Jie Fu 2021-03-09 23:32:18 +00:00
parent 3212f80a80
commit e5ce97b12d
2 changed files with 78 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/share/compiler/compilerOracle.cpp
View file

@ -416,7 +416,7 @@ static enum CompileCommand match_option_name(const char* line, int* bytes_read,
*bytes_read = 0;
char option_buf[256];
int matches = sscanf(line, "%255[a-zA-Z0-9]%n", option_buf, bytes_read);
if (matches > 0) {
if (matches > 0 && strcasecmp(option_buf, "unknown") != 0) {
for (uint i = 0; i < ARRAY_SIZE(option_names); i++) {
if (strcasecmp(option_buf, option_names[i]) == 0) {
return static_cast<enum CompileCommand>(i);

77
test/hotspot/jtreg/compiler/oracle/TestInvalidCompileCommand.java Normal file
View file

@ -0,0 +1,77 @@
/*
* Copyright (C) 2021 THL A29 Limited, a Tencent company. 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
* 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 TestInvalidCompileCommand
* @bug 8263206
* @summary Regression tests of -XX:CompileCommand
* @library /test/lib
* @run driver compiler.oracle.TestInvalidCompileCommand
*/
package compiler.oracle;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
public class TestInvalidCompileCommand {
private static final String[][] ARGUMENTS = {
{
"-XX:CompileCommand=unknown",
"-version"
}
};
private static final String[][] OUTPUTS = {
{
"Unrecognized option 'unknown'"
}
};
private static void verifyInvalidOption(String[] arguments, String[] expected_outputs) throws Exception {
ProcessBuilder pb;
OutputAnalyzer out;
pb = ProcessTools.createJavaProcessBuilder(arguments);
out = new OutputAnalyzer(pb.start());
for (String expected_output : expected_outputs) {
out.shouldContain(expected_output);
}
out.shouldContain("CompileCommand: An error occurred during parsing");
out.shouldHaveExitValue(0);
}
public static void main(String[] args) throws Exception {
if (ARGUMENTS.length != OUTPUTS.length) {
throw new RuntimeException("Test is set up incorrectly: length of arguments and expected outputs does not match.");
}
for (int i = 0; i < ARGUMENTS.length; i++) {
verifyInvalidOption(ARGUMENTS[i], OUTPUTS[i]);
}
}
}