Merge pull request #2229 from dotty-staging/sync-classfile-parser

Port some ClassfileParser changes from scalac

3 files changed, 32 insertions, 83 deletions

diff --git a/tests/run/t5293.scala b/tests/run/t5293.scala
deleted file mode 100644
index 8a99989c5..000000000
--- a/tests/run/t5293.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-import scala.collection.JavaConverters._
-
-
-
-object Test extends dotty.runtime.LegacyApp {
-
-  def bench(label: String)(body: => Unit): Long = {
-    val start = System.nanoTime
-
-    0.until(10).foreach(_ => body)
-
-    val end = System.nanoTime
-
-    //println("%s: %s ms".format(label, (end - start) / 1000.0 / 1000.0))
-
-    end - start
-  }
-
-  def benchJava(values: java.util.Collection[Int]) = {
-    bench("Java Set") {
-      val set = new java.util.HashSet[Int]
-
-      set.addAll(values)
-    }
-  }
-
-  def benchScala(values: Iterable[Int]) = {
-    bench("Scala Set") {
-      val set = new scala.collection.mutable.HashSet[Int]
-
-      set ++= values
-    }
-  }
-
-  def benchScalaSorted(values: Iterable[Int]) = {
-    bench("Scala Set sorted") {
-      val set = new scala.collection.mutable.HashSet[Int]
-
-      set ++= values.toArray.sorted
-    }
-  }
-
-  def benchScalaPar(values: Iterable[Int]) = {
-    bench("Scala ParSet") {
-      val set = new scala.collection.parallel.mutable.ParHashSet[Int] map { x => x }
-
-      set ++= values
-    }
-  }
-
-  val values = 0 until 50000
-  val set = scala.collection.mutable.HashSet.empty[Int]
-
-  set ++= values
-
-  // warmup
-  for (x <- 0 until 5) {
-    benchJava(set.asJava)
-    benchScala(set)
-    benchScalaPar(set)
-    benchJava(set.asJava)
-    benchScala(set)
-    benchScalaPar(set)
-  }
-
-  val javaset = benchJava(set.asJava)
-  val scalaset = benchScala(set)
-  val scalaparset = benchScalaPar(set)
-
-  assert(scalaset < (javaset * 8), "scalaset: " + scalaset + " vs. javaset: " + javaset)
-  assert(scalaparset < (javaset * 8), "scalaparset: " + scalaparset + " vs. javaset: " + javaset)
-}
-
-
-
-
-
-
-
-
diff --git a/tests/run/t9915/C_1.java b/tests/run/t9915/C_1.java
new file mode 100644
index 000000000..4269cf74e
--- /dev/null
+++ b/tests/run/t9915/C_1.java
@@ -0,0 +1,20 @@
+/*
+ * javac: -encoding UTF-8
+ */
+public class C_1 {
+    public static final String NULLED = "X\000ABC";
+    public static final String SUPPED = "𐒈𐒝𐒑𐒛𐒐𐒘𐒕𐒖";
+
+    public String nulled() {
+        return C_1.NULLED;
+    }
+    public String supped() {
+        return C_1.SUPPED;
+    }
+    public int nulledSize() {
+        return C_1.NULLED.length();
+    }
+    public int suppedSize() {
+        return C_1.SUPPED.length();
+    }
+}
diff --git a/tests/run/t9915/Test_2.scala b/tests/run/t9915/Test_2.scala
new file mode 100644
index 000000000..afed667cc
--- /dev/null
+++ b/tests/run/t9915/Test_2.scala
@@ -0,0 +1,12 @@
+
+object Test extends App {
+  val c = new C_1
+  assert(c.nulled == "X\u0000ABC")    // "X\000ABC"
+  assert(c.supped == "𐒈𐒝𐒑𐒛𐒐𐒘𐒕𐒖")
+
+  assert(C_1.NULLED == "X\u0000ABC")  // "X\000ABC"
+  assert(C_1.SUPPED == "𐒈𐒝𐒑𐒛𐒐𐒘𐒕𐒖")
+
+  assert(C_1.NULLED.size == "XYABC".size)
+  assert(C_1.SUPPED.codePointCount(0, C_1.SUPPED.length) == 8)
+}