test/langtools/tools/javac/records/RecordReading.java

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2020, 2021, 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.

@@ -23,21 +23,22 @@
  
  /*
   * @test
   * @summary test the records can be read by javac properly
   * @library /tools/lib
+  * @bug 8273018
   * @modules jdk.compiler/com.sun.tools.javac.api
   *          jdk.compiler/com.sun.tools.javac.main
   * @build toolbox.ToolBox toolbox.JavacTask
   * @run main RecordReading
   */
  
- 
  import java.io.IOException;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
+ import java.util.List;
  import java.util.Objects;
  import toolbox.TestRunner;
  import toolbox.ToolBox;
  import toolbox.JavacTask;
  import toolbox.Task;

@@ -124,6 +125,69 @@
          if (!Objects.equals(expected, output)) {
              throw new AssertionError("Unexpected output: " + output);
          }
      }
  
+     @Test
+     public void testPrimitiveRecordClassFileReading(Path base) throws Exception {
+         Path src = base.resolve("src");
+ 
+         tb.writeJavaFiles(src,
+                            """
+                            public primitive record R(int i, @A long j, java.util.List<String> l) {}
+                            """,
+                            """
+                            public @interface A {}
+                            """);
+ 
+         Path out = base.resolve("out");
+         Files.createDirectories(out);
+ 
+         new JavacTask(tb)
+                 .outdir(out)
+                 .options("-XDenablePrimitiveClasses")
+                 .files(findJavaFiles(src))
+                 .run();
+ 
+         //read the class file back, to verify javac's ClassReader
+         //reads the Record attribute properly:
+         String output = new JavacTask(tb)
+                 .options("-Xprint", "-XDenablePrimitiveClasses")
+                 .classpath(out.toString())
+                 .classes("R")
+                 .run()
+                 .writeAll()
+                 .getOutput(Task.OutputKind.STDOUT)
+                 .replaceAll("\\R", "\n");
+ 
+         String expected =
+                 """
+                 \n\
+                 public primitive value record R(int i, @A long j, java.util.List<java.lang.String> l) {
+                   private final int i;
+                   @A
+                   private final long j;
+                   private final java.util.List<java.lang.String> l;
+                 \n\
+                   public final java.lang.String toString();
+                 \n\
+                   public final int hashCode();
+                 \n\
+                   public final boolean equals(java.lang.Object arg0);
+                 \n\
+                   public int i();
+                 \n\
+                   @A
+                   public long j();
+                 \n\
+                   public java.util.List<java.lang.String> l();
+                 \n\
+                   public R(int i,
+                     @A long j,
+                     java.util.List<java.lang.String> l);
+                 }
+                 """;
+         if (!Objects.equals(expected, output)) {
+             throw new AssertionError("Unexpected output: " + output);
+         }
+     }
  }