From f4cf5e842d91dbebf7a4cb1add50ca0afe7b725a Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Tue, 20 Nov 2018 17:29:33 +0300
Subject: [PATCH] Uniform `alloc` and `cValue` APIs in kotlinx.cinterop

 #KT-25628 Fixed
---
 .../Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt
index 02ae0e9db15..1d14a81c424 100644
--- a/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt
+++ b/Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Utils.kt
@@ -109,6 +109,14 @@ class Arena(parent: NativeFreeablePlacement = nativeHeap) : ArenaBase(parent) {
 inline fun <reified T : CVariable> NativePlacement.alloc(): T =
         alloc(sizeOf<T>(), alignOf<T>()).reinterpret()
 
+/**
+ * Allocates variable of given type and initializes it applying given block.
+ *
+ * @param T must not be abstract
+ */
+inline fun <reified T : CVariable> NativePlacement.alloc(initialize: T.() -> Unit): T =
+        alloc<T>().also { it.initialize() }
+
 /**
  * Allocates C array of given elements type and length.
  *
@@ -225,6 +233,8 @@ fun <T : CVariable> zeroValue(size: Int, align: Int): CValue<T> = object : CValu
 inline fun <reified T : CVariable> zeroValue(): CValue<T> =
         zeroValue<T>(sizeOf<T>().toInt(), alignOf<T>())
 
+inline fun <reified T : CVariable> cValue(): CValue<T> = zeroValue<T>()
+
 private fun <T : CPointed> NativePlacement.placeBytes(bytes: ByteArray, align: Int): CPointer<T> {
     val result = this.alloc(size = bytes.size, align = align)
     nativeMemUtils.putByteArray(bytes, result, bytes.size)