Support boxing/unboxing for captured vars of inline class types
This commit is contained in:
+5
-15
@@ -1,17 +1,6 @@
|
||||
/*
|
||||
* Copyright 2010-2016 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
|
||||
* that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.backend.jvm.codegen
|
||||
@@ -339,12 +328,13 @@ class ExpressionCodegen(
|
||||
val propertyDescriptor = expression.descriptor
|
||||
|
||||
val realDescriptor = DescriptorUtils.unwrapFakeOverride(propertyDescriptor)
|
||||
val fieldType = typeMapper.mapType(realDescriptor.original.type)
|
||||
val fieldKotlinType = realDescriptor.original.type
|
||||
val fieldType = typeMapper.mapType(fieldKotlinType)
|
||||
val ownerType = typeMapper.mapImplementationOwner(propertyDescriptor)
|
||||
val fieldName = propertyDescriptor.name.asString()
|
||||
val isStatic = expression.receiver == null // TODO
|
||||
|
||||
return StackValue.field(fieldType, ownerType, fieldName, isStatic, receiverValue, realDescriptor)
|
||||
return StackValue.field(fieldType, fieldKotlinType, ownerType, fieldName, isStatic, receiverValue, realDescriptor)
|
||||
}
|
||||
|
||||
override fun visitGetField(expression: IrGetField, data: BlockInfo): StackValue {
|
||||
|
||||
Reference in New Issue
Block a user