Subject: Backport of JDK-8320682:[AArch64] C1 compilation fails with "Field too big for insn" --- src/hotspot/share/c1/c1_globals.hpp | 6 +- .../compiler/arguments/TestC1Globals.java | 67 +++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/arguments/TestC1Globals.java diff --git a/src/hotspot/share/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp index 1c22cf16c..3ef4bbc2d 100644 --- a/src/hotspot/share/c1/c1_globals.hpp +++ b/src/hotspot/share/c1/c1_globals.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2023, 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 @@ -275,9 +275,11 @@ develop(bool, InstallMethods, true, \ "Install methods at the end of successful compilations") \ \ + /* The compiler assumes, in many places, that methods are at most 1MB. */ \ + /* Therefore, we restrict this flag to at most 1MB. */ \ develop(intx, NMethodSizeLimit, (64*K)*wordSize, \ "Maximum size of a compiled method.") \ - range(0, max_jint) \ + range(0, 1*M) \ \ develop(bool, TraceFPUStack, false, \ "Trace emulation of the FPU stack (intel only)") \ diff --git a/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java b/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java new file mode 100644 index 000000000..fbb4951d9 --- /dev/null +++ b/test/hotspot/jtreg/compiler/arguments/TestC1Globals.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2023, 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 + * 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 8316653 + * @requires vm.debug + * @summary Test flag with max value. + * + * @run main/othervm -XX:NMethodSizeLimit=1M + * compiler.arguments.TestC1Globals + */ + +/** + * @test + * @bug 8318817 + * @requires vm.debug + * @requires os.family == "linux" + * @summary Test flag with max value combined with transparent huge pages on + * Linux. + * + * @run main/othervm -XX:NMethodSizeLimit=1M + * -XX:+UseTransparentHugePages + * compiler.arguments.TestC1Globals + */ + +/** + * @test + * @bug 8320682 + * @requires vm.debug + * @summary Test flag with max value and specific compilation. + * + * @run main/othervm -XX:NMethodSizeLimit=1M + * -XX:CompileOnly=java.util.HashMap::putMapEntries + * -Xcomp + * compiler.arguments.TestC1Globals + * + */ + + package compiler.arguments; + + public class TestC1Globals { + + public static void main(String args[]) { + System.out.println("Passed"); + } + } \ No newline at end of file -- 2.33.0