7004698: javap does not output CharacterRangeTable attributes correctly

Reviewed-by: mcimadamore

langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java

@@ -158,17 +158,15 @@ public class AttributeWriter extends BasicWriter
         indent(+1);
         for (int i = 0; i < attr.character_range_table.length; i++) {
             CharacterRangeTable_attribute.Entry e = attr.character_range_table[i];
-            print("    " + e.start_pc + ", " +
+            print(String.format("    %2d, %2d, %6x, %6x, %4x",
-                    e.end_pc + ", " +
+                    e.start_pc, e.end_pc,
-                    Integer.toHexString(e.character_range_start) + ", " +
+                    e.character_range_start, e.character_range_end,
-                    Integer.toHexString(e.character_range_end) + ", " +
+                    e.flags));
-                    Integer.toHexString(e.flags));
             tab();
-            print("// ");
+            print(String.format("// %2d, %2d, %4d:%02d, %4d:%02d",
-            print(e.start_pc + ", " +
+                    e.start_pc, e.end_pc,
-                    e.end_pc + ", " +
+                    (e.character_range_start >> 10), (e.character_range_start & 0x3ff),
-                    (e.character_range_start >> 10) + ":" + (e.character_range_start & 0x3ff) + ", " +
+                    (e.character_range_end >> 10), (e.character_range_end & 0x3ff)));
-                    (e.character_range_end >> 10) + ":" + (e.character_range_end & 0x3ff));
             if ((e.flags & CharacterRangeTable_attribute.CRT_STATEMENT) != 0)
                 print(", statement");
             if ((e.flags & CharacterRangeTable_attribute.CRT_BLOCK) != 0)
@@ -187,6 +185,7 @@ public class AttributeWriter extends BasicWriter
                 print(", branch-true");
             if ((e.flags & CharacterRangeTable_attribute.CRT_BRANCH_FALSE) != 0)
                 print(", branch-false");
+            println();
         }
         indent(-1);
         return null;

langtools/test/tools/javap/T7004698.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2010, 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 7004698
+ * @summary javap does not output CharacterRangeTable attributes correctly
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+public class T7004698 {
+    public static void main(String... args) throws Exception {
+        new T7004698().run();
+    }
+
+    void run() throws Exception {
+        File srcDir = new File(System.getProperty("test.src"));
+        File srcFile = new File(srcDir, T7004698.class.getSimpleName() + ".java");
+        File classesDir = new File(".");
+        compile("-Xjcov", "-d", classesDir.getPath(), srcFile.getPath());
+
+        File classFile = new File(classesDir, T7004698.class.getSimpleName() + ".class");
+        String out = javap("-v", classFile.getPath());
+
+        Pattern attrBody = Pattern.compile("[0-9a-f, ]+//[-0-9a-z:, ]+");
+        Pattern endOfAttr = Pattern.compile("(^$|[A-Z][A-Za-z0-9_]+:.*|})");
+        boolean inAttr = false;
+        int count = 0;
+        int errors = 0;
+        for (String line: out.split(System.getProperty("line.separator"))) {
+            line = line.trim();
+            if (line.equals("CharacterRangeTable:")) {
+                inAttr = true;
+                count++;
+            } else if (inAttr) {
+                if (endOfAttr.matcher(line).matches()) {
+                    inAttr = false;
+                } else if (!attrBody.matcher(line).matches()) {
+                    System.err.println("unexpected line found: " + line);
+                    errors++;
+                }
+            }
+        }
+        if (count == 0)
+            throw new Exception("no attribute instances found");
+
+        if (errors > 0)
+            throw new Exception(errors + " errors found");
+    }
+
+    void compile(String... args) throws Exception {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        int rc = com.sun.tools.javac.Main.compile(args, pw);
+        pw.close();
+        String out = sw.toString();
+        if (!out.isEmpty())
+            System.err.println(out);
+        if (rc != 0)
+            throw new Exception("javac failed unexpectedly; rc=" + rc);
+    }
+
+    String javap(String... args) throws Exception {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        int rc = com.sun.tools.javap.Main.run(args, pw);
+        pw.close();
+        String out = sw.toString();
+        if (!out.isEmpty())
+            System.err.println(out);
+        if (rc != 0)
+            throw new Exception("javap failed unexpectedly; rc=" + rc);
+        return out;
+    }
+}