summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-04-21 20:55:01 +0200
committerJason Zaugg <jzaugg@gmail.com>2014-04-21 20:55:01 +0200
commitd573db8006a0de06c8e1a5d960f74d8270cb1ab6 (patch)
treeecd5d63002628504fb6306fd111e3211033434b7 /test/files
parent0c2614e862b0a9eadca6f2c734cef8c876908f8d (diff)
parent540535f71e2b4141db9294b8c2b053319a216084 (diff)
downloadscala-d573db8006a0de06c8e1a5d960f74d8270cb1ab6.tar.gz
scala-d573db8006a0de06c8e1a5d960f74d8270cb1ab6.tar.bz2
scala-d573db8006a0de06c8e1a5d960f74d8270cb1ab6.zip
Merge pull request #3682 from retronym/ticket/8497
SI-8497 Fix regression in pickling of AnnotatedTypes
Diffstat (limited to 'test/files')
-rw-r--r--test/files/pos/t8497/A_1.scala13
-rw-r--r--test/files/pos/t8497/B_2.scala1
2 files changed, 14 insertions, 0 deletions
diff --git a/test/files/pos/t8497/A_1.scala b/test/files/pos/t8497/A_1.scala
new file mode 100644
index 0000000000..6a76b0ee99
--- /dev/null
+++ b/test/files/pos/t8497/A_1.scala
@@ -0,0 +1,13 @@
+package p {
+ object Crash {
+ def e(s: (String @java.lang.Deprecated)): Unit = ()
+ def f(s: (String @nonStatic)): Unit = ()
+ }
+ object Ok {
+ def g(s: (String @nonStatic @static)): Unit = ()
+ def h(s: (String @static)): Unit = ()
+ }
+}
+
+class nonStatic extends scala.annotation.Annotation
+class static extends scala.annotation.StaticAnnotation
diff --git a/test/files/pos/t8497/B_2.scala b/test/files/pos/t8497/B_2.scala
new file mode 100644
index 0000000000..efe2edf2c3
--- /dev/null
+++ b/test/files/pos/t8497/B_2.scala
@@ -0,0 +1 @@
+package p { object Test { Crash } }