Skip to content

Backend backport #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 14, 2014
Merged

Backend backport #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9459028
Make mkArityArray work for classes outside "scala" package
DarkDimius Apr 10, 2014
4ca7208
Fix error in bridges.
DarkDimius Apr 11, 2014
04e32dc
Fix mkArityArray not producing last arity
DarkDimius Apr 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/dotty/tools/dotc/core/Definitions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class Definitions {
newPolyMethod(cls, name, 1, pt => MethodType(Nil, Nil, resultTypeFn(pt)), flags)

private def mkArityArray(name: String, arity: Int, countFrom: Int): Array[ClassSymbol] = {
val arr = new Array[ClassSymbol](arity)
for (i <- countFrom until arity) arr(i) = ctx.requiredClass("scala." + name + i)
val arr = new Array[ClassSymbol](arity + 1)
for (i <- countFrom to arity) arr(i) = ctx.requiredClass(name + i)
arr
}

Expand Down Expand Up @@ -339,9 +339,10 @@ class Definitions {

// ----- Symbol sets ---------------------------------------------------

lazy val FunctionClass = mkArityArray("Function", MaxFunctionArity, 0)
lazy val TupleClass = mkArityArray("Tuple", MaxTupleArity, 2)
lazy val ProductNClass = mkArityArray("Product", MaxTupleArity, 2)
lazy val AbstractFunctionClass = mkArityArray("scala.runtime.AbstractFunction", MaxFunctionArity, 0)
lazy val FunctionClass = mkArityArray("scala.Function", MaxFunctionArity, 0)
lazy val TupleClass = mkArityArray("scala.Tuple", MaxTupleArity, 2)
lazy val ProductNClass = mkArityArray("scala.Product", MaxTupleArity, 2)

lazy val FunctionClasses: Set[Symbol] = FunctionClass.toSet
lazy val TupleClasses: Set[Symbol] = TupleClass.toSet
Expand Down
2 changes: 1 addition & 1 deletion src/dotty/tools/dotc/transform/Erasure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ object Erasure {
val statsFlatten = Trees.flatten(stats)
val stats1 = super.typedStats(statsFlatten, exprOwner)

if (ctx.owner.isClass) addBridges(statsFlatten, stats1)(ctx) else stats1
if (ctx.owner.isClass) stats1:::addBridges(statsFlatten, stats1)(ctx) else stats1
}

// this implementation doesn't check for bridge clashes with value types!
Expand Down