From 98a9203d80b6a5ff90edf037b1595f553fc81b15 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Thu, 27 Oct 2011 07:11:43 +0000 Subject: [PATCH] Move these test from checking assembly to checking LLVM IR. Should fix fallout from r143097. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143098 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/2009-10-20-GlobalDebug.c | 7 ++++--- test/CodeGenCXX/debug-info-char16.cpp | 7 ++----- test/CodeGenCXX/debug-info-nullptr.cpp | 9 ++++----- test/CodeGenObjC/debug-info-block-helper.m | 4 ++-- test/CodeGenObjC/debug-info-getter-name.m | 8 ++------ test/CodeGenObjC/debug-info-pubtypes.m | 9 ++------- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/test/CodeGen/2009-10-20-GlobalDebug.c b/test/CodeGen/2009-10-20-GlobalDebug.c index 42f020e39e..6f329d5368 100644 --- a/test/CodeGen/2009-10-20-GlobalDebug.c +++ b/test/CodeGen/2009-10-20-GlobalDebug.c @@ -1,9 +1,10 @@ // REQUIRES: x86-registered-target -// RUN: %clang -ccc-host-triple i386-apple-darwin10 -S -g -dA %s -o - | FileCheck %s +// RUN: %clang -ccc-host-triple i386-apple-darwin10 -flto -S -g %s -o - | FileCheck %s int global; -// CHECK: ascii "localstatic" ## DW_AT_name -// CHECK: asciz "global" ## External Name int main() { static int localstatic; return 0; } + +// CHECK: !14 = metadata !{i32 720948, i32 0, metadata !5, metadata !"localstatic", metadata !"localstatic", metadata !"", metadata !6, i32 5, metadata !9, i32 1, i32 1, i32* @main.localstatic} ; [ DW_TAG_variable ] +// CHECK: !15 = metadata !{i32 720948, i32 0, null, metadata !"global", metadata !"global", metadata !"", metadata !6, i32 3, metadata !9, i32 0, i32 1, i32* @global} ; [ DW_TAG_variable ] diff --git a/test/CodeGenCXX/debug-info-char16.cpp b/test/CodeGenCXX/debug-info-char16.cpp index da8ca051da..28d7c0df7e 100644 --- a/test/CodeGenCXX/debug-info-char16.cpp +++ b/test/CodeGenCXX/debug-info-char16.cpp @@ -1,9 +1,6 @@ -// RUN: %clang_cc1 -S -std=c++11 -masm-verbose -g %s -o -| FileCheck %s - -//CHECK: .ascii "char16_t" -//CHECK-NEXT: .byte 0 -//CHECK-NEXT: .byte 16 +// RUN: %clang_cc1 -emit-llvm -std=c++11 -g %s -o -| FileCheck %s // 16 is DW_ATE_UTF (0x10) encoding attribute. char16_t char_a = u'h'; +// CHECK: !7 = metadata !{i32 720932, null, metadata !"char16_t", null, i32 0, i64 16, i64 16, i64 0, i32 0, i32 16} ; [ DW_TAG_base_type ] diff --git a/test/CodeGenCXX/debug-info-nullptr.cpp b/test/CodeGenCXX/debug-info-nullptr.cpp index 588dc5f3c3..49cc42c96f 100644 --- a/test/CodeGenCXX/debug-info-nullptr.cpp +++ b/test/CodeGenCXX/debug-info-nullptr.cpp @@ -1,8 +1,7 @@ -// RUN: %clang_cc1 -S -std=c++11 -masm-verbose -g %s -o -| FileCheck %s - -//CHECK: DW_TAG_unspecified_type -//CHECK-NEXT: "nullptr_t" +// RUN: %clang_cc1 -emit-llvm -std=c++11 -g %s -o -| FileCheck %s void foo() { decltype(nullptr) t = 0; - } +} + +// CHECK: !13 = metadata !{i32 720955, null, metadata !"nullptr_t", null, i32 0, i64 0, i64 0, i64 0, i32 0, i32 0} ; [ DW_TAG_unspecified_type ] diff --git a/test/CodeGenObjC/debug-info-block-helper.m b/test/CodeGenObjC/debug-info-block-helper.m index 644e458bbd..a290f0e51f 100644 --- a/test/CodeGenObjC/debug-info-block-helper.m +++ b/test/CodeGenObjC/debug-info-block-helper.m @@ -1,8 +1,8 @@ // REQUIRES: x86-64-registered-target -// RUN: %clang_cc1 -masm-verbose -S -fblocks -g -triple x86_64-apple-darwin10 -fobjc-fragile-abi %s -o - | FileCheck %s +// RUN: %clang_cc1 -emit-llvm -fblocks -g -triple x86_64-apple-darwin10 -fobjc-fragile-abi %s -o - | FileCheck %s extern void foo(void(^)(void)); -// CHECK: .ascii "__destroy_helper_block_" ## DW_AT_name +// CHECK: !36 = metadata !{i32 720942, i32 0, metadata !6, metadata !"__destroy_helper_block_", metadata !"__destroy_helper_block_", metadata !"", metadata !6, i32 24, metadata !37, i1 true, i1 true, i32 0, i32 0, i32 0, i32 256, i1 false, void (i8*)* @__destroy_helper_block_, null, null, metadata !39} ; [ DW_TAG_subprogram ] @interface NSObject { struct objc_object *isa; diff --git a/test/CodeGenObjC/debug-info-getter-name.m b/test/CodeGenObjC/debug-info-getter-name.m index e7d3a9a874..fe28b12ac0 100644 --- a/test/CodeGenObjC/debug-info-getter-name.m +++ b/test/CodeGenObjC/debug-info-getter-name.m @@ -1,11 +1,7 @@ // REQUIRES: x86-64-registered-target -// RUN: %clang_cc1 -fno-dwarf2-cfi-asm -triple x86_64-apple-darwin10 -fexceptions -fobjc-exceptions -S -g %s -o - | FileCheck %s +// RUN: %clang_cc1 -emit-llvm -triple x86_64-apple-darwin10 -fexceptions -fobjc-exceptions -g %s -o - | FileCheck %s -//CHECK: "-[InstanceVariablesEverywhereButTheInterface someString]": -//CHECK: .quad "-[InstanceVariablesEverywhereButTheInterface someString]" -//CHECK: .ascii "-[InstanceVariablesEverywhereButTheInterface someString]" -//CHECK: .asciz "-[InstanceVariablesEverywhereButTheInterface someString]" -//CHECK: "-[InstanceVariablesEverywhereButTheInterface someString].eh": +// CHECK: !30 = metadata !{i32 720942, i32 0, metadata !6, metadata !"-[InstanceVariablesEverywhereButTheInterface someString]", metadata !"-[InstanceVariablesEverywhereButTheInterface someString]", metadata !"", metadata !6, i32 27, metadata !31, i1 true, i1 true, i32 0, i32 0, i32 0, i32 320, i1 false, %1* (%0*, i8*)* @"\01-[InstanceVariablesEverywhereButTheInterface someString]", null, null, metadata !33} ; [ DW_TAG_subprogram ] //rdar: //8498026 diff --git a/test/CodeGenObjC/debug-info-pubtypes.m b/test/CodeGenObjC/debug-info-pubtypes.m index 744a366ce7..c79dbb41fe 100644 --- a/test/CodeGenObjC/debug-info-pubtypes.m +++ b/test/CodeGenObjC/debug-info-pubtypes.m @@ -1,12 +1,7 @@ // REQUIRES: x86-64-registered-target -// RUN: %clang -cc1 -triple x86_64-apple-darwin10 -g -S %s -o %t -// RUN: FileCheck %s < %t +// RUN: %clang -cc1 -triple x86_64-apple-darwin10 -g -emit-llvm %s -o - | FileCheck %s -//CHECK: .long Lset6 -//CHECK-NEXT: .long -//CHECK-NEXT: .asciz "H" -//CHECK-NEXT: .long 0 -//CHECK-NEXT: Lpubtypes_end1: +// CHECK: !10 = metadata !{i32 720915, metadata !6, metadata !"H", metadata !6, i32 6, i64 0, i64 8, i32 0, i32 512, i32 0, metadata !2, i32 16, i32 0} ; [ DW_TAG_structure_type ] @interface H -(void) foo; -- 2.40.0