Merge pull request #2367 from vigdorchik/si-6387-revert

Revert "SI-6387 Clones accessor before name expansion"

5 files changed, 16 insertions, 0 deletions

diff --git a/test/files/run/t7341.check b/test/files/run/t7341.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/files/run/t7341.check
diff --git a/test/files/run/t7341.flags b/test/files/run/t7341.flags
new file mode 100755
index 0000000000..ae08446055
--- /dev/null
+++ b/test/files/run/t7341.flags
@@ -0,0 +1 @@
+-Xcheckinit
\ No newline at end of file
diff --git a/test/files/run/t7341.scala b/test/files/run/t7341.scala
new file mode 100755
index 0000000000..dc526c6c19
--- /dev/null
+++ b/test/files/run/t7341.scala
@@ -0,0 +1,15 @@
+object Obj {
+  private var cache: Any = ()
+  def returning(f: () => Unit) = ()
+  def foo {
+    returning(() => cache = ())
+  }
+ 
+  def apply(): Any = {
+    cache
+  }
+}
+
+object Test extends App {
+  Obj()
+}
diff --git a/test/files/run/t6387.check b/test/pending/run/t6387.check
index 83b33d238d..83b33d238d 100644
--- a/test/files/run/t6387.check
+++ b/test/pending/run/t6387.check
diff --git a/test/files/run/t6387.scala b/test/pending/run/t6387.scala
index bbebb5f511..bbebb5f511 100644
--- a/test/files/run/t6387.scala
+++ b/test/pending/run/t6387.scala