Skip to content

Commit baaa063

Browse files
committed
Extract interface forwarders with public visiblity
1 parent 1613e47 commit baaa063

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ open class KotlinFileExtractor(
843843
f.realOverrideTarget.let { it != f && isKotlinDefinedInterface(it.parentClassOrNull) }
844844

845845
private fun makeInterfaceForwarder(f: IrFunction, parentId: Label<out DbReftype>, extractBody: Boolean, extractMethodAndParameterTypeAccesses: Boolean, typeSubstitution: TypeSubstitution?, classTypeArgsIncludingOuterClasses: List<IrTypeArgument>?) =
846-
forceExtractFunction(f, parentId, extractBody = false, extractMethodAndParameterTypeAccesses, typeSubstitution, classTypeArgsIncludingOuterClasses).also { functionId ->
846+
forceExtractFunction(f, parentId, extractBody = false, extractMethodAndParameterTypeAccesses, typeSubstitution, classTypeArgsIncludingOuterClasses, overriddenAttributes = OverriddenFunctionAttributes(visibility = DescriptorVisibilities.PUBLIC)).also { functionId ->
847847
tw.writeCompiler_generated(functionId, CompilerGeneratedKinds.INTERFACE_FORWARDER.kind)
848848
if (extractBody) {
849849
val realFunctionLocId = tw.getLocation(f)
@@ -1189,7 +1189,7 @@ open class KotlinFileExtractor(
11891189
extractBody(body, id)
11901190
}
11911191

1192-
extractVisibility(f, id, f.visibility)
1192+
extractVisibility(f, id, overriddenAttributes?.visibility ?: f.visibility)
11931193

11941194
if (f.isInline) {
11951195
addModifiers(id, "inline")
@@ -5401,7 +5401,9 @@ open class KotlinFileExtractor(
54015401
val sourceLoc: Label<DbLocation>? = null,
54025402
val valueParameters: List<IrValueParameter>? = null,
54035403
val typeParameters: List<IrTypeParameter>? = null,
5404-
val isStatic: Boolean? = null)
5404+
val isStatic: Boolean? = null,
5405+
val visibility: DescriptorVisibility? = null,
5406+
)
54055407

54065408
private fun peekDeclStackAsDeclarationParent(elementToReportOn: IrElement): IrDeclarationParent? {
54075409
val trapWriter = tw

0 commit comments

Comments
 (0)