azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable signed to unsigned coercion for modules with special capability

Browse Source 
Mainly this is needed for Kotlin/Native part
This commit is contained in:
Mikhail Zarechenskiy
2018-09-06 12:25:00 +03:00
parent 55ff519aa8
commit 5173a84dc7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ImplicitIntegerCoercion.kt
+5 -2
View File
@@ -21,8 +21,7 @@ object ImplicitIntegerCoercion {
private fun isEnabledFor(descriptor: DeclarationDescriptor): Boolean = private fun isEnabledFor(descriptor: DeclarationDescriptor): Boolean =
descriptor.hasImplicitIntegerCoercionAnnotation() || descriptor.hasImplicitIntegerCoercionAnnotation() ||
DescriptorUtils.getContainingModuleOrNull(descriptor) DescriptorUtils.getContainingModuleOrNull(descriptor)?.hasImplicitIntegerCoercionCapability() == true
?.getCapability(ImplicitIntegerCoercion.MODULE_CAPABILITY) == true
private val IMPLICIT_INTEGER_COERCION_ANNOTATION_FQ_NAME = FqName("kotlin.internal.ImplicitIntegerCoercion") private val IMPLICIT_INTEGER_COERCION_ANNOTATION_FQ_NAME = FqName("kotlin.internal.ImplicitIntegerCoercion")
@@ -30,3 +29,7 @@ object ImplicitIntegerCoercion {
return annotations.findAnnotation(IMPLICIT_INTEGER_COERCION_ANNOTATION_FQ_NAME) != null return annotations.findAnnotation(IMPLICIT_INTEGER_COERCION_ANNOTATION_FQ_NAME) != null
} }
} }
fun ModuleDescriptor.hasImplicitIntegerCoercionCapability(): Boolean {
return getCapability(ImplicitIntegerCoercion.MODULE_CAPABILITY) == true
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
+1 -1
View File
@@ -323,7 +323,7 @@ class CallCompleter(
val constant = context.trace[BindingContext.COMPILE_TIME_VALUE, deparenthesized] val constant = context.trace[BindingContext.COMPILE_TIME_VALUE, deparenthesized]
val convertedConst = constant is IntegerValueTypeConstant && constant.convertedFromSigned val convertedConst = constant is IntegerValueTypeConstant && constant.convertedFromSigned
if (convertedConst) { if (convertedConst && !moduleDescriptor.hasImplicitIntegerCoercionCapability()) {
context.trace.report(Errors.SIGNED_CONSTANT_CONVERTED_TO_UNSIGNED.on(deparenthesized)) context.trace.report(Errors.SIGNED_CONSTANT_CONVERTED_TO_UNSIGNED.on(deparenthesized))
} }