Skip to content

Commit f089c08

Browse files
DarkDimiusDarkDimius
committed
Merge pull request #404 from dotty-staging/backend-merge
Fixes to erasure, backend, flatten, restorescopes,
2 parents 1a1f878 + b0022c5 commit f089c08

File tree

14 files changed

+211
-82
lines changed

14 files changed

+211
-82
lines changed

‎bin/dotc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Configuration
77
SCALA_VERSION=2.11.5
88
SCALA_BINARY_VERSION=2.11
9-
SCALA_COMPILER_VERSION=2.11.5-20141212-151631-beaa78b033
9+
SCALA_COMPILER_VERSION=2.11.5-20150216-154453-f58d45491b
1010
DOTTY_VERSION=0.1
1111
JLINE_VERSION=2.12
1212
bootcp=true

‎project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ object DottyBuild extends Build {
3131
// get reflect and xml onboard
3232
libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value,
3333
"org.scala-lang.modules" %% "scala-xml" % "1.0.1",
34-
"me.d-d" % "scala-compiler" % "2.11.5-20141212-151631-beaa78b033",
34+
"me.d-d" % "scala-compiler" % "2.11.5-20150216-154453-f58d45491b",
3535
"jline" % "jline" % "2.12"),
3636

3737
// get junit onboard

‎src/dotty/tools/backend/jvm/DottyBackendInterface.scala

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,22 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
490490
}
491491
}
492492
def parentSymbols: List[Symbol] = toDenot(sym).info.parents.map(_.typeSymbol)
493-
def superClass: Symbol = toDenot(sym).superClass
493+
def superClass: Symbol = {
494+
val t = toDenot(sym).superClass
495+
if (t.exists) t
496+
else if (sym is Flags.ModuleClass) {
497+
// workaround #371
498+
499+
println(s"Warning: mocking up superclass for $sym")
500+
ObjectClass
501+
}
502+
else t
503+
}
494504
def enclClass: Symbol = toDenot(sym).enclosingClass
495505
def linkedClassOfClass: Symbol = linkedClass
496-
def linkedClass: Symbol = toDenot(sym).linkedClass //exitingPickler(sym.linkedClassOfClass)
506+
def linkedClass: Symbol = {
507+
toDenot(sym)(ctx).linkedClass(ctx)
508+
} //exitingPickler(sym.linkedClassOfClass)
497509
def companionClass: Symbol = toDenot(sym).companionClass
498510
def companionModule: Symbol = toDenot(sym).companionModule
499511
def companionSymbol: Symbol = if (sym is Flags.Module) companionClass else companionModule
@@ -513,7 +525,9 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{
513525
if (linkedClass.isTopLevelModuleClass) /*exitingPickler*/ linkedClass.memberClasses
514526
else Nil
515527
}
516-
def fieldSymbols: List[Symbol] = toDenot(sym).info.memberClasses.map(_.symbol).toList
528+
def fieldSymbols: List[Symbol] = {
529+
toDenot(sym).info.decls.filter(p => p.isTerm && !p.is(Flags.Method)).toList
530+
}
517531
def methodSymbols: List[Symbol] =
518532
for (f <- toDenot(sym).info.decls.toList if !f.isMethod && f.isTerm && !f.isModule) yield f
519533
def serialVUID: Option[Long] = None

‎src/dotty/tools/backend/jvm/LabelDefs.scala

Lines changed: 67 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package dotty.tools.backend.jvm
22

3-
import dotty.tools.dotc.ast.tpd
3+
import dotty.tools.dotc.ast.Trees.Thicket
4+
import dotty.tools.dotc.ast.{Trees, tpd}
45
import dotty.tools.dotc.core.Contexts.Context
56
import dotty.tools.dotc.core.Types
67
import dotty.tools.dotc.transform.TreeTransforms.{TransformerInfo, TreeTransform, MiniPhase, MiniPhaseTransform}
7-
import dotty.tools.dotc.ast.tpd
88
import dotty.tools.dotc
99
import dotty.tools.dotc.backend.jvm.DottyPrimitives
1010
import dotty.tools.dotc.core.Flags.FlagSet
@@ -80,6 +80,8 @@ class LabelDefs extends MiniPhaseTransform {
8080
def phaseName: String = "labelDef"
8181

8282
val queue = new ArrayBuffer[Tree]()
83+
val beingAppended = new mutable.HashSet[Symbol]()
84+
var labelLevel = 0
8385

8486
override def transformDefDef(tree: tpd.DefDef)(implicit ctx: Context, info: TransformerInfo): tpd.Tree = {
8587
if (tree.symbol is Flags.Label) tree
@@ -89,55 +91,72 @@ class LabelDefs extends MiniPhaseTransform {
8991
val labelCalls = collectLabelDefs.labelCalls
9092
var entryPoints = collectLabelDefs.parentLabelCalls
9193
var labelDefs = collectLabelDefs.labelDefs
94+
var callCounts = collectLabelDefs.callCounts
9295

9396
// make sure that for every label there's a single location it should return and single entry point
9497
// if theres already a location that it returns to that's a failure
9598
val disallowed = new mutable.HashMap[Symbol, Tree]()
9699
queue.sizeHint(labelCalls.size + entryPoints.size)
97-
def moveLabels(entryPoint: Tree): List[Tree] = {
98-
if ((entryPoint.symbol is Flags.Label) && labelDefs.contains(entryPoint.symbol)) {
100+
101+
def putLabelDefsNearCallees = new TreeMap() {
102+
103+
override def transform(tree: tpd.Tree)(implicit ctx: Context): tpd.Tree = {
104+
tree match {
105+
case t: Apply if (entryPoints.contains(t)) =>
106+
entryPoints = entryPoints - t
107+
labelLevel = labelLevel + 1
108+
val r = Block(moveLabels(t), t)
109+
labelLevel = labelLevel - 1
110+
if(labelLevel == 0) beingAppended.clear()
111+
r
112+
case _ => if (entryPoints.nonEmpty && labelDefs.nonEmpty) super.transform(tree) else tree
113+
}
114+
115+
}
116+
}
117+
118+
def moveLabels(entryPoint: Apply): List[Tree] = {
119+
val entrySym = entryPoint.symbol
120+
if ((entrySym is Flags.Label) && labelDefs.contains(entrySym)) {
99121
val visitedNow = new mutable.HashMap[Symbol, Tree]()
100122
val treesToAppend = new ArrayBuffer[Tree]() // order matters. parents should go first
123+
treesToAppend += labelDefs(entrySym)
101124
queue.clear()
102125

103126
var visited = 0
104127
queue += entryPoint
105128
while (visited < queue.size) {
106129
val owningLabelDefSym = queue(visited).symbol
107-
val owningLabelDef = labelDefs(owningLabelDefSym)
108-
for (call <- labelCalls(owningLabelDefSym))
109-
if (disallowed.contains(call.symbol)) {
110-
val oldCall = disallowed(call.symbol)
111-
ctx.error(s"Multiple return locations for Label $oldCall and $call", call.symbol.pos)
112-
} else {
113-
if ((!visitedNow.contains(call.symbol)) && labelDefs.contains(call.symbol)) {
114-
visitedNow.put(call.symbol, labelDefs(call.symbol))
115-
queue += call
130+
for (call <- labelCalls(owningLabelDefSym)) {
131+
val callSym = call.symbol
132+
if (!beingAppended.contains(callSym)) {
133+
if (disallowed.contains(callSym)) {
134+
val oldCall = disallowed(callSym)
135+
ctx.error(s"Multiple return locations for Label $oldCall and $call", callSym.pos)
136+
} else {
137+
if ((!visitedNow.contains(callSym)) && labelDefs.contains(callSym)) {
138+
val defTree = labelDefs(callSym)
139+
visitedNow.put(callSym, defTree)
140+
val callCount = callCounts(callSym)
141+
if (callCount > 1) {
142+
if (!treesToAppend.contains(defTree)) {
143+
treesToAppend += defTree
144+
queue += call
145+
146+
}
147+
} else if (entryPoint.symbol ne callSym) entryPoints += call
148+
}
116149
}
117150
}
118-
if (!treesToAppend.contains(owningLabelDef)) {
119-
treesToAppend += owningLabelDef
120151
}
152+
121153
visited += 1
122154
}
123-
disallowed ++= visitedNow
124-
125-
treesToAppend.toList
155+
beingAppended ++= treesToAppend.map(_.symbol)
156+
treesToAppend.toList.map(putLabelDefsNearCallees.transform)
126157
} else Nil
127158
}
128159

129-
val putLabelDefsNearCallees = new TreeMap() {
130-
131-
override def transform(tree: tpd.Tree)(implicit ctx: Context): tpd.Tree = {
132-
tree match {
133-
case t: Apply if (entryPoints.contains(t)) =>
134-
entryPoints = entryPoints - t
135-
Block(moveLabels(t), t)
136-
case _ => if (entryPoints.nonEmpty && labelDefs.nonEmpty) super.transform(tree) else tree
137-
}
138-
}
139-
}
140-
141160

142161
val res = cpy.DefDef(tree)(rhs = putLabelDefsNearCallees.transform(newRhs))
143162

@@ -149,15 +168,15 @@ class LabelDefs extends MiniPhaseTransform {
149168

150169
// label calls from this DefDef
151170
var parentLabelCalls: mutable.Set[Tree] = new mutable.HashSet[Tree]()
152-
var isInsideLabel = false
153-
var isInsideBlock = false
171+
var callCounts: mutable.Map[Symbol, Int] = new mutable.HashMap[Symbol, Int]().withDefaultValue(0)
154172

155173
def shouldMoveLabel = true
156174

157175
// labelSymbol -> Defining tree
158176
val labelDefs = new mutable.HashMap[Symbol, Tree]()
159177
// owner -> all calls by this owner
160178
val labelCalls = new mutable.HashMap[Symbol, mutable.Set[Tree]]()
179+
var owner: Symbol = null
161180

162181
def clear = {
163182
parentLabelCalls.clear()
@@ -167,28 +186,34 @@ class LabelDefs extends MiniPhaseTransform {
167186

168187
override def transform(tree: tpd.Tree)(implicit ctx: Context): tpd.Tree = tree match {
169188
case t: Template => t
170-
case t: Block =>
171-
val tmp = isInsideBlock
172-
isInsideBlock = true
189+
case t: Block =>
173190
val r = super.transform(t)
174-
isInsideBlock = tmp
175-
r
191+
r match {
192+
case t: Block if t.stats.isEmpty => t.expr
193+
case _ => r
194+
}
176195
case t: DefDef =>
177196
assert(t.symbol is Flags.Label)
197+
178198
val st = parentLabelCalls
179199
parentLabelCalls = new mutable.HashSet[Tree]()
180-
val tmp = isInsideLabel
181-
isInsideLabel = true
200+
val symt = owner
201+
owner = t.symbol
202+
182203
val r = super.transform(tree)
183-
isInsideLabel = tmp
204+
205+
owner = symt
184206
labelCalls(r.symbol) = parentLabelCalls
185207
parentLabelCalls = st
208+
186209
if(shouldMoveLabel) {
187-
labelDefs(r.symbol) = r
188-
EmptyTree
210+
labelDefs(r.symbol) = r
211+
EmptyTree
189212
} else r
190213
case t: Apply if t.symbol is Flags.Label =>
214+
val sym = t.symbol
191215
parentLabelCalls = parentLabelCalls + t
216+
if(owner != sym) callCounts(sym) = callCounts(sym) + 1
192217
super.transform(tree)
193218
case _ =>
194219
super.transform(tree)

‎src/dotty/tools/dotc/Compiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Compiler {
6767
List(new LambdaLift,
6868
new Flatten,
6969
new RestoreScopes),
70-
List(/*new PrivateToStatic,*/ new CollectEntryPoints, new LabelDefs),
70+
List(/*new PrivateToStatic,*/ new CollectEntryPoints, new LabelDefs, new ElimWildcardIdents),
7171
List(new GenBCode)
7272
)
7373

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@ object Trees {
11171117
case tree @ ValDef(name, tpt, rhs) =>
11181118
val tpt1 = transform(tpt)
11191119
val rhs1 = transform(rhs)
1120-
cpy.ValDef(tree)(name, transform(tpt1), transform(rhs1))
1120+
cpy.ValDef(tree)(name, tpt1, rhs1)
11211121
case tree @ DefDef(name, tparams, vparamss, tpt, rhs) =>
11221122
cpy.DefDef(tree)(name, transformSub(tparams), vparamss mapConserve (transformSub(_)), transform(tpt), transform(rhs))
11231123
case tree @ TypeDef(name, rhs) =>

‎src/dotty/tools/dotc/ast/tpd.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,10 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
261261
true
262262
case pre: ThisType =>
263263
pre.cls.isStaticOwner ||
264-
tp.symbol.is(ParamOrAccessor) && ctx.owner.enclosingClass.derivesFrom(pre.cls)
264+
tp.symbol.is(ParamOrAccessor) && ctx.owner.enclosingClass == pre.cls
265+
// was ctx.owner.enclosingClass.derivesFrom(pre.cls) which was not tight enough
266+
// and was spuriously triggered in case inner class would inherit from outer one
267+
// eg anonymous TypeMap inside TypeMap.andThen
265268
case pre: TermRef =>
266269
pre.symbol.is(Module) && pre.symbol.isStatic
267270
case _ =>

‎src/dotty/tools/dotc/core/SymDenotations.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,9 @@ object SymDenotations {
433433
final def isCoDefinedWith(that: Symbol)(implicit ctx: Context) =
434434
(this.effectiveOwner == that.effectiveOwner) &&
435435
( !(this.effectiveOwner is PackageClass)
436-
|| { val thisFile = this.symbol.associatedFile
436+
|| this.isAbsent || that.isAbsent
437+
|| { // check if they are defined in the same file(or a jar)
438+
val thisFile = this.symbol.associatedFile
437439
val thatFile = that.symbol.associatedFile
438440
( thisFile == null
439441
|| thatFile == null

‎src/dotty/tools/dotc/core/pickling/ClassfileParser.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ClassfileParser(
5050
case e: RuntimeException =>
5151
if (ctx.debug) e.printStackTrace()
5252
throw new IOException(
53-
sm"""class file $classfile is broken, reading aborted with $e.getClass
53+
sm"""class file $classfile is broken, reading aborted with ${e.getClass}
5454
|${Option(e.getMessage).getOrElse("")}""")
5555
}
5656

@@ -774,7 +774,7 @@ class ClassfileParser(
774774
|externalName = $externalName,
775775
|outerName = $outerName,
776776
|innerName = $innerName
777-
|owner.fullName = owner.showFullName
777+
|owner.fullName = ${owner.showFullName}
778778
|while parsing ${classfile}""")
779779
result
780780

‎src/dotty/tools/dotc/transform/ElimWildcardIdents.scala

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package dotty.tools.dotc.transform
2+
3+
import dotty.tools.dotc.transform.TreeTransforms.{TransformerInfo, TreeTransform, TreeTransformer, MiniPhaseTransform}
4+
import dotty.tools.dotc.ast.{untpd, tpd}
5+
import dotty.tools.dotc.core.Contexts.Context
6+
import scala.collection.mutable.ListBuffer
7+
import dotty.tools.dotc.core.{Scopes, Flags}
8+
import dotty.tools.dotc.core.Symbols.NoSymbol
9+
import scala.annotation.tailrec
10+
import dotty.tools.dotc.core._
11+
import Symbols._
12+
import scala.Some
13+
import dotty.tools.dotc.transform.TreeTransforms.{NXTransformations, TransformerInfo, TreeTransform, TreeTransformer}
14+
import dotty.tools.dotc.core.Contexts.Context
15+
import scala.collection.mutable
16+
import dotty.tools.dotc.core.Names.Name
17+
import NameOps._
18+
import Types._
19+
import scala.collection.SortedSet
20+
import Decorators._
21+
import StdNames._
22+
import dotty.tools.dotc.util.Positions.Position
23+
import dotty.tools.dotc.config.JavaPlatform
24+
25+
/**
26+
* Replace Ident("_") in tree with default values of corresponding type:
27+
* numerics: `0`
28+
* booleans: `false`
29+
* classes: `null`
30+
*/
31+
class ElimWildcardIdents extends MiniPhaseTransform {
32+
import tpd._
33+
def phaseName: String = "elimWildcardIdents"
34+
35+
36+
override def transformDefDef(tree: tpd.DefDef)(implicit ctx: Context, info: TransformerInfo): tpd.Tree = {
37+
def stripBlocks(arg: Tree): Tree = arg match {
38+
case b: Block if b.stats.isEmpty => stripBlocks(b.expr)
39+
case _ => arg
40+
}
41+
val b = stripBlocks(tree.rhs)
42+
b match {
43+
case x: Ident if (x.name == nme.WILDCARD && x.symbol.isClass) =>
44+
tpd.DefDef(tree.symbol.asTerm, tpd.initValue(x.tpe))
45+
case _ => tree
46+
}
47+
}
48+
49+
}

‎src/dotty/tools/dotc/transform/RestoreScopes.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ class RestoreScopes extends MiniPhaseTransform with IdentityDenotTransformer { t
2525
for (stat <- constr :: body)
2626
if (stat.isInstanceOf[MemberDef] && stat.symbol.exists)
2727
restoredDecls.enter(stat.symbol)
28-
val cinfo = tree.symbol.asClass.classInfo
28+
val cls = tree.symbol.asClass
29+
cls.owner.asClass.enter(cls)
30+
// Enter class in enclosing package scope, in case it was an inner class before flatten.
31+
// For top-level classes this does nothing.
32+
val cinfo = cls.classInfo
2933
tree.symbol.copySymDenotation(
3034
info = cinfo.derivedClassInfo( // Dotty deviation: Cannot expand cinfo inline without a type error
3135
decls = restoredDecls: Scope)).installAfter(thisTransform)

‎src/dotty/tools/dotc/typer/Typer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
347347
val clsDef = TypeDef(x, templ).withFlags(Final)
348348
typed(cpy.Block(tree)(clsDef :: Nil, New(Ident(x), Nil)), pt)
349349
case _ =>
350-
val tpt1 = typedType(tree.tpt)
351-
checkClassTypeWithStablePrefix(tpt1.tpe, tpt1.pos, traitReq = false)
350+
val tpt1 = typedType(tree.tpt)
351+
checkClassTypeWithStablePrefix(tpt1.tpe, tpt1.pos, traitReq = false)
352352
assignType(cpy.New(tree)(tpt1), tpt1)
353353
// todo in a later phase: checkInstantiatable(cls, tpt1.pos)
354354
}

0 commit comments

Comments
 (0)