diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-08-26 14:34:59 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-08-26 14:34:59 +0000 |
| commit | e73fa382cc72c054f1dcab2d9525fe4cc0eedda1 (patch) | |
| tree | 12f9f74da35d6a7bf79be701e1e01ca78d24ea5a /src | |
| parent | b3e8963c30de38a6d813640d58cbb1a0a00eba36 (diff) | |
| download | scala-e73fa382cc72c054f1dcab2d9525fe4cc0eedda1.tar.gz scala-e73fa382cc72c054f1dcab2d9525fe4cc0eedda1.tar.bz2 scala-e73fa382cc72c054f1dcab2d9525fe4cc0eedda1.zip | |
minor cleanups, no review
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 9 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala | 40 |
2 files changed, 25 insertions, 24 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index d5cafccd30..a5b7370f8d 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -168,8 +168,9 @@ abstract class GenICode extends SubComponent { case Assign(lhs @ Select(_, _), rhs) => val isStatic = lhs.symbol.isStaticMember var ctx1 = if (isStatic) ctx - else if (forMSIL && msil_IsValuetypeInstField(lhs.symbol)) msil_genLoadQualifierAddress(lhs, ctx) - else genLoadQualifier(lhs, ctx) + else if (forMSIL && msil_IsValuetypeInstField(lhs.symbol)) + msil_genLoadQualifierAddress(lhs, ctx) + else genLoadQualifier(lhs, ctx) ctx1 = genLoad(rhs, ctx1, toTypeKind(lhs.symbol.info)) ctx1.bb.emit(STORE_FIELD(lhs.symbol, isStatic), tree.pos) @@ -902,12 +903,12 @@ abstract class GenICode extends SubComponent { Dynamic var ctx1 = - if (invokeStyle.hasInstance) + if (invokeStyle.hasInstance) { if (forMSIL && !(invokeStyle.isInstanceOf[SuperCall]) && msil_IsValuetypeInstMethod(sym)) msil_genLoadQualifierAddress(fun, ctx) else genLoadQualifier(fun, ctx) - else ctx + } else ctx ctx1 = genLoadArguments(args, sym.info.paramTypes, ctx1) val cm = CALL_METHOD(sym, invokeStyle) diff --git a/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala b/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala index 937d1e3d45..87c9b929b5 100644 --- a/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala +++ b/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala @@ -1452,16 +1452,16 @@ abstract class GenMSIL extends SubComponent { code.Emit(OpCodes.Ldarga, i) } else { i match { - case 0 => code.Emit(OpCodes.Ldarg_0) - case 1 => code.Emit(OpCodes.Ldarg_1) - case 2 => code.Emit(OpCodes.Ldarg_2) - case 3 => code.Emit(OpCodes.Ldarg_3) - case _ => - if (i >= -128 && i <= 127) - code.Emit(OpCodes.Ldarg_S, i) - else - code.Emit(OpCodes.Ldarg, i) - } + case 0 => code.Emit(OpCodes.Ldarg_0) + case 1 => code.Emit(OpCodes.Ldarg_1) + case 2 => code.Emit(OpCodes.Ldarg_2) + case 3 => code.Emit(OpCodes.Ldarg_3) + case _ => + if (i >= -128 && i <= 127) + code.Emit(OpCodes.Ldarg_S, i) + else + code.Emit(OpCodes.Ldarg, i) + } } def loadLocal(i: Int, local: Local, code: ILGenerator, loadAddr: Boolean) = @@ -1472,16 +1472,16 @@ abstract class GenMSIL extends SubComponent { code.Emit(OpCodes.Ldloca, localBuilders(local)) } else { i match { - case 0 => code.Emit(OpCodes.Ldloc_0) - case 1 => code.Emit(OpCodes.Ldloc_1) - case 2 => code.Emit(OpCodes.Ldloc_2) - case 3 => code.Emit(OpCodes.Ldloc_3) - case _ => - if (i >= -128 && i <= 127) - code.Emit(OpCodes.Ldloc_S, localBuilders(local)) - else - code.Emit(OpCodes.Ldloc, localBuilders(local)) - } + case 0 => code.Emit(OpCodes.Ldloc_0) + case 1 => code.Emit(OpCodes.Ldloc_1) + case 2 => code.Emit(OpCodes.Ldloc_2) + case 3 => code.Emit(OpCodes.Ldloc_3) + case _ => + if (i >= -128 && i <= 127) + code.Emit(OpCodes.Ldloc_S, localBuilders(local)) + else + code.Emit(OpCodes.Ldloc, localBuilders(local)) + } } ////////////////////// branches /////////////////////// |