diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-01-29 10:29:33 +1000 |
| commit | 8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6 (patch) | |
| tree | 9b91ee264a8a4abf936b4b2c939591decb751313 /src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | |
| parent | 020581e795a677b838fa62f67064fe9a55b02ba0 (diff) | |
| parent | 7b5998a0592ee707c02a13859fe1520687c76c38 (diff) | |
| download | scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.gz scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.tar.bz2 scala-8b334459d0e09cf486b12ea6869ddc2f2a9eb6a6.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150129
Conflicts:
build.number
src/library/scala/concurrent/Future.scala
versions.properties
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/icode/GenICode.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index a1cec2ee0b..72aa44d8d9 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -1077,7 +1077,7 @@ abstract class GenICode extends SubComponent { () case (_, UNIT) => ctx.bb.emit(DROP(from), pos) - // otherwise we'd better be doing a primtive -> primitive coercion or there's a problem + // otherwise we'd better be doing a primitive -> primitive coercion or there's a problem case _ if !from.isRefOrArrayType && !to.isRefOrArrayType => coerce(from, to) case _ => |