stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled

Browse Source 
Disable multiversioning if range check elimination is turned off.

Reviewed-by: mcberg, kvn
This commit is contained in:
Tobias Hartmann 2016-04-25 10:51:44 +02:00
parent ecea45ddad
commit ebc384160f
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/opto/loopTransform.cpp
View File

@ -2819,7 +2819,7 @@ bool IdealLoopTree::iteration_split_impl( PhaseIdealLoop *phase, Node_List &old_
if (phase->do_range_check(this, old_new) != 0) {
cl->mark_has_range_checks();
}
} else {
} else if (PostLoopMultiversioning) {
phase->has_range_checks(this);
}

8
hotspot/src/share/vm/runtime/arguments.cpp
View File

@ -2626,6 +2626,14 @@ bool Arguments::check_vm_args_consistency() {
}
FLAG_SET_CMDLINE(bool, UseCompiler, false);
}
#ifdef COMPILER2
if (PostLoopMultiversioning && !RangeCheckElimination) {
if (!FLAG_IS_DEFAULT(PostLoopMultiversioning)) {
warning("PostLoopMultiversioning disabled because RangeCheckElimination is disabled.");
}
FLAG_SET_CMDLINE(bool, PostLoopMultiversioning, false);
}
#endif
return status;
}

37
hotspot/test/compiler/rangechecks/TestRangeCheckEliminationDisabled.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2016, 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 TestRangeCheckEliminationDisabled
* @bug 8154763
* @summary Tests PostLoopMultiversioning with RangeCheckElimination disabled.
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+PostLoopMultiversioning -XX:-RangeCheckElimination TestRangeCheckEliminationDisabled
*/
public class TestRangeCheckEliminationDisabled {
public static void main(String[] args) {
System.out.println("Passed");
}
}