Merge pull request #4010 from lrytz/t8087

SI-8087 keep annotations on mixed-in private[this] fields

1 files changed, 12 insertions, 0 deletions

diff --git a/test/files/run/t8087.scala b/test/files/run/t8087.scala
new file mode 100644
index 0000000000..6047211756
--- /dev/null
+++ b/test/files/run/t8087.scala
@@ -0,0 +1,12 @@
+trait Foo {
+  @volatile private[this] var x: String = ""
+  @volatile private var y: String = ""
+}
+
+class Bar extends Foo
+
+object Test extends App {
+  classOf[Bar].getDeclaredFields.foreach(f => {
+    assert(java.lang.reflect.Modifier.isVolatile(f.getModifiers), f.getName)
+  })
+}