diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-03-29 23:28:05 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-03-29 23:28:05 +0200 |
| commit | e5bbc98f780070326498d55bb0bdcde9bb6a746b (patch) | |
| tree | ea32fe2becddfca0b3172a25705ca5dca071a4c2 | |
| parent | 201b8d1fd0b7f6b66a41cb7a3ea50082d1504812 (diff) | |
| parent | 763d25453b0fb1d17767260c794d8a1d21d616f6 (diff) | |
| download | scala-e5bbc98f780070326498d55bb0bdcde9bb6a746b.tar.gz scala-e5bbc98f780070326498d55bb0bdcde9bb6a746b.tar.bz2 scala-e5bbc98f780070326498d55bb0bdcde9bb6a746b.zip | |
Merge pull request #5060 from scala/DarkDimius-patch-1
Fix a bug in multi-dimensional array creation
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala index 82aa3c65aa..b4d645d4bb 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala @@ -641,8 +641,8 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder { } argsSize match { case 1 => bc newarray elemKind - case _ => - val descr = ('[' * argsSize) + elemKind.descriptor // denotes the same as: arrayN(elemKind, argsSize).descriptor + case _ => // this is currently dead code is Scalac, unlike in Dotty + val descr = ("[" * argsSize) + elemKind.descriptor // denotes the same as: arrayN(elemKind, argsSize).descriptor mnode.visitMultiANewArrayInsn(descr, argsSize) } |