Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javap/ConstantWriter.java	Thu Feb 20 15:42:59 2014 +0400
     1.2 +++ b/src/share/classes/com/sun/tools/javap/ConstantWriter.java	Thu Feb 20 18:28:46 2014 +0400
     1.3 @@ -64,7 +64,7 @@
     1.4              public Integer visitClass(CONSTANT_Class_info info, Void p) {
     1.5                  print("#" + info.name_index);
     1.6                  tab();
     1.7 -                println("//  " + stringValue(info));
     1.8 +                println("// " + stringValue(info));
     1.9                  return 1;
    1.10              }
    1.11  
    1.12 @@ -76,7 +76,7 @@
    1.13              public Integer visitFieldref(CONSTANT_Fieldref_info info, Void p) {
    1.14                  print("#" + info.class_index + ".#" + info.name_and_type_index);
    1.15                  tab();
    1.16 -                println("//  " + stringValue(info));
    1.17 +                println("// " + stringValue(info));
    1.18                  return 1;
    1.19              }
    1.20  
    1.21 @@ -93,14 +93,14 @@
    1.22              public Integer visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) {
    1.23                  print("#" + info.class_index + ".#" + info.name_and_type_index);
    1.24                  tab();
    1.25 -                println("//  " + stringValue(info));
    1.26 +                println("// " + stringValue(info));
    1.27                  return 1;
    1.28              }
    1.29  
    1.30              public Integer visitInvokeDynamic(CONSTANT_InvokeDynamic_info info, Void p) {
    1.31                  print("#" + info.bootstrap_method_attr_index + ":#" + info.name_and_type_index);
    1.32                  tab();
    1.33 -                println("//  " + stringValue(info));
    1.34 +                println("// " + stringValue(info));
    1.35                  return 1;
    1.36              }
    1.37  
    1.38 @@ -112,21 +112,21 @@
    1.39              public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
    1.40                  print("#" + info.name_index + ":#" + info.type_index);
    1.41                  tab();
    1.42 -                println("//  " + stringValue(info));
    1.43 +                println("// " + stringValue(info));
    1.44                  return 1;
    1.45              }
    1.46  
    1.47              public Integer visitMethodref(CONSTANT_Methodref_info info, Void p) {
    1.48                  print("#" + info.class_index + ".#" + info.name_and_type_index);
    1.49                  tab();
    1.50 -                println("//  " + stringValue(info));
    1.51 +                println("// " + stringValue(info));
    1.52                  return 1;
    1.53              }
    1.54  
    1.55              public Integer visitMethodHandle(CONSTANT_MethodHandle_info info, Void p) {
    1.56                  print("#" + info.reference_kind.tag + ":#" + info.reference_index);
    1.57                  tab();
    1.58 -                println("//  " + stringValue(info));
    1.59 +                println("// " + stringValue(info));
    1.60                  return 1;
    1.61              }
    1.62  
    1.63 @@ -140,7 +140,7 @@
    1.64              public Integer visitString(CONSTANT_String_info info, Void p) {
    1.65                  print("#" + info.string_index);
    1.66                  tab();
    1.67 -                println("//  " + stringValue(info));
    1.68 +                println("// " + stringValue(info));
    1.69                  return 1;
    1.70              }
    1.71  

     2.1 --- a/test/tools/javap/T6868539.java	Thu Feb 20 15:42:59 2014 +0400
     2.2 +++ b/test/tools/javap/T6868539.java	Thu Feb 20 18:28:46 2014 +0400
     2.3 @@ -23,7 +23,7 @@
     2.4  
     2.5  /*
     2.6   * @test
     2.7 - * @bug 6868539 6868548
     2.8 + * @bug 6868539 6868548 8035364
     2.9   * @summary javap should use current names for constant pool entries,
    2.10   *              remove spurious ';' from constant pool entries
    2.11   */
    2.12 @@ -41,17 +41,17 @@
    2.13      void run() {
    2.14          String output = javap("T6868539");
    2.15          verify(output, "Utf8 +java/lang/String");                                   // 1: Utf8
    2.16 -                                                                                        // 2: currently unused
    2.17 +                                                                                    // 2: currently unused
    2.18          verify(output, "Integer +123456");                                          // 3: Integer
    2.19          verify(output, "Float +123456.0f");                                         // 4: Float
    2.20          verify(output, "Long +123456l");                                            // 5: Long
    2.21          verify(output, "Double +123456.0d");                                        // 6: Double
    2.22 -        verify(output, "Class +#[0-9]+ +// + T6868539");                            // 7: Class
    2.23 -        verify(output, "String +#[0-9]+ +// + not found");                          // 8: String
    2.24 +        verify(output, "Class +#[0-9]+ +// +T6868539");                             // 7: Class
    2.25 +        verify(output, "String +#[0-9]+ +// +not found");                           // 8: String
    2.26          verify(output, "Fieldref +#[0-9]+\\.#[0-9]+ +// +T6868539.errors:I");       // 9: Fieldref
    2.27          verify(output, "Methodref +#[0-9]+\\.#[0-9]+ +// +T6868539.run:\\(\\)V");   // 10: Methodref
    2.28          verify(output, "InterfaceMethodref +#[0-9]+\\.#[0-9]+ +// +java/lang/Runnable\\.run:\\(\\)V");
    2.29 -                                                                                        // 11: InterfaceMethodref
    2.30 +                                                                                    // 11: InterfaceMethodref
    2.31          verify(output, "NameAndType +#[0-9]+:#[0-9]+ +// +run:\\(\\)V");            // 12: NameAndType
    2.32          if (errors > 0)
    2.33              throw new Error(errors + " found.");