From 5bc6d0fbe4fe03fe1a9f7bc2aead08c233e9e885 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 8 Nov 2013 21:28:00 +0000 Subject: [PATCH] Make -fdump-vtable-layouts print to stdout, not stderr This makes it consistent with -fdump-record-layouts, which was moved to outs() in r186219. My reasoning for going with stdout is that when one of these options is present, the layouts are really a program output, and shouldn't be interleaved with diagnostics, which are on stderr. Reviewers: timurrrr Differential Revision: http://llvm-reviews.chandlerc.com/D2127 llvm-svn: 194279 --- clang/lib/AST/VTableBuilder.cpp | 6 +++--- ...icrosoft-abi-vtables-multiple-nonvirtual-inheritance.cpp | 4 ++-- .../CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp | 6 +++--- .../microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp | 6 +++--- .../microsoft-abi-vtables-virtual-inheritance.cpp | 4 ++-- clang/test/CodeGenCXX/vtable-layout.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/clang/lib/AST/VTableBuilder.cpp b/clang/lib/AST/VTableBuilder.cpp index fd768d812609..5f7ae0f3ff4a 100644 --- a/clang/lib/AST/VTableBuilder.cpp +++ b/clang/lib/AST/VTableBuilder.cpp @@ -997,7 +997,7 @@ public: LayoutVTable(); if (Context.getLangOpts().DumpVTableLayouts) - dumpLayout(llvm::errs()); + dumpLayout(llvm::outs()); } uint64_t getNumThunks() const { @@ -2596,7 +2596,7 @@ public: LayoutVFTable(); if (Context.getLangOpts().DumpVTableLayouts) - dumpLayout(llvm::errs()); + dumpLayout(llvm::outs()); } uint64_t getNumThunks() const { return Thunks.size(); } @@ -3292,7 +3292,7 @@ void MicrosoftVTableContext::computeVTableRelatedInformation( MethodVFTableLocations.insert(NewMethodLocations.begin(), NewMethodLocations.end()); if (Context.getLangOpts().DumpVTableLayouts) - dumpMethodLocations(RD, NewMethodLocations, llvm::errs()); + dumpMethodLocations(RD, NewMethodLocations, llvm::outs()); } void MicrosoftVTableContext::dumpMethodLocations( diff --git a/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp b/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp index c3f1ab08b3eb..d93dee11cdee 100644 --- a/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp +++ b/clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -fdump-vtable-layouts -o - >%t 2>&1 +// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -o %t.ll -fdump-vtable-layouts >%t // RUN: FileCheck --check-prefix=NO-THUNKS-Test1 %s < %t // RUN: FileCheck --check-prefix=NO-THUNKS-Test2 %s < %t @@ -24,7 +24,7 @@ // RUN: FileCheck --check-prefix=RET-THUNKS-Test5 %s < %t // RUN: FileCheck --check-prefix=RET-THUNKS-Test6 %s < %t -// RUN: FileCheck --check-prefix=MANGLING %s < %t +// RUN: FileCheck --check-prefix=MANGLING %s < %t.ll struct Empty { // Doesn't have a vftable! diff --git a/clang/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp b/clang/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp index 4a0a76dbf2c5..6fe12b0ef07b 100644 --- a/clang/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp +++ b/clang/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp @@ -1,6 +1,6 @@ -// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -fdump-vtable-layouts -o - > %t 2>&1 -// RUN: FileCheck --check-prefix=EMITS-VFTABLE %s < %t -// RUN: FileCheck --check-prefix=NO-VFTABLE %s < %t +// RUN: %clang_cc1 %s -fno-rtti -cxx-abi microsoft -triple=i386-pc-win32 -emit-llvm -fdump-vtable-layouts -o %t.ll > %t +// RUN: FileCheck --check-prefix=EMITS-VFTABLE %s < %t.ll +// RUN: FileCheck --check-prefix=NO-VFTABLE %s < %t.ll // RUN: FileCheck --check-prefix=CHECK-A %s < %t // RUN: FileCheck --check-prefix=CHECK-B %s < %t // RUN: FileCheck --check-prefix=CHECK-C %s < %t diff --git a/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp b/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp index 67e85053fde9..3fef0e409349 100644 --- a/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp +++ b/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fno-rtti -emit-llvm -fdump-vtable-layouts %s -o - -cxx-abi microsoft -triple=i386-pc-win32 >%t 2>&1 +// RUN: %clang_cc1 -fno-rtti -emit-llvm -fdump-vtable-layouts %s -o %t.ll -cxx-abi microsoft -triple=i386-pc-win32 >%t // RUN: FileCheck --check-prefix=VTABLE-SIMPLE-A %s < %t // RUN: FileCheck --check-prefix=VTABLE-SIMPLE-B %s < %t // RUN: FileCheck --check-prefix=VTABLE-SIMPLE-C %s < %t @@ -10,10 +10,10 @@ // RUN: FileCheck --check-prefix=VTABLE-EXTENDED-G %s < %t // RUN: FileCheck --check-prefix=VTABLE-EXTENDED-H %s < %t // RUN: FileCheck --check-prefix=VTABLE-PR17738-A %s < %t -// RUN: FileCheck --check-prefix=MANGLING %s < %t +// RUN: FileCheck --check-prefix=MANGLING %s < %t.ll // For now, just make sure x86_64 doesn't crash. -// RUN: %clang_cc1 -fno-rtti -emit-llvm -fdump-vtable-layouts %s -o - -cxx-abi microsoft -triple=x86_64-pc-win32 >%t 2>&1 +// RUN: %clang_cc1 -fno-rtti -emit-llvm-only -fdump-vtable-layouts %s -cxx-abi microsoft -triple=x86_64-pc-win32 >/dev/null struct V1 { virtual void f(); diff --git a/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp b/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp index 781e4adbc56b..b58a0b14cdcd 100644 --- a/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp +++ b/clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fno-rtti -emit-llvm -fdump-vtable-layouts %s -o - -cxx-abi microsoft -triple=i386-pc-win32 >%t 2>&1 +// RUN: %clang_cc1 -fno-rtti -emit-llvm -o %t.ll -fdump-vtable-layouts %s -cxx-abi microsoft -triple=i386-pc-win32 >%t // RUN: FileCheck --check-prefix=VTABLE-C %s < %t // RUN: FileCheck --check-prefix=VTABLE-D %s < %t @@ -24,7 +24,7 @@ // RUN: FileCheck --check-prefix=RET-T %s < %t // RUN: FileCheck --check-prefix=RET-V %s < %t -// RUN: FileCheck --check-prefix=MANGLING %s < %t +// RUN: FileCheck --check-prefix=MANGLING %s < %t.ll struct Empty { }; diff --git a/clang/test/CodeGenCXX/vtable-layout.cpp b/clang/test/CodeGenCXX/vtable-layout.cpp index fa06e67ac087..ca5384d6e031 100644 --- a/clang/test/CodeGenCXX/vtable-layout.cpp +++ b/clang/test/CodeGenCXX/vtable-layout.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm-only -fdump-vtable-layouts > %t 2>&1 +// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin10 -emit-llvm-only -fdump-vtable-layouts > %t // RUN: FileCheck --check-prefix=CHECK-1 %s < %t // RUN: FileCheck --check-prefix=CHECK-2 %s < %t // RUN: FileCheck --check-prefix=CHECK-3 %s < %t