| commit | a624c3a023745a5cea2240a24d836b672bba891f | [log] [tgz] |
|---|---|---|
| author | Sergey Bogolepov <sergey.bogolepov@jetbrains.com> | Thu Jan 16 20:36:19 2025 +0200 |
| committer | Sergey Bogolepov <sergey.bogolepov@jetbrains.com> | Thu Jan 16 20:36:19 2025 +0200 |
| tree | 7bd0b9fc9dd8c020b9d640131af472c3409d1dba | |
| parent | 5dad15de0d80bc674724aa70b24bb6cc3034b8eb [diff] |
[K/N] Fix conflict with ce9dd13
diff --git a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt index cb85885..c6be624 100644 --- a/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt +++ b/kotlin-native/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/NativeInlineFunctionResolver.kt
@@ -30,7 +30,7 @@ val function = super.getFunctionDeclaration(symbol) ?: return null if (function.body != null) return function - generationState.context.getInlineFunctionDeserializer(function).deserializeInlineFunction(function) + context.getInlineFunctionDeserializer(function).deserializeInlineFunction(function) lower(function) return function