Tue, 20 Aug 2019 07:47:13 +0200
8228888: C2 compilation fails with assert "m has strange control"
Summary: Weakened too strong assert.
Reviewed-by: kvn, roland
1.1 --- a/src/share/vm/opto/loopopts.cpp Fri Aug 30 09:24:54 2019 +0200 1.2 +++ b/src/share/vm/opto/loopopts.cpp Tue Aug 20 07:47:13 2019 +0200 1.3 @@ -309,7 +309,7 @@ 1.4 } 1.5 return NULL; 1.6 } 1.7 - assert(m->is_Phi() || is_dominator(get_ctrl(m), n_ctrl), "m has strange control"); 1.8 + assert(n->is_Phi() || m->is_Phi() || is_dominator(get_ctrl(m), n_ctrl), "m has strange control"); 1.9 } 1.10 1.11 return n_ctrl;
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/compiler/loopopts/StrangeControl.jasm Tue Aug 20 07:47:13 2019 +0200 2.3 @@ -0,0 +1,48 @@ 2.4 +/* 2.5 + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. 2.11 + * 2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 + * version 2 for more details (a copy is included in the LICENSE file that 2.16 + * accompanied this code). 2.17 + * 2.18 + * You should have received a copy of the GNU General Public License version 2.19 + * 2 along with this work; if not, write to the Free Software Foundation, 2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 + * 2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 + * or visit www.oracle.com if you need additional information or have any 2.24 + * questions. 2.25 + * 2.26 + */ 2.27 + 2.28 +super public class compiler/loopopts/StrangeControl 2.29 + version 51:0 2.30 +{ 2.31 + 2.32 +static Field field:"I"; 2.33 + 2.34 +public static Method test:"(I)V" 2.35 + stack 2 locals 2 2.36 +{ 2.37 + iconst_0; 2.38 + istore 1; 2.39 + L1: stack_frame_type append; 2.40 + locals_map int; 2.41 + iinc 1, 1; 2.42 + iload 1; 2.43 + iconst_2; 2.44 + if_icmple L1; 2.45 + L2: stack_frame_type same; 2.46 + iload_0; 2.47 + putstatic Field field:"I"; 2.48 + goto L1; 2.49 +} 2.50 + 2.51 +} // end Class StrangeControl
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/test/compiler/loopopts/TestStrangeControl.java Tue Aug 20 07:47:13 2019 +0200 3.3 @@ -0,0 +1,49 @@ 3.4 +/* 3.5 + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. 3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.7 + * 3.8 + * This code is free software; you can redistribute it and/or modify it 3.9 + * under the terms of the GNU General Public License version 2 only, as 3.10 + * published by the Free Software Foundation. 3.11 + * 3.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 3.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.15 + * version 2 for more details (a copy is included in the LICENSE file that 3.16 + * accompanied this code). 3.17 + * 3.18 + * You should have received a copy of the GNU General Public License version 3.19 + * 2 along with this work; if not, write to the Free Software Foundation, 3.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.21 + * 3.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.23 + * or visit www.oracle.com if you need additional information or have any 3.24 + * questions. 3.25 + * 3.26 + */ 3.27 + 3.28 +/* 3.29 + * @test 3.30 + * @bug 8228888 3.31 + * @summary Test PhaseIdealLoop::has_local_phi_input() with phi input with non-dominating control. 3.32 + * @compile StrangeControl.jasm 3.33 + * @run main/othervm -Xbatch -XX:CompileCommand=inline,compiler.loopopts.StrangeControl::test 3.34 + * compiler.loopopts.TestStrangeControl 3.35 + */ 3.36 + 3.37 +package compiler.loopopts; 3.38 + 3.39 +public class TestStrangeControl { 3.40 + 3.41 + public static void main(String[] args) throws Exception { 3.42 + Thread thread = new Thread() { 3.43 + public void run() { 3.44 + // Run this in an own thread because it's basically an endless loop 3.45 + StrangeControl.test(42); 3.46 + } 3.47 + }; 3.48 + thread.start(); 3.49 + // Give thread executing strange control loop enough time to trigger OSR compilation 3.50 + Thread.sleep(4000); 3.51 + } 3.52 +}