From 56f574684a7c4ed4d657360a76e768d6d9ba70e2 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Mon, 7 Nov 2016 14:24:49 +0300
Subject: [PATCH] Code style and nullables fixes

---
 .../kotlin/backend/native/llvm/Logger.kt      |  1 +
 .../backend/native/llvm/MetadataGenerator.kt  | 30 ++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Logger.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Logger.kt
index 02231f6f236..7cd8c664aaa 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Logger.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/Logger.kt
@@ -39,6 +39,7 @@ fun ir2string(ir: IrElement?): String {
 }
 
 fun llvm2string(value: LLVMOpaqueValue?): String {
+  if (value == null) return "<null>"
   return LLVMPrintValueToString(value)!!.asCString().toString()
 }
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/MetadataGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/MetadataGenerator.kt
index ef7ce366385..1efac2d8efc 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/MetadataGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/MetadataGenerator.kt
@@ -9,32 +9,29 @@ import org.jetbrains.kotlin.backend.BinaryMetadata.FunMetadata
 
 internal class MetadataGenerator(override val context: Context): ContextUtils {
 
-    private fun metadata_string(str: String): LLVMOpaqueValue? {
-        return LLVMMDString(str, str.length)
+    private fun metadataString(str: String): LLVMOpaqueValue {
+        return LLVMMDString(str, str.length)!!
     }
 
-    private fun metadata_node(args: MutableList<LLVMOpaqueValue?>): LLVMOpaqueValue? {
+    private fun metadataNode(args: MutableList<LLVMOpaqueValue?>): LLVMOpaqueValue {
         memScoped {
             val rargs = alloc(array[args.size](Ref to LLVMOpaqueValue))
-                args.forEachIndexed { i, llvmOpaqueValue ->  rargs[i].value = args[i]}
-            return LLVMMDNode(rargs[0], args.size);
+            args.forEachIndexed { i, llvmOpaqueValue ->  rargs[i].value = args[i]}
+            return LLVMMDNode(rargs[0], args.size)!!
         }
     }
 
-    private fun metadata_fun(fn: LLVMOpaqueValue?, info: String): LLVMOpaqueValue? {
-        val args: MutableList<LLVMOpaqueValue?> = mutableListOf()
-            args += fn
-            args += metadata_string(info);
-
-        val md = metadata_node(args)
+    private fun metadataFun(fn: LLVMOpaqueValue?, info: String): LLVMOpaqueValue {
+        val args: MutableList<LLVMOpaqueValue?> = mutableListOf(fn, metadataString(info));
+        val md = metadataNode(args)
         return md
     }
 
-    private fun emit_module_metadata(name: String, md: LLVMOpaqueValue?) {
+    private fun emitModuleMetadata(name: String, md: LLVMOpaqueValue?) {
         LLVMAddNamedMetadataOperand(context.llvmModule, name, md)
     }
 
-    private fun serialize_fun_signature(declaration:IrFunction): String {
+    private fun serializeFunSignature(declaration:IrFunction): String {
         val builder = FunMetadata.newBuilder()
 
         val hash = "0x123456 some hash"
@@ -53,13 +50,12 @@ internal class MetadataGenerator(override val context: Context): ContextUtils {
     }
 
     internal fun function(declaration: IrFunction) {
-
         val fn = declaration.descriptor.llvmFunction.getLlvmValue()
 
-        val proto = serialize_fun_signature(declaration)
+        val proto = serializeFunSignature(declaration)
 
-        val md = metadata_fun(fn, proto)
-        emit_module_metadata("kfun", md);
+        val md = metadataFun(fn, proto)
+        emitModuleMetadata("kfun", md);
     }
 }