Merge pull request #574 from dotty-staging/fix/#568

DarkDimius · DarkDimius · commit 0edb02b43fec · 2015-05-15T20:21:20.000+02:00
Make Child annotation lazy
diff --git a/src/dotty/tools/dotc/core/Annotations.scala b/src/dotty/tools/dotc/core/Annotations.scala
@@ -90,7 +90,8 @@ object Annotations {
         ref(TermRef.withSigAndDenot(sym.owner.thisType, sym.name, sym.signature, sym))))
 
     def makeChild(sym: Symbol)(implicit ctx: Context) =
-      apply(defn.ChildAnnot.typeRef.appliedTo(sym.owner.thisType.select(sym.name, sym)), Nil)
+      deferred(defn.ChildAnnot,
+        implicit ctx => New(defn.ChildAnnot.typeRef.appliedTo(sym.owner.thisType.select(sym.name, sym)), Nil))
   }
 
   def ThrowsAnnotation(cls: ClassSymbol)(implicit ctx: Context) = {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ object Annotations {`
`90`	`90`	`ref(TermRef.withSigAndDenot(sym.owner.thisType, sym.name, sym.signature, sym))))`
`91`	`91`
`92`	`92`	`def makeChild(sym: Symbol)(implicit ctx: Context) =`
`93`		`- apply(defn.ChildAnnot.typeRef.appliedTo(sym.owner.thisType.select(sym.name, sym)), Nil)`
	`93`	`+ deferred(defn.ChildAnnot,`
	`94`	`+ implicit ctx => New(defn.ChildAnnot.typeRef.appliedTo(sym.owner.thisType.select(sym.name, sym)), Nil))`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`def ThrowsAnnotation(cls: ClassSymbol)(implicit ctx: Context) = {`