summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-09-14 13:08:05 -0700
committerPaul Phillips <paulp@improving.org>2012-09-14 13:08:05 -0700
commit493d16306cf0e836da9c77a4768dd42620dd1a72 (patch)
treefee4965ed7d69ca25a888875839b2f54445e7338 /test/files/pos
parent261b1c785668ae42a29d9217cc4a8f305a724e2f (diff)
parente498fac7fdbda3187a2a4fffcdf7fa4f9ddb7ac8 (diff)
downloadscala-493d16306cf0e836da9c77a4768dd42620dd1a72.tar.gz
scala-493d16306cf0e836da9c77a4768dd42620dd1a72.tar.bz2
scala-493d16306cf0e836da9c77a4768dd42620dd1a72.zip
Merge pull request #1299 from namin/si-6245
Fix for SI-6245 with workaround for SI-2296.
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/t6245/Base.java5
-rw-r--r--test/files/pos/t6245/Foo.scala9
-rw-r--r--test/files/pos/t6245/Vis.java3
3 files changed, 17 insertions, 0 deletions
diff --git a/test/files/pos/t6245/Base.java b/test/files/pos/t6245/Base.java
new file mode 100644
index 0000000000..651ea08bf2
--- /dev/null
+++ b/test/files/pos/t6245/Base.java
@@ -0,0 +1,5 @@
+package t1;
+
+public class Base {
+ protected Vis inner;
+}
diff --git a/test/files/pos/t6245/Foo.scala b/test/files/pos/t6245/Foo.scala
new file mode 100644
index 0000000000..f5f997fbff
--- /dev/null
+++ b/test/files/pos/t6245/Foo.scala
@@ -0,0 +1,9 @@
+import t1.Vis
+
+abstract class Foo extends t1.Base {
+ trait Nested {
+ def crash() {
+ inner
+ }
+ }
+}
diff --git a/test/files/pos/t6245/Vis.java b/test/files/pos/t6245/Vis.java
new file mode 100644
index 0000000000..4267f4e40b
--- /dev/null
+++ b/test/files/pos/t6245/Vis.java
@@ -0,0 +1,3 @@
+package t1;
+
+public class Vis { }