Merge pull request #448 from smarter/fix/bridge-emission

DarkDimius · DarkDimius · commit 668890cb1b46 · 2015-04-01T18:02:35.000+02:00
Erasure: actually emit bridges
diff --git a/src/dotty/tools/dotc/transform/Erasure.scala b/src/dotty/tools/dotc/transform/Erasure.scala
@@ -491,12 +491,12 @@ object Erasure extends TypeTestsCasts{
                   sym => makeBridgeDef(member, sym)(ctx)
                 }
                 emittedBridges ++= bridgeImplementations
-                traverse(newTail, oldTail)
+                traverse(newTail, oldTail, emittedBridges)
               case notADefDef :: oldTail =>
-                traverse(after, oldTail)
+                traverse(after, oldTail, emittedBridges)
             }
           case notADefDef :: newTail =>
-            traverse(newTail, before)
+            traverse(newTail, before, emittedBridges)
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -491,12 +491,12 @@ object Erasure extends TypeTestsCasts{`
`491`	`491`	`sym => makeBridgeDef(member, sym)(ctx)`
`492`	`492`	`}`
`493`	`493`	`emittedBridges ++= bridgeImplementations`
`494`		`- traverse(newTail, oldTail)`
	`494`	`+ traverse(newTail, oldTail, emittedBridges)`
`495`	`495`	`case notADefDef :: oldTail =>`
`496`		`- traverse(after, oldTail)`
	`496`	`+ traverse(after, oldTail, emittedBridges)`
`497`	`497`	`}`
`498`	`498`	`case notADefDef :: newTail =>`
`499`		`- traverse(newTail, before)`
	`499`	`+ traverse(newTail, before, emittedBridges)`
`500`	`500`	`}`
`501`	`501`	`}`
`502`	`502`