Merge pull request #9433 from dotty-staging/fix-stdlib-bench

Fix #9525: compilation of stdlib
scala · Aug 13, 2020 · a5ae258 · a5ae258
2 parents d420515 + 71fb460
commit a5ae258
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala
@@ -367,10 +367,10 @@ object JavaParsers {
       // assumed true unless we see public/private/protected
       var isPackageAccess = true
       var annots = new ListBuffer[Tree]
-      def addAnnot(sym: ClassSymbol) =
+      def addAnnot(tpt: Tree) =
         annots += atSpan(in.offset) {
           in.nextToken()
-          New(TypeTree(sym.typeRef))
+          New(tpt)
         }
 
       while (true)
@@ -404,11 +404,11 @@ object JavaParsers {
             flags |= Flags.DefaultMethod
             in.nextToken()
           case NATIVE =>
-            addAnnot(NativeAnnot)
+            addAnnot(scalaDot(jtpnme.NATIVEkw))
           case TRANSIENT =>
-            addAnnot(TransientAnnot)
+            addAnnot(scalaDot(jtpnme.TRANSIENTkw))
           case VOLATILE =>
-            addAnnot(VolatileAnnot)
+            addAnnot(scalaDot(jtpnme.VOLATILEkw))
           case SYNCHRONIZED | STRICTFP =>
             in.nextToken()
           case _ =>

diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 source $(dirname $0)/cmdTestsCommon.inc.sh
 
 # check that benchmarks can run

diff --git a/tests/pos/i9525/VolatileByteRef.java b/tests/pos/i9525/VolatileByteRef.java
@@ -0,0 +1,3 @@
+public final class VolatileByteRef implements java.io.Serializable {
+    volatile public byte elem;
+}
diff --git a/tests/pos/i9525/volatile.scala b/tests/pos/i9525/volatile.scala
@@ -0,0 +1,3 @@
+package scala
+
+final class volatile extends scala.annotation.StaticAnnotation
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package scala

		final class volatile extends scala.annotation.StaticAnnotation