diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-09 19:48:15 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-09 19:49:14 -0800 |
| commit | 6194bd7f2e2c2075808b34cf639ee254da990237 (patch) | |
| tree | cbe0a385823cfddd55fda7d4d18facc5fba28065 /test | |
| parent | 747f6a8d24c628d05ab3acea0b95a82d04a71df3 (diff) | |
| parent | 558c059227b498707a8bc7eb7f29297475e7720e (diff) | |
| download | scala-6194bd7f2e2c2075808b34cf639ee254da990237.tar.gz scala-6194bd7f2e2c2075808b34cf639ee254da990237.tar.bz2 scala-6194bd7f2e2c2075808b34cf639ee254da990237.zip | |
Merge commit '558c059227' into merge-210
* commit '558c059227':
SI-7060 More conservative dead code elim marking
Conflicts:
src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/pos/SI-7060.flags | 1 | ||||
| -rw-r--r-- | test/files/pos/SI-7060.scala | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/test/files/pos/SI-7060.flags b/test/files/pos/SI-7060.flags new file mode 100644 index 0000000000..c926ad6493 --- /dev/null +++ b/test/files/pos/SI-7060.flags @@ -0,0 +1 @@ +-Yinline -Ydead-code diff --git a/test/files/pos/SI-7060.scala b/test/files/pos/SI-7060.scala new file mode 100644 index 0000000000..c87620e020 --- /dev/null +++ b/test/files/pos/SI-7060.scala @@ -0,0 +1,11 @@ +object Test { + + @inline final def mbarray_apply_minibox(array: Any, tag: Byte): Long = + if (tag == 0) { + array.asInstanceOf[Array[Long]](0) + } else + array.asInstanceOf[Array[Byte]](0).toLong + + def crash_method(): Unit = + mbarray_apply_minibox(null, 0) +} |