diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp index 949bfba58ad..ce0acb3b4e4 100644 --- a/src/hotspot/share/opto/type.cpp +++ b/src/hotspot/share/opto/type.cpp @@ -4844,9 +4844,13 @@ void TypeAryPtr::dump2( Dict &d, uint depth, outputStream *st ) const { else if( _offset < header_size ) st->print("+%d", _offset); else { BasicType basic_elem_type = elem()->basic_type(); - int array_base = arrayOopDesc::base_offset_in_bytes(basic_elem_type); - int elem_size = type2aelembytes(basic_elem_type); - st->print("[%d]", (_offset - array_base)/elem_size); + if (basic_elem_type == T_ILLEGAL) { + st->print("+any"); + } else { + int array_base = arrayOopDesc::base_offset_in_bytes(basic_elem_type); + int elem_size = type2aelembytes(basic_elem_type); + st->print("[%d]", (_offset - array_base)/elem_size); + } } } st->print(" *"); diff --git a/src/hotspot/share/utilities/globalDefinitions.cpp b/src/hotspot/share/utilities/globalDefinitions.cpp index 349d99f3311..39c8000df36 100644 --- a/src/hotspot/share/utilities/globalDefinitions.cpp +++ b/src/hotspot/share/utilities/globalDefinitions.cpp @@ -323,7 +323,7 @@ int _type2aelembytes[T_CONFLICT+1] = { #ifdef ASSERT int type2aelembytes(BasicType t, bool allow_address) { - assert(allow_address || t != T_ADDRESS, " "); + assert((allow_address || t != T_ADDRESS) && t <= T_CONFLICT, "unexpected basic type"); return _type2aelembytes[t]; } #endif diff --git a/test/hotspot/jtreg/compiler/debug/TestTracePhaseCCP.java b/test/hotspot/jtreg/compiler/debug/TestTracePhaseCCP.java new file mode 100644 index 00000000000..b46aac9a824 --- /dev/null +++ b/test/hotspot/jtreg/compiler/debug/TestTracePhaseCCP.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2022, 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 8277060 + * @requires vm.debug == true & vm.compiler2.enabled + * @modules java.base/jdk.internal.misc + * + * @run main/othervm -Xbatch -XX:CompileCommand=dontinline,compiler.debug.TestTracePhaseCCP::test + * -XX:CompileCommand=compileonly,compiler.debug.TestTracePhaseCCP::test -XX:+TracePhaseCCP + * compiler.debug.TestTracePhaseCCP + */ + +package compiler.debug; + +import jdk.internal.misc.Unsafe; +import java.nio.ByteOrder; + +public class TestTracePhaseCCP { + static private Unsafe UNSAFE = Unsafe.getUnsafe(); + + static final boolean IS_BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN; + + static int[] srcArr = new int[1]; + static int[] dstArr = new int[1]; + + static int test(boolean flag) { + int[] srcArrIntLocal = new int[1]; + long[] srcArrLongLocal = new long[1]; + Object srcArrLocal = (flag ? srcArrIntLocal : srcArrLongLocal); + long srcOffset = (flag ? Unsafe.ARRAY_INT_BASE_OFFSET : Unsafe.ARRAY_LONG_BASE_OFFSET); + srcOffset += (!flag && IS_BIG_ENDIAN ? 4 : 0); + UNSAFE.copyMemory(srcArrLocal, srcOffset, dstArr, Unsafe.ARRAY_INT_BASE_OFFSET, 4); + return dstArr[0]; + } + + static boolean flag = false; + + public static void main(String[] args) { + for (int i = 0; i < 20_000; i++) { + flag = (i % 2 == 0); + int r1 = test(flag); + } + } +}