azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #44 from JetBrains/relocation

Browse Source 
Further relocation from 'native' to 'kotlin'
This commit is contained in:
alexander-gorshenev
2016-11-08 14:52:47 +04:00
committed by GitHub
parent 4a20e37c9f 67889cb31c
commit d2bf3a6ceb
21 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+1 -1
View File
@@ -126,7 +126,7 @@ kotlinNativeInterop {
include '**/*.hpp'
}
pkg 'org.jetbrains.kotlin.backend.native.hash'
pkg 'org.jetbrains.kotlin.backend.konan.hash'
}
}
backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.cli.bc
import com.intellij.openapi.Disposable
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.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.ExitCode
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt
+2 -2
View File
@@ -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.ClassKind
@@ -46,4 +46,4 @@ internal val ClassDescriptor.isIntrinsic: Boolean
get() = this.fqNameSafe.asString() in intrinsicTypes
internal val ClassDescriptor.isInterface: Boolean
get() = (this.kind == ClassKind.INTERFACE)
get() = (this.kind == ClassKind.INTERFACE)
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt
+2 -2
View File
@@ -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.declarations.IrClass
@@ -37,4 +37,4 @@ class ModuleIndex(val module: IrModuleFragment) {
classes = map
}
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeBackendFacade.kt
+1 -1
View File
@@ -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.state.GenerationState
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt
+1 -1
View File
@@ -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.context.PackageContext
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.*
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt
+3 -3
View File
@@ -1,7 +1,7 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import llvm.*
import org.jetbrains.kotlin.backend.native.ModuleIndex
import org.jetbrains.kotlin.backend.konan.ModuleIndex
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
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() {
LLVMDisposeBuilder(llvmBuilder)
}
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
+3 -3
View File
@@ -1,8 +1,8 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.*
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.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -153,4 +153,4 @@ internal interface ContextUtils {
val pointerSize: Int
get() = LLVMPointerSize(llvmTargetData)
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import llvm.*
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
@@ -17,4 +17,4 @@ internal fun getLLVMType(type: KotlinType): LLVMOpaqueType {
!KotlinBuiltIns.isPrimitiveType(type) -> LLVMPointerType(LLVMInt8Type(), 0)
else -> throw NotImplementedError(type.toString() + " is not supported")
}!!
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt
+3 -3
View File
@@ -1,7 +1,7 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.*
import org.jetbrains.kotlin.backend.native.hash.*
import org.jetbrains.kotlin.backend.konan.hash.*
internal fun localHash(data: ByteArray): Long {
memScoped {
@@ -21,4 +21,4 @@ internal fun globalHash(data: ByteArray, retValPlacement: Placement): GlobalHash
return res
}
internal class LocalHash(val value: Long) : ConstValue by Int64(value)
internal class LocalHash(val value: Long) : ConstValue by Int64(value)
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+2 -2
View File
@@ -1,8 +1,8 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.*
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.descriptors.*
import org.jetbrains.kotlin.descriptors.impl.LazyClassReceiverParameterDescriptor
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.*
import llvm.*
@@ -129,4 +129,4 @@ internal fun NativeArray<Int8Box>.getBytes(size: Int) =
internal fun getFunctionType(ptrToFunction: LLVMOpaqueValue?): LLVMOpaqueType {
val typeOfPtrToFunction = LLVMTypeOf(ptrToFunction)
return LLVMGetElementType(typeOfPtrToFunction)!!
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt
+3 -3
View File
@@ -1,11 +1,11 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.asCString
import llvm.LLVMPrintModuleToString
import llvm.LLVMPrintValueToString
import llvm.LLVMOpaqueValue
import org.jetbrains.kotlin.backend.native.llvm.Context
import org.jetbrains.kotlin.backend.native.llvm.ContextUtils
import org.jetbrains.kotlin.backend.konan.llvm.Context
import org.jetbrains.kotlin.backend.konan.llvm.ContextUtils
import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.util.DumpIrTreeVisitor
import java.io.StringWriter
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.*
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt
+2 -2
View File
@@ -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.ClassKind.*
@@ -31,4 +31,4 @@ internal val ClassDescriptor.symbolName: String
} + fqNameSafe
internal val ClassDescriptor.typeInfoSymbolName: String
get() = "ktype:" + this.fqNameSafe.toString()
get() = "ktype:" + this.fqNameSafe.toString()
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt
+4 -4
View File
@@ -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.memScoped
import llvm.*
import org.jetbrains.kotlin.backend.native.implementation
import org.jetbrains.kotlin.backend.native.implementedInterfaces
import org.jetbrains.kotlin.backend.native.isInterface
import org.jetbrains.kotlin.backend.konan.implementation
import org.jetbrains.kotlin.backend.konan.implementedInterfaces
import org.jetbrains.kotlin.backend.konan.isInterface
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.name.FqName
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import kotlin_native.interop.*
import llvm.*
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticData.kt → backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticData.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import llvm.*
@@ -108,4 +108,4 @@ internal class StaticData(override val context: Context): ContextUtils {
return global
}
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticDataUtils.kt → backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticDataUtils.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import llvm.*
@@ -24,4 +24,4 @@ internal fun StaticData.placeGlobalConstArray(name: String,
internal fun StaticData.createAlias(name: String, aliasee: ConstPointer): ConstPointer {
val alias = LLVMAddAlias(context.llvmModule, aliasee.getLlvmType(), aliasee.getLlvmValue(), name)!!
return constPointer(alias)
}
}
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticObjects.kt → backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jetbrains.kotlin.backend.native.llvm
package org.jetbrains.kotlin.backend.konan.llvm
import llvm.*
import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -53,4 +53,4 @@ internal fun StaticData.createStringLiteral(value: IrConst<String>): ConstPointe
LLVMSetLinkage(res.getLlvmValue(), LLVMLinkage.LLVMWeakAnyLinkage)
return res
}
}