Skip to content

Commit e5ce97b

Browse files
committedMar 9, 2021
8263206: assert(*error_msg != '\0') failed: Must have error_message while parsing -XX:CompileCommand=unknown
Reviewed-by: neliasso
1 parent 3212f80 commit e5ce97b

File tree

2 files changed

+78
-1
lines changed

2 files changed

+78
-1
lines changed
 

‎src/hotspot/share/compiler/compilerOracle.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ static enum CompileCommand match_option_name(const char* line, int* bytes_read,
416416
*bytes_read = 0;
417417
char option_buf[256];
418418
int matches = sscanf(line, "%255[a-zA-Z0-9]%n", option_buf, bytes_read);
419-
if (matches > 0) {
419+
if (matches > 0 && strcasecmp(option_buf, "unknown") != 0) {
420420
for (uint i = 0; i < ARRAY_SIZE(option_names); i++) {
421421
if (strcasecmp(option_buf, option_names[i]) == 0) {
422422
return static_cast<enum CompileCommand>(i);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/*
2+
* Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/*
25+
* @test TestInvalidCompileCommand
26+
* @bug 8263206
27+
* @summary Regression tests of -XX:CompileCommand
28+
* @library /test/lib
29+
* @run driver compiler.oracle.TestInvalidCompileCommand
30+
*/
31+
32+
package compiler.oracle;
33+
34+
import jdk.test.lib.process.OutputAnalyzer;
35+
import jdk.test.lib.process.ProcessTools;
36+
37+
public class TestInvalidCompileCommand {
38+
39+
private static final String[][] ARGUMENTS = {
40+
{
41+
"-XX:CompileCommand=unknown",
42+
"-version"
43+
}
44+
};
45+
46+
private static final String[][] OUTPUTS = {
47+
{
48+
"Unrecognized option 'unknown'"
49+
}
50+
};
51+
52+
private static void verifyInvalidOption(String[] arguments, String[] expected_outputs) throws Exception {
53+
ProcessBuilder pb;
54+
OutputAnalyzer out;
55+
56+
pb = ProcessTools.createJavaProcessBuilder(arguments);
57+
out = new OutputAnalyzer(pb.start());
58+
59+
for (String expected_output : expected_outputs) {
60+
out.shouldContain(expected_output);
61+
}
62+
63+
out.shouldContain("CompileCommand: An error occurred during parsing");
64+
out.shouldHaveExitValue(0);
65+
}
66+
67+
public static void main(String[] args) throws Exception {
68+
69+
if (ARGUMENTS.length != OUTPUTS.length) {
70+
throw new RuntimeException("Test is set up incorrectly: length of arguments and expected outputs does not match.");
71+
}
72+
73+
for (int i = 0; i < ARGUMENTS.length; i++) {
74+
verifyInvalidOption(ARGUMENTS[i], OUTPUTS[i]);
75+
}
76+
}
77+
}

0 commit comments

Comments
 (0)