Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes SI-6758: force LazyAnnnotationInfo for DefDef and TypeDef
Looks like the change in 25ecde0 no longer forced lazy annotations for some of the cases. Also removed forcing for PackageDef annotations as we currently don't support them.
- Loading branch information
Showing
7 changed files
with
93 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,7 +1,13 @@ | |||
t3222.scala:4: error: not found: type D | |||
def foo(@throws(classOf[D]) x: Int) {} | |||
^ | |||
t3222.scala:1: error: not found: type B | t3222.scala:1: error: not found: type B | ||
@throws(classOf[B]) | @throws(classOf[B]) | ||
^ | ^ | ||
two errors found | t3222.scala:4: error: not found: type D | ||
def foo(@throws(classOf[D]) x: Int) {} | |||
^ | |||
t3222.scala:3: error: not found: type C | |||
@throws(classOf[C]) | |||
^ | |||
t3222.scala:6: error: not found: type E | |||
@throws(classOf[E]) | |||
^ | |||
four errors found |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,10 +1,10 @@ | |||
t6558.scala:19: error: not found: type classs | t6558.scala:4: error: not found: type classs | ||
@classs | @classs | ||
^ | ^ | ||
t6558.scala:22: error: not found: type typeparam | t6558.scala:7: error: not found: type typeparam | ||
class D[@typeparam T] | class D[@typeparam T] | ||
^ | ^ | ||
t6558.scala:25: error: not found: type valueparam | t6558.scala:10: error: not found: type valueparam | ||
@valueparam x: Any | @valueparam x: Any | ||
^ | ^ | ||
three errors found | three errors found |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,28 @@ | |||
t6758.scala:5: error: not found: type inargument | |||
@inargument | |||
^ | |||
t6758.scala:11: error: not found: type infunction | |||
@infunction | |||
^ | |||
t6758.scala:18: error: not found: type nested | |||
@nested | |||
^ | |||
t6758.scala:25: error: not found: type param | |||
def func(@param x: Int): Int = 0 | |||
^ | |||
t6758.scala:28: error: not found: type typealias | |||
@typealias | |||
^ | |||
t6758.scala:32: error: not found: type classs | |||
@classs | |||
^ | |||
t6758.scala:35: error: not found: type module | |||
@module | |||
^ | |||
t6758.scala:38: error: not found: type typeparam | |||
class D[@typeparam T] | |||
^ | |||
t6758.scala:41: error: not found: type valueparam | |||
@valueparam x: Any | |||
^ | |||
9 errors found |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,43 @@ | |||
class AnnotNotFound { | |||
def foo(a: Any) = () | |||
|
|||
foo { | |||
@inargument | |||
def foo = 0 | |||
foo | |||
} | |||
|
|||
() => { | |||
@infunction | |||
def foo = 0 | |||
() | |||
} | |||
|
|||
() => { | |||
val bar: Int = { | |||
@nested | |||
val bar2: Int = 2 | |||
2 | |||
} | |||
() | |||
} | |||
|
|||
def func(@param x: Int): Int = 0 | |||
|
|||
abstract class A { | |||
@typealias | |||
type B = Int | |||
} | |||
|
|||
@classs | |||
class C | |||
|
|||
@module | |||
object D | |||
|
|||
class D[@typeparam T] | |||
|
|||
class E( | |||
@valueparam x: Any | |||
) | |||
} |