Merge pull request #44 from JetBrains/relocation
Further relocation from 'native' to 'kotlin'
This commit is contained in:
@@ -126,7 +126,7 @@ kotlinNativeInterop {
|
|||||||
include '**/*.hpp'
|
include '**/*.hpp'
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg 'org.jetbrains.kotlin.backend.native.hash'
|
pkg 'org.jetbrains.kotlin.backend.konan.hash'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.cli.bc
|
|||||||
|
|
||||||
import com.intellij.openapi.Disposable
|
import com.intellij.openapi.Disposable
|
||||||
import org.jetbrains.kotlin.analyzer.AnalysisResult
|
import org.jetbrains.kotlin.analyzer.AnalysisResult
|
||||||
import org.jetbrains.kotlin.backend.native.llvm.emitLLVM
|
import org.jetbrains.kotlin.backend.konan.llvm.emitLLVM
|
||||||
import org.jetbrains.kotlin.cli.common.CLICompiler
|
import org.jetbrains.kotlin.cli.common.CLICompiler
|
||||||
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
|
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
|
||||||
import org.jetbrains.kotlin.cli.common.ExitCode
|
import org.jetbrains.kotlin.cli.common.ExitCode
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native
|
package org.jetbrains.kotlin.backend.konan
|
||||||
|
|
||||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.ClassKind
|
import org.jetbrains.kotlin.descriptors.ClassKind
|
||||||
@@ -46,4 +46,4 @@ internal val ClassDescriptor.isIntrinsic: Boolean
|
|||||||
get() = this.fqNameSafe.asString() in intrinsicTypes
|
get() = this.fqNameSafe.asString() in intrinsicTypes
|
||||||
|
|
||||||
internal val ClassDescriptor.isInterface: Boolean
|
internal val ClassDescriptor.isInterface: Boolean
|
||||||
get() = (this.kind == ClassKind.INTERFACE)
|
get() = (this.kind == ClassKind.INTERFACE)
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native
|
package org.jetbrains.kotlin.backend.konan
|
||||||
|
|
||||||
import org.jetbrains.kotlin.ir.IrElement
|
import org.jetbrains.kotlin.ir.IrElement
|
||||||
import org.jetbrains.kotlin.ir.declarations.IrClass
|
import org.jetbrains.kotlin.ir.declarations.IrClass
|
||||||
@@ -37,4 +37,4 @@ class ModuleIndex(val module: IrModuleFragment) {
|
|||||||
|
|
||||||
classes = map
|
classes = map
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native
|
package org.jetbrains.kotlin.backend.konan
|
||||||
|
|
||||||
import org.jetbrains.kotlin.codegen.CompilationErrorHandler
|
import org.jetbrains.kotlin.codegen.CompilationErrorHandler
|
||||||
import org.jetbrains.kotlin.codegen.state.GenerationState
|
import org.jetbrains.kotlin.codegen.state.GenerationState
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native
|
package org.jetbrains.kotlin.backend.konan
|
||||||
|
|
||||||
import org.jetbrains.kotlin.codegen.*
|
import org.jetbrains.kotlin.codegen.*
|
||||||
import org.jetbrains.kotlin.codegen.context.PackageContext
|
import org.jetbrains.kotlin.codegen.context.PackageContext
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
|
|
||||||
import kotlin_native.interop.*
|
import kotlin_native.interop.*
|
||||||
|
|||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import llvm.*
|
import llvm.*
|
||||||
import org.jetbrains.kotlin.backend.native.ModuleIndex
|
import org.jetbrains.kotlin.backend.konan.ModuleIndex
|
||||||
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
|
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
|
||||||
|
|
||||||
internal class Context(val irModule: IrModuleFragment, val runtime: Runtime, val llvmModule: LLVMOpaqueModule) {
|
internal class Context(val irModule: IrModuleFragment, val runtime: Runtime, val llvmModule: LLVMOpaqueModule) {
|
||||||
@@ -29,4 +29,4 @@ internal class Context(val irModule: IrModuleFragment, val runtime: Runtime, val
|
|||||||
fun dispose() {
|
fun dispose() {
|
||||||
LLVMDisposeBuilder(llvmBuilder)
|
LLVMDisposeBuilder(llvmBuilder)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -1,8 +1,8 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import kotlin_native.interop.*
|
import kotlin_native.interop.*
|
||||||
import llvm.*
|
import llvm.*
|
||||||
import org.jetbrains.kotlin.backend.native.hash.GlobalHash
|
import org.jetbrains.kotlin.backend.konan.hash.GlobalHash
|
||||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
|
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
|
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
|
||||||
@@ -153,4 +153,4 @@ internal interface ContextUtils {
|
|||||||
|
|
||||||
val pointerSize: Int
|
val pointerSize: Int
|
||||||
get() = LLVMPointerSize(llvmTargetData)
|
get() = LLVMPointerSize(llvmTargetData)
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import llvm.*
|
import llvm.*
|
||||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
||||||
@@ -17,4 +17,4 @@ internal fun getLLVMType(type: KotlinType): LLVMOpaqueType {
|
|||||||
!KotlinBuiltIns.isPrimitiveType(type) -> LLVMPointerType(LLVMInt8Type(), 0)
|
!KotlinBuiltIns.isPrimitiveType(type) -> LLVMPointerType(LLVMInt8Type(), 0)
|
||||||
else -> throw NotImplementedError(type.toString() + " is not supported")
|
else -> throw NotImplementedError(type.toString() + " is not supported")
|
||||||
}!!
|
}!!
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -1,7 +1,7 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import kotlin_native.interop.*
|
import kotlin_native.interop.*
|
||||||
import org.jetbrains.kotlin.backend.native.hash.*
|
import org.jetbrains.kotlin.backend.konan.hash.*
|
||||||
|
|
||||||
internal fun localHash(data: ByteArray): Long {
|
internal fun localHash(data: ByteArray): Long {
|
||||||
memScoped {
|
memScoped {
|
||||||
@@ -21,4 +21,4 @@ internal fun globalHash(data: ByteArray, retValPlacement: Placement): GlobalHash
|
|||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class LocalHash(val value: Long) : ConstValue by Int64(value)
|
internal class LocalHash(val value: Long) : ConstValue by Int64(value)
|
||||||
|
|||||||
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import kotlin_native.interop.*
|
import kotlin_native.interop.*
|
||||||
import llvm.*
|
import llvm.*
|
||||||
import org.jetbrains.kotlin.backend.native.isIntrinsic
|
import org.jetbrains.kotlin.backend.konan.isIntrinsic
|
||||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
||||||
import org.jetbrains.kotlin.descriptors.*
|
import org.jetbrains.kotlin.descriptors.*
|
||||||
import org.jetbrains.kotlin.descriptors.impl.LazyClassReceiverParameterDescriptor
|
import org.jetbrains.kotlin.descriptors.impl.LazyClassReceiverParameterDescriptor
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import kotlin_native.interop.*
|
import kotlin_native.interop.*
|
||||||
import llvm.*
|
import llvm.*
|
||||||
@@ -129,4 +129,4 @@ internal fun NativeArray<Int8Box>.getBytes(size: Int) =
|
|||||||
internal fun getFunctionType(ptrToFunction: LLVMOpaqueValue?): LLVMOpaqueType {
|
internal fun getFunctionType(ptrToFunction: LLVMOpaqueValue?): LLVMOpaqueType {
|
||||||
val typeOfPtrToFunction = LLVMTypeOf(ptrToFunction)
|
val typeOfPtrToFunction = LLVMTypeOf(ptrToFunction)
|
||||||
return LLVMGetElementType(typeOfPtrToFunction)!!
|
return LLVMGetElementType(typeOfPtrToFunction)!!
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -1,11 +1,11 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import kotlin_native.interop.asCString
|
import kotlin_native.interop.asCString
|
||||||
import llvm.LLVMPrintModuleToString
|
import llvm.LLVMPrintModuleToString
|
||||||
import llvm.LLVMPrintValueToString
|
import llvm.LLVMPrintValueToString
|
||||||
import llvm.LLVMOpaqueValue
|
import llvm.LLVMOpaqueValue
|
||||||
import org.jetbrains.kotlin.backend.native.llvm.Context
|
import org.jetbrains.kotlin.backend.konan.llvm.Context
|
||||||
import org.jetbrains.kotlin.backend.native.llvm.ContextUtils
|
import org.jetbrains.kotlin.backend.konan.llvm.ContextUtils
|
||||||
import org.jetbrains.kotlin.ir.IrElement
|
import org.jetbrains.kotlin.ir.IrElement
|
||||||
import org.jetbrains.kotlin.ir.util.DumpIrTreeVisitor
|
import org.jetbrains.kotlin.ir.util.DumpIrTreeVisitor
|
||||||
import java.io.StringWriter
|
import java.io.StringWriter
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
|
|
||||||
import kotlin_native.interop.*
|
import kotlin_native.interop.*
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.ClassKind.*
|
import org.jetbrains.kotlin.descriptors.ClassKind.*
|
||||||
@@ -31,4 +31,4 @@ internal val ClassDescriptor.symbolName: String
|
|||||||
} + fqNameSafe
|
} + fqNameSafe
|
||||||
|
|
||||||
internal val ClassDescriptor.typeInfoSymbolName: String
|
internal val ClassDescriptor.typeInfoSymbolName: String
|
||||||
get() = "ktype:" + this.fqNameSafe.toString()
|
get() = "ktype:" + this.fqNameSafe.toString()
|
||||||
|
|||||||
+4
-4
@@ -1,12 +1,12 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
|
|
||||||
import kotlin_native.interop.allocNativeArrayOf
|
import kotlin_native.interop.allocNativeArrayOf
|
||||||
import kotlin_native.interop.memScoped
|
import kotlin_native.interop.memScoped
|
||||||
import llvm.*
|
import llvm.*
|
||||||
import org.jetbrains.kotlin.backend.native.implementation
|
import org.jetbrains.kotlin.backend.konan.implementation
|
||||||
import org.jetbrains.kotlin.backend.native.implementedInterfaces
|
import org.jetbrains.kotlin.backend.konan.implementedInterfaces
|
||||||
import org.jetbrains.kotlin.backend.native.isInterface
|
import org.jetbrains.kotlin.backend.konan.isInterface
|
||||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
||||||
import org.jetbrains.kotlin.descriptors.*
|
import org.jetbrains.kotlin.descriptors.*
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import kotlin_native.interop.*
|
import kotlin_native.interop.*
|
||||||
import llvm.*
|
import llvm.*
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import llvm.*
|
import llvm.*
|
||||||
|
|
||||||
@@ -108,4 +108,4 @@ internal class StaticData(override val context: Context): ContextUtils {
|
|||||||
|
|
||||||
return global
|
return global
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import llvm.*
|
import llvm.*
|
||||||
|
|
||||||
@@ -24,4 +24,4 @@ internal fun StaticData.placeGlobalConstArray(name: String,
|
|||||||
internal fun StaticData.createAlias(name: String, aliasee: ConstPointer): ConstPointer {
|
internal fun StaticData.createAlias(name: String, aliasee: ConstPointer): ConstPointer {
|
||||||
val alias = LLVMAddAlias(context.llvmModule, aliasee.getLlvmType(), aliasee.getLlvmValue(), name)!!
|
val alias = LLVMAddAlias(context.llvmModule, aliasee.getLlvmType(), aliasee.getLlvmValue(), name)!!
|
||||||
return constPointer(alias)
|
return constPointer(alias)
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
package org.jetbrains.kotlin.backend.native.llvm
|
package org.jetbrains.kotlin.backend.konan.llvm
|
||||||
|
|
||||||
import llvm.*
|
import llvm.*
|
||||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||||
@@ -53,4 +53,4 @@ internal fun StaticData.createStringLiteral(value: IrConst<String>): ConstPointe
|
|||||||
LLVMSetLinkage(res.getLlvmValue(), LLVMLinkage.LLVMWeakAnyLinkage)
|
LLVMSetLinkage(res.getLlvmValue(), LLVMLinkage.LLVMWeakAnyLinkage)
|
||||||
|
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user