From 46fbedb2be98a9b8aba042fa9f90c3b25c312cd6 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 2 Aug 2023 11:21:34 +0000
Subject: [PATCH] 8313402: C1: Incorrect LoadIndexed value numbering

Reviewed-by: phh, thartmann
---
 src/hotspot/share/c1/c1_Instruction.hpp       |  2 +-
 .../compiler/c1/TestLoadIndexedMismatch.java  | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/c1/TestLoadIndexedMismatch.java

diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index 6067767da4e..363f4f6e561 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -954,7 +954,7 @@ LEAF(LoadIndexed, AccessIndexed)
   ciType* declared_type() const;
 
   // generic;
-  HASHING3(LoadIndexed, true, type()->tag(), array()->subst(), index()->subst())
+  HASHING3(LoadIndexed, true, elt_type(), array()->subst(), index()->subst())
 };
 
 
diff --git a/test/hotspot/jtreg/compiler/c1/TestLoadIndexedMismatch.java b/test/hotspot/jtreg/compiler/c1/TestLoadIndexedMismatch.java
new file mode 100644
index 00000000000..d16b6b0c684
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c1/TestLoadIndexedMismatch.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright Amazon.com Inc. 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 8313402
+ * @summary C1: Incorrect LoadIndexed value numbering
+ * @requires vm.compiler1.enabled
+ * @library /compiler/patches /test/lib
+ * @build java.base/java.lang.Helper
+ * @run main/othervm -Xbatch -XX:CompileThreshold=100
+ *                   -XX:TieredStopAtLevel=1
+ *                   compiler.c1.TestLoadIndexedMismatch
+ */
+
+package compiler.c1;
+
+public class TestLoadIndexedMismatch {
+    static final byte[] ARR = {42, 42};
+    static final char EXPECTED_CHAR = (char)(42*256 + 42);
+
+    public static char work() {
+        // LoadIndexed (B)
+        byte b = ARR[0];
+        // StringUTF16.charAt intrinsic, LoadIndexed (C)
+        char c = Helper.charAt(ARR, 0);
+        return c;
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 10_000; i++) {
+            char c = work();
+            if (c != EXPECTED_CHAR) {
+                throw new IllegalStateException("Read: " + (int)c + ", expected: " + (int)EXPECTED_CHAR);
+            }
+        }
+    }
+}