diff options
| author | mihaylov <mihaylov@epfl.ch> | 2007-06-13 10:37:16 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2007-06-13 10:37:16 +0000 |
| commit | 63d5f0c247513ba84512e25c838d073a62b9c507 (patch) | |
| tree | d24bcdb0f7fab6c778f4d7c6ccc0368a363d5bcb /src/compiler | |
| parent | 989c80bcade3c559e260de12337441902e551bba (diff) | |
| download | scala-63d5f0c247513ba84512e25c838d073a62b9c507.tar.gz scala-63d5f0c247513ba84512e25c838d073a62b9c507.tar.bz2 scala-63d5f0c247513ba84512e25c838d073a62b9c507.zip | |
in BoxesUtility.unboxTo* cast directly to the e...
in BoxesUtility.unboxTo* cast directly to the expected box class before
unboxing
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index 09935b69e6..1b92462834 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -676,9 +676,9 @@ abstract class GenICode extends SubComponent { if (settings.debug.value) log("UNBOX : " + fun.symbol.fullNameString) val ctx1 = genLoad(expr, ctx, toTypeKind(expr.tpe)) - assert(expectedType.isValueType) - generatedType = expectedType - ctx1.bb.emit(UNBOX(expectedType), expr.pos) + val boxType = toTypeKind(fun.symbol.owner.linkedClassOfClass.tpe) + generatedType = boxType + ctx1.bb.emit(UNBOX(boxType), expr.pos) ctx1 case Apply(fun, args) => |