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

[K/N] Fix filecheck_function_attributes_at_callsite test

Browse Source
This commit is contained in:
Sergey Bogolepov
2022-02-11 13:19:40 +03:00
committed by Space
parent fbbe5cbd03
commit 52c8b6166c
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/backend.native/tests/build.gradle
+2
View File
@@ -6041,6 +6041,8 @@ fileCheckTest("filecheck_signext_zeroext_objc_export") {
fileCheckTest("filecheck_function_attributes_at_callsite") { fileCheckTest("filecheck_function_attributes_at_callsite") {
enabled = (project.testTarget != 'wasm32') // KT-49739 enabled = (project.testTarget != 'wasm32') // KT-49739
// attributes for caller and callee might be the same so we allow overlapping.
additionalFileCheckFlags = ["--allow-deprecated-dag-overlap"]
annotatedSource = project.file('filecheck/function_attributes_at_callsite.kt') annotatedSource = project.file('filecheck/function_attributes_at_callsite.kt')
} }
kotlin-native/backend.native/tests/filecheck/function_attributes_at_callsite.kt
+4 -4
View File
@@ -17,7 +17,7 @@ fun main() {
flameThrower() flameThrower()
} }
// CHECK-DAG: attributes #[[THROW_EXCEPTION_DECLARATION_ATTRIBUTES]] = { noreturn uwtable {{.+}} } // CHECK-DAG: attributes #[[THROW_EXCEPTION_DECLARATION_ATTRIBUTES]] = {{{.*}}noreturn{{.*}}}
// CHECK-DAG: attributes #[[THROW_EXCEPTION_CALLSITE_ATTRIBUTES]] = { noreturn uwtable } // CHECK-DAG: attributes #[[THROW_EXCEPTION_CALLSITE_ATTRIBUTES]] = {{{.*}}noreturn{{.*}}}
// CHECK-DAG: attributes #[[FLAME_THROWER_DECLARATION_ATTRIBUTES]] = { noreturn {{.+}} } // CHECK-DAG: attributes #[[FLAME_THROWER_DECLARATION_ATTRIBUTES]] = {{{.*}}noreturn{{.*}}}
// CHECK-DAG: attributes #[[FLAME_THROWER_CALLSITE_ATTRIBUTES]] = { noreturn } // CHECK-DAG: attributes #[[FLAME_THROWER_CALLSITE_ATTRIBUTES]] = {{{.*}}noreturn{{.*}}}
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/FileCheckTest.kt
+7 -1
View File
@@ -89,10 +89,16 @@ open class FileCheckTest : DefaultTask() {
* Check that [inputFile] matches [annotatedFile] with FileCheck. * Check that [inputFile] matches [annotatedFile] with FileCheck.
*/ */
private fun runFileCheck(annotatedFile: Path, inputFile: Path): ProcessOutput { private fun runFileCheck(annotatedFile: Path, inputFile: Path): ProcessOutput {
val args = mutableListOf(annotatedFile.toAbsolutePath().toString(), "--input-file", inputFile.toAbsolutePath().toString()) val args = mutableListOf(
annotatedFile.toAbsolutePath().toString(),
"--input-file", inputFile.toAbsolutePath().toString()
)
checkPrefix?.let { checkPrefix?.let {
args.addAll(listOf("--check-prefix", it)) args.addAll(listOf("--check-prefix", it))
} }
additionalFileCheckFlags?.let {
args.addAll(it)
}
val platform = project.platformManager.platform(target) val platform = project.platformManager.platform(target)
val configurables = platform.configurables val configurables = platform.configurables
val llvmBin = "${configurables.absoluteLlvmHome}/bin" val llvmBin = "${configurables.absoluteLlvmHome}/bin"