summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-06-07 07:37:21 +0200
committerJason Zaugg <jzaugg@gmail.com>2015-06-07 07:37:21 +0200
commit6d0a498bab3aaff4747434fbfb5e17c8b26d676d (patch)
tree4aec601c60ea9b12156b73cc1372a44c085e91a3 /test/files
parent0bc7fa67d130f75079df79814b33ef073254e27a (diff)
parentb2a78b3ab536658f79e4396201c730a8408d3dd2 (diff)
downloadscala-6d0a498bab3aaff4747434fbfb5e17c8b26d676d.tar.gz
scala-6d0a498bab3aaff4747434fbfb5e17c8b26d676d.tar.bz2
scala-6d0a498bab3aaff4747434fbfb5e17c8b26d676d.zip
Merge pull request #4519 from lrytz/opt/nullness-2.11
Nullness Analysis for GenBCode
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/inlineMaxSize.check4
-rw-r--r--test/files/neg/inlineMaxSize.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/inlineMaxSize.check b/test/files/neg/inlineMaxSize.check
index d218a8b6e2..9d790e154c 100644
--- a/test/files/neg/inlineMaxSize.check
+++ b/test/files/neg/inlineMaxSize.check
@@ -2,8 +2,8 @@ inlineMaxSize.scala:7: warning: C::i()I is annotated @inline but could not be in
The size of the callsite method C::j()I
would exceed the JVM method size limit after inlining C::i()I.
- @inline final def j = i + i
- ^
+ @inline final def j = i + i + i
+ ^
error: No warnings can be incurred under -Xfatal-warnings.
one warning found
one error found
diff --git a/test/files/neg/inlineMaxSize.scala b/test/files/neg/inlineMaxSize.scala
index 16dc0d9538..9d2db1a357 100644
--- a/test/files/neg/inlineMaxSize.scala
+++ b/test/files/neg/inlineMaxSize.scala
@@ -4,5 +4,5 @@ class C {
@inline final def g = f + f + f + f + f + f + f + f + f + f
@inline final def h = g + g + g + g + g + g + g + g + g + g
@inline final def i = h + h + h + h + h + h + h + h + h + h
- @inline final def j = i + i
+ @inline final def j = i + i + i
}