From 5e55a75d594bb4dd4d2deec558a15e825a915d30 Mon Sep 17 00:00:00 2001 From: igotti-google Date: Thu, 3 Aug 2017 00:39:09 +0300 Subject: [PATCH] Work around 32-bit build problem (struct merging by LLVM) --- .../src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt | 2 -- .../src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt | 1 - 2 files changed, 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt index 6b709b963ba..a602931b557 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt @@ -114,8 +114,6 @@ internal val RuntimeAware.kTypeInfo: LLVMTypeRef get() = runtime.typeInfoType internal val RuntimeAware.kObjHeader: LLVMTypeRef get() = runtime.objHeaderType -internal val RuntimeAware.kContainerHeader: LLVMTypeRef - get() = runtime.containerHeaderType internal val RuntimeAware.kObjHeaderPtr: LLVMTypeRef get() = pointerType(kObjHeader) internal val RuntimeAware.kObjHeaderPtrPtr: LLVMTypeRef diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt index b7dc2cff444..f56000c2463 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt @@ -36,7 +36,6 @@ class Runtime(bitcodeFile: String) { val methodTableRecordType = getStructType("MethodTableRecord") val globalHashType = getStructType("GlobalHash") - val containerHeaderType = getStructType("ContainerHeader") val objHeaderType = getStructType("ObjHeader") val arrayHeaderType = getStructType("ArrayHeader")