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

Merge branch 'proper-inline' into inline

Browse Source 
# Conflicts:
#	backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanLower.kt
#	backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
#	backend.native/tests/build.gradle
#	backend.native/tests/codegen/inline/inline5.kt
#	gradle.properties
This commit is contained in:
Konstantin Anisimov
2017-02-03 11:18:47 +07:00
parent 69661444ce c745af1fe8
commit bdbb5d7b94
10 changed files with 161 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/tests/build.gradle
+7 -22
View File
@@ -860,11 +860,6 @@ task memory_throw_cleanup(type: RunKonanTest) {
source = "runtime/memory/throw_cleanup.kt"
}
task memory_collect_cycles(type: RunKonanTest) {
goldValue = "42\n"
source = "runtime/memory/cycles0.kt"
}
task unit1(type: RunKonanTest) {
goldValue = "First\nkotlin.Unit\n"
source = "codegen/basics/unit1.kt"
@@ -906,26 +901,16 @@ task inline3(type: RunKonanTest) {
}
task inline4(type: RunKonanTest) {
goldValue = "1\n"
goldValue = "3\n"
source = "codegen/inline/inline4.kt"
}
//task inline5(type: RunKonanTest) {
// goldValue = "1\n"
// source = "codegen/inline/inline5.kt"
//}
task inline6(type: RunKonanTest) {
goldValue = "hello1\nhello2\nhello3\nhello4\n"
source = "codegen/inline/inline6.kt"
task inline5(type: RunKonanTest) {
goldValue = "33\n"
source = "codegen/inline/inline5.kt"
}
task inline7(type: RunKonanTest) {
goldValue = "1\n2\n3\n"
source = "codegen/inline/inline7.kt"
}
task inline8(type: RunKonanTest) {
goldValue = "5\n"
source = "codegen/inline/inline8.kt"
task inline9(type: RunKonanTest) {
goldValue = "hello\n6\n"
source = "codegen/inline/inline9.kt"
}