diff options
author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-06-19 18:04:02 +0200 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2015-07-05 17:14:02 +0200 |
commit | 8fba722d616618962455d5fe5167e0f6e34817c7 (patch) | |
tree | 75accb700c5420e1d0b841812ff27a2f1f0b8644 /src | |
parent | d3819ce631310baab00c44a0d1845b267d60bcdd (diff) | |
download | dotty-8fba722d616618962455d5fe5167e0f6e34817c7.tar.gz dotty-8fba722d616618962455d5fe5167e0f6e34817c7.tar.bz2 dotty-8fba722d616618962455d5fe5167e0f6e34817c7.zip |
Arrays.newRefArray has multiple symbols that coexist during bootstrap.
More magic is needed, as enumerating array symbols does not work in backend.
Diffstat (limited to 'src')
-rw-r--r-- | src/dotty/runtime/Arrays.scala | 2 | ||||
-rw-r--r-- | src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/dotty/runtime/Arrays.scala b/src/dotty/runtime/Arrays.scala index 1fb4fe5eb..4469dced7 100644 --- a/src/dotty/runtime/Arrays.scala +++ b/src/dotty/runtime/Arrays.scala @@ -7,6 +7,8 @@ import scala.reflect.ClassTag */ object Arrays { + // note: this class is magical. Do not touch it unless you know what you are doing.` + /** Creates an array of some element type determined by the given `ClassTag` * argument. The erased type of applications of this method is `Object`. */ diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index 855147ac4..2ee419714 100644 --- a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -157,9 +157,16 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{ }.toMap def unboxMethods: Map[Symbol, Symbol] = defn.ScalaValueClasses.map(x => (x, Erasure.Boxing.unboxMethod(x.asClass))).toMap - private val mkArrayNames: Set[String] = Set("Byte", "Float", "Char", "Double", "Boolean", "Unit", "Long", "Int", "Short", "Ref") + private val mkArrayNames: Set[Name] = Set("Byte", "Float", "Char", "Double", "Boolean", "Unit", "Long", "Int", "Short", "Ref").map{ x=> + ("new" + x + "Array").toTermName + } + + val dottyArraysModuleClass = toDenot(defn.DottyArraysModule).moduleClass.asClass - override lazy val syntheticArrayConstructors: Set[Symbol] = mkArrayNames.map(nm => ctx.requiredMethod(toDenot(defn.DottyArraysModule).moduleClass.asClass, s"new${nm}Array")) + + override def isSyntheticArrayConstructor(s: Symbol) = { + (toDenot(s).maybeOwner eq dottyArraysModuleClass) && mkArrayNames.contains(s.name) + } def isBox(sym: Symbol): Boolean = Erasure.Boxing.isBox(sym) def isUnbox(sym: Symbol): Boolean = Erasure.Boxing.isUnbox(sym) |