summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-06-19 05:27:40 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-06-19 05:27:40 +1000
commitdf73cb9101953ec7cf7f2cde36c26540c7d71a9b (patch)
tree89264e3ec90f3a67714795b0168a877fa3763755 /test/files
parentb7038a77a1e4128446dd7f863b0698d52f3ed4b7 (diff)
parent7db3a58872593526c2cc175df633161f2ce9cccb (diff)
downloadscala-df73cb9101953ec7cf7f2cde36c26540c7d71a9b.tar.gz
scala-df73cb9101953ec7cf7f2cde36c26540c7d71a9b.tar.bz2
scala-df73cb9101953ec7cf7f2cde36c26540c7d71a9b.zip
Merge pull request #4529 from lrytz/inlineAccessibility
Fix illegal inlining of instructions accessing protected members
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/kmpSliceSearch.flags1
-rw-r--r--test/files/run/t2106.check7
-rw-r--r--test/files/run/t2106.flags2
3 files changed, 9 insertions, 1 deletions
diff --git a/test/files/run/kmpSliceSearch.flags b/test/files/run/kmpSliceSearch.flags
new file mode 100644
index 0000000000..ac96850b69
--- /dev/null
+++ b/test/files/run/kmpSliceSearch.flags
@@ -0,0 +1 @@
+-Ydelambdafy:inline \ No newline at end of file
diff --git a/test/files/run/t2106.check b/test/files/run/t2106.check
index f8f625ff46..66a0e707b3 100644
--- a/test/files/run/t2106.check
+++ b/test/files/run/t2106.check
@@ -1,3 +1,10 @@
+#partest -Ybackend:GenBCode
+t2106.scala:7: warning: A::foo()Ljava/lang/Object; is annotated @inline but could not be inlined:
+The callee A::foo()Ljava/lang/Object; contains the instruction INVOKEVIRTUAL java/lang/Object.clone ()Ljava/lang/Object;
+that would cause an IllegalAccessError when inlined into class Test$.
+ def main(args: Array[String]): Unit = x.foo
+ ^
+#partest !-Ybackend:GenBCode
t2106.scala:7: warning: Could not inline required method foo because access level required by callee not matched by caller.
def main(args: Array[String]): Unit = x.foo
^
diff --git a/test/files/run/t2106.flags b/test/files/run/t2106.flags
index 00d3643fd4..a2e413bb22 100644
--- a/test/files/run/t2106.flags
+++ b/test/files/run/t2106.flags
@@ -1 +1 @@
--optimise -Yinline-warnings
+-optimise -Yinline-warnings -Yopt:l:classpath