Skip to content

Commit 7973eeb

Browse files
committed
Move sharable/unshared annotations to dotty-library
Previously they were in dotty-compiler, which means that running `-Ycheck:reentrant` on a non-bootstrapped compiler would try to load symbols from the non-bootstrapped compiler itself.
1 parent c9f1754 commit 7973eeb

32 files changed

+71
-7
lines changed

compiler/src/dotty/tools/dotc/Bench.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ package dotc
44
import core.Contexts.Context
55
import reporting.Reporter
66

7+
import scala.annotation.internal.sharable
8+
79
/** A main class for running compiler benchmarks. Can instantiate a given
810
* number of compilers and run each (sequentially) a given number of times
911
* on the same sources.

compiler/src/dotty/tools/dotc/ast/Desugar.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import collection.mutable.ListBuffer
1313
import reporting.diagnostic.messages._
1414
import reporting.trace
1515

16+
import scala.annotation.internal.sharable
17+
1618
object desugar {
1719
import untpd._
1820
import DesugarEnums._

compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import collection.mutable.ListBuffer
1010
import util.Property
1111
import typer.ErrorReporting._
1212

13+
import scala.annotation.internal.sharable
14+
1315
/** Helper methods to desugar enums */
1416
object DesugarEnums {
1517
import untpd._

compiler/src/dotty/tools/dotc/ast/Trees.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import parsing.Tokens.Token
1414
import printing.Printer
1515
import util.{Stats, Attachment, Property, DotClass}
1616
import config.Config
17+
import annotation.internal.sharable
1718
import annotation.unchecked.uncheckedVariance
1819
import language.implicitConversions
1920

compiler/src/dotty/tools/dotc/ast/untpd.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import language.higherKinds
1111
import collection.mutable.ListBuffer
1212
import reflect.ClassTag
1313

14+
import scala.annotation.internal.sharable
15+
1416
object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
1517

1618
// ----- Tree cases that exist in untyped form only ------------------

compiler/src/dotty/tools/dotc/config/CommandLineParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package dotty.tools.dotc
22
package config
33

44
import scala.annotation.tailrec
5-
import dotty.tools.sharable
5+
import scala.annotation.internal.sharable
66

77
/** A simple (overly so) command line parser.
88
* !!! This needs a thorough test suite to make sure quoting is

compiler/src/dotty/tools/dotc/config/Properties.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package dotty.tools
22
package dotc
33
package config
44

5+
import scala.annotation.internal.sharable
6+
57
import java.io.{ IOException, PrintWriter }
68
import java.util.jar.Attributes.{ Name => AttributeName }
79

compiler/src/dotty/tools/dotc/config/ScalaVersion.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package dotty.tools
44
package dotc.config
55

6+
import scala.annotation.internal.sharable
67
import scala.util.{Try, Success, Failure}
78

89
/**

compiler/src/dotty/tools/dotc/core/Contexts.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ import collection.immutable.BitSet
2929
import printing._
3030
import config.{JavaPlatform, Platform, ScalaSettings, Settings}
3131

32+
import scala.annotation.internal.sharable
33+
3234
import language.implicitConversions
3335
import DenotTransformers.DenotTransformer
3436
import dotty.tools.dotc.profile.Profiler

compiler/src/dotty/tools/dotc/core/NameKinds.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import Decorators._
1111
import Contexts.Context
1212
import collection.mutable
1313

14+
import scala.annotation.internal.sharable
15+
1416
/** Defines possible kinds of NameInfo of a derived name */
1517
object NameKinds {
1618

0 commit comments

Comments
 (0)