From 41181d140c99913f8c8d73791dd4babfcba8a73d Mon Sep 17 00:00:00 2001 From: Joey Gouly Date: Sun, 8 Jun 2014 21:28:54 +0000 Subject: [PATCH] Convert tests I recently add to use -verify instead of FileCheck. This uncovered something strange. Diagnostics for InlineAsm have source locations that don't really map to where they are within the .c source file. llvm-svn: 210440 --- clang/test/CodeGen/arm-asm-deprecated.c | 13 +++++++++---- clang/test/CodeGen/x86-64-inline-asm.c | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/clang/test/CodeGen/arm-asm-deprecated.c b/clang/test/CodeGen/arm-asm-deprecated.c index d3229a6..1d7399a 100644 --- a/clang/test/CodeGen/arm-asm-deprecated.c +++ b/clang/test/CodeGen/arm-asm-deprecated.c @@ -1,8 +1,13 @@ // REQUIRES: arm-registered-target -// RUN: %clang_cc1 -triple armv8 -target-feature +neon %s -S -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-v8 -// RUN: not %clang_cc1 -triple armv8 -target-feature +neon %s -S -o /dev/null -Werror 2>&1 | FileCheck %s --check-prefix=CHECK-v8-Werror +// RUN: %clang_cc1 -triple armv8 -target-feature +neon %s -S -o /dev/null -verify -DWARN +// RUN: %clang_cc1 -triple armv8 -target-feature +neon %s -S -o /dev/null -Werror -verify void set_endian() { - asm("setend be"); // CHECK-v8: warning: deprecated - // CHECK-v8-Werror: error: deprecated + asm("setend be"); +// expected-note@1 {{instantiated into assembly here}} +#ifdef WARN +// expected-warning@-3 {{deprecated}} +#else +// expected-error@-5 {{deprecated}} +#endif } diff --git a/clang/test/CodeGen/x86-64-inline-asm.c b/clang/test/CodeGen/x86-64-inline-asm.c index 666d4c0..fefbf76 100644 --- a/clang/test/CodeGen/x86-64-inline-asm.c +++ b/clang/test/CodeGen/x86-64-inline-asm.c @@ -1,7 +1,12 @@ // REQUIRES: x86-registered-target -// RUN: %clang_cc1 -triple x86_64 %s -S -o /dev/null 2>&1 | FileCheck %s -// RUN: not %clang_cc1 -triple x86_64 %s -S -o /dev/null -Werror 2>&1 | FileCheck %s --check-prefix=CHECK-Werror +// RUN: %clang_cc1 -triple x86_64 %s -S -o /dev/null -DWARN -verify +// RUN: %clang_cc1 -triple x86_64 %s -S -o /dev/null -Werror -verify void f() { - asm("movaps %xmm3, (%esi, 2)"); // CHECK: warning: scale factor without index register is ignored - // CHECK-Werror: error: scale factor without index register is ignored + asm("movaps %xmm3, (%esi, 2)"); +// expected-note@1 {{instantiated into assembly here}} +#ifdef WARN +// expected-warning@-3 {{scale factor without index register is ignored}} +#else +// expected-error@-5 {{scale factor without index register is ignored}} +#endif } -- 2.7.4