From 724710811d771d1a3f6bb4f798a8f63450244396 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Thu, 8 Jun 2017 10:49:46 +0200
Subject: [PATCH] Rename DefaultArgumentMarker to DefaultConstructorMarker

---
 .../src/org/jetbrains/kotlin/backend/common/ir/Ir.kt          | 2 +-
 .../backend/konan/lower/DefaultArgumentStubGenerator.kt       | 4 ++--
 .../{DefaultArgumentMarker.kt => DefaultConstructorMarker.kt} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename runtime/src/main/kotlin/konan/internal/{DefaultArgumentMarker.kt => DefaultConstructorMarker.kt} (93%)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
index 3c52a42b5dd..4453abd0864 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/common/ir/Ir.kt
@@ -56,7 +56,7 @@ open class Symbols<out T: CommonBackendContext>(val context: T, private val symb
             ) as ClassDescriptor
     )
 
-    val defaultArgumentMarker = symbolTable.referenceClass(context.getInternalClass("DefaultArgumentMarker"))
+    val defaultConstructorMarker = symbolTable.referenceClass(context.getInternalClass("DefaultConstructorMarker"))
 
     val any = symbolTable.referenceClass(builtIns.any)
     val unit = symbolTable.referenceClass(builtIns.unit)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DefaultArgumentStubGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DefaultArgumentStubGenerator.kt
index afd485937cf..2a407619d1e 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DefaultArgumentStubGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/DefaultArgumentStubGenerator.kt
@@ -316,7 +316,7 @@ class DefaultParameterInjector internal constructor(val context: Context): BodyL
                             value       = maskValue)
                 }
                 if (expression.descriptor is ClassConstructorDescriptor) {
-                    val defaultArgumentMarker = context.ir.symbols.defaultArgumentMarker
+                    val defaultArgumentMarker = context.ir.symbols.defaultConstructorMarker
                     params += markerParameterDescriptor(realDescriptor) to IrGetObjectValueImpl(
                             startOffset = irBody.startOffset,
                             endOffset   = irBody.endOffset,
@@ -368,7 +368,7 @@ private fun FunctionDescriptor.generateDefaultsFunction(context: CommonBackendCo
         if (this is ClassConstructorDescriptor) {
             syntheticParameters += valueParameter(descriptor, syntheticParameters.last().index + 1,
                     kConstructorMarkerName,
-                    context.ir.symbols.defaultArgumentMarker.owner.defaultType)
+                    context.ir.symbols.defaultConstructorMarker.owner.defaultType)
         }
         descriptor.initialize(
                 /* receiverParameterType         = */ extensionReceiverParameter?.type,
diff --git a/runtime/src/main/kotlin/konan/internal/DefaultArgumentMarker.kt b/runtime/src/main/kotlin/konan/internal/DefaultConstructorMarker.kt
similarity index 93%
rename from runtime/src/main/kotlin/konan/internal/DefaultArgumentMarker.kt
rename to runtime/src/main/kotlin/konan/internal/DefaultConstructorMarker.kt
index 528cda13557..6179182ae7a 100644
--- a/runtime/src/main/kotlin/konan/internal/DefaultArgumentMarker.kt
+++ b/runtime/src/main/kotlin/konan/internal/DefaultConstructorMarker.kt
@@ -17,4 +17,4 @@
 package konan.internal
 
 @ExportForCompiler
-internal object DefaultArgumentMarker;
+internal object DefaultConstructorMarker;