From cdbefa671031b9633c46c6322bfc2554827169a9 Mon Sep 17 00:00:00 2001
From: Vasily Levchenko <vasily.v.levchenko@gmail.com>
Date: Fri, 10 Aug 2018 12:22:47 +0300
Subject: [PATCH] [codegen] added konan.internal.NoReorderFields to disable
 field reordering

---
 .../kotlin/backend/konan/llvm/LlvmDeclarations.kt          | 3 +++
 runtime/src/main/kotlin/konan/internal/Annotations.kt      | 7 +++++++
 runtime/src/main/kotlin/konan/ref/WeakPrivate.kt           | 2 ++
 runtime/src/main/kotlin/konan/worker/Atomics.kt            | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt
index d3253572b3a..0baa8487200 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt
@@ -135,6 +135,9 @@ private fun Context.getDeclaredFields(classDescriptor: ClassDescriptor): List<Ir
     // TODO: hack over missed parents in deserialized fields/property declarations.
     fields.forEach{it.parent = irClass}
 
+    if (classDescriptor.hasAnnotation(FqName.fromSegments(listOf("konan", "internal", "NoReorderFields"))))
+        return fields
+
     return fields.sortedBy {
         it.fqNameSafe.localHash.value
     }
diff --git a/runtime/src/main/kotlin/konan/internal/Annotations.kt b/runtime/src/main/kotlin/konan/internal/Annotations.kt
index 9607d8bf689..96350df20f5 100644
--- a/runtime/src/main/kotlin/konan/internal/Annotations.kt
+++ b/runtime/src/main/kotlin/konan/internal/Annotations.kt
@@ -65,3 +65,10 @@ annotation class InlineConstructor
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.BINARY)
 internal annotation class Frozen
+
+/**
+ * Fields of annotated class won't be sorted.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class NoReorderFields
\ No newline at end of file
diff --git a/runtime/src/main/kotlin/konan/ref/WeakPrivate.kt b/runtime/src/main/kotlin/konan/ref/WeakPrivate.kt
index 700765ea017..15f1073e879 100644
--- a/runtime/src/main/kotlin/konan/ref/WeakPrivate.kt
+++ b/runtime/src/main/kotlin/konan/ref/WeakPrivate.kt
@@ -18,6 +18,7 @@ package konan.ref
 
 import kotlinx.cinterop.COpaquePointer
 import konan.internal.ExportForCppRuntime
+import konan.internal.NoReorderFields
 
 /**
  *   Theory of operations:
@@ -42,6 +43,7 @@ import konan.internal.ExportForCppRuntime
  */
 
 // Clear holding the counter object, which refers to the actual object.
+@NoReorderFields
 internal class WeakReferenceCounter(var referred: COpaquePointer?) : WeakReferenceImpl() {
     // Spinlock, potentially taken when materializing or removing 'referred' object.
     var lock: Int = 0
diff --git a/runtime/src/main/kotlin/konan/worker/Atomics.kt b/runtime/src/main/kotlin/konan/worker/Atomics.kt
index 68b4323e4c5..ac3265e54cd 100644
--- a/runtime/src/main/kotlin/konan/worker/Atomics.kt
+++ b/runtime/src/main/kotlin/konan/worker/Atomics.kt
@@ -17,6 +17,7 @@
 package konan.worker
 
 import konan.internal.Frozen
+import konan.internal.NoReorderFields
 import konan.SymbolName
 import kotlinx.cinterop.NativePtr
 
@@ -123,6 +124,7 @@ external private fun checkIfFrozen(ref: Any?)
  * Otherwise memory leak could happen.
  */
 @Frozen
+@NoReorderFields
 class AtomicReference<T>(private var value: T? = null) {
     // A spinlock to fix potential ARC race. Not an AtomicInt just for the effeciency sake.
     private var lock: Int = 0