From f33087405ad228a7d6351d94ef34b10473420ed4 Mon Sep 17 00:00:00 2001
From: Xin Liu <xliu@openjdk.org>
Date: Tue, 10 Dec 2019 10:34:31 +0100
Subject: [PATCH] 8235383: C1 compilation fails with
 -XX:+PrintIRDuringConstruction -XX:+Verbose

Added check for printable bci.

Reviewed-by: thartmann
---
 .../share/c1/c1_InstructionPrinter.cpp        |  4 +-
 .../c1/TestPrintIRDuringConstruction.java     | 51 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/c1/TestPrintIRDuringConstruction.java

diff --git a/src/hotspot/share/c1/c1_InstructionPrinter.cpp b/src/hotspot/share/c1/c1_InstructionPrinter.cpp
index e34f8b47f2f..745aee4a471 100644
--- a/src/hotspot/share/c1/c1_InstructionPrinter.cpp
+++ b/src/hotspot/share/c1/c1_InstructionPrinter.cpp
@@ -329,7 +329,9 @@ void InstructionPrinter::print_head() {
 void InstructionPrinter::print_line(Instruction* instr) {
   // print instruction data on one line
   if (instr->is_pinned()) output()->put('.');
-  fill_to(bci_pos  ); output()->print("%d", instr->printable_bci());
+  if (instr->has_printable_bci()) {
+    fill_to(bci_pos  ); output()->print("%d", instr->printable_bci());
+  }
   fill_to(use_pos  ); output()->print("%d", instr->use_count());
   fill_to(temp_pos ); print_temp(instr);
   fill_to(instr_pos); print_instr(instr);
diff --git a/test/hotspot/jtreg/compiler/c1/TestPrintIRDuringConstruction.java b/test/hotspot/jtreg/compiler/c1/TestPrintIRDuringConstruction.java
new file mode 100644
index 00000000000..7aea2345ff9
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c1/TestPrintIRDuringConstruction.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019, 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
+ * @summary load/store elimination will print out instructions without bcis.
+ * @bug 8235383
+ * @requires vm.debug == true
+ * @run main/othervm -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xcomp -XX:+PrintIRDuringConstruction -XX:+Verbose compiler.c1.TestPrintIRDuringConstruction
+ */
+
+package compiler.c1;
+
+public class TestPrintIRDuringConstruction {
+    static class Dummy {
+        public int value;
+    }
+
+    static int foo() {
+        Dummy obj = new Dummy();       // c1 doesn't have Escape Analysis
+
+        obj.value = 0;                 // dummy store an initial value.
+        return obj.value + obj.value;  // redundant load
+    }
+
+    public static void main(String[] args) {
+        for (int i=0; i<5_000; ++i) {
+            foo();
+        }
+    }
+ }