maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Reid Kleckner 2013-11-08 21:28:00 +00:00
parent b8ab9f52ca
commit 5bc6d0fbe4
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/AST/VTableBuilder.cpp
View File

@ -997,7 +997,7 @@ public:
LayoutVTable(); LayoutVTable();
if (Context.getLangOpts().DumpVTableLayouts) if (Context.getLangOpts().DumpVTableLayouts)
dumpLayout(llvm::errs()); dumpLayout(llvm::outs());
} }
uint64_t getNumThunks() const { uint64_t getNumThunks() const {
@ -2596,7 +2596,7 @@ public:
LayoutVFTable(); LayoutVFTable();
if (Context.getLangOpts().DumpVTableLayouts) if (Context.getLangOpts().DumpVTableLayouts)
dumpLayout(llvm::errs()); dumpLayout(llvm::outs());
} }
uint64_t getNumThunks() const { return Thunks.size(); } uint64_t getNumThunks() const { return Thunks.size(); }
@ -3292,7 +3292,7 @@ void MicrosoftVTableContext::computeVTableRelatedInformation(
MethodVFTableLocations.insert(NewMethodLocations.begin(), MethodVFTableLocations.insert(NewMethodLocations.begin(),
NewMethodLocations.end()); NewMethodLocations.end());
if (Context.getLangOpts().DumpVTableLayouts) if (Context.getLangOpts().DumpVTableLayouts)
dumpMethodLocations(RD, NewMethodLocations, llvm::errs()); dumpMethodLocations(RD, NewMethodLocations, llvm::outs());
} }
void MicrosoftVTableContext::dumpMethodLocations( void MicrosoftVTableContext::dumpMethodLocations(

4
clang/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp
View File

@ -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-Test1 %s < %t
// RUN: FileCheck --check-prefix=NO-THUNKS-Test2 %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-Test5 %s < %t
// RUN: FileCheck --check-prefix=RET-THUNKS-Test6 %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 { struct Empty {
// Doesn't have a vftable! // Doesn't have a vftable!

6
clang/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp
View File

@ -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: %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 // RUN: FileCheck --check-prefix=EMITS-VFTABLE %s < %t.ll
// RUN: FileCheck --check-prefix=NO-VFTABLE %s < %t // RUN: FileCheck --check-prefix=NO-VFTABLE %s < %t.ll
// RUN: FileCheck --check-prefix=CHECK-A %s < %t // RUN: FileCheck --check-prefix=CHECK-A %s < %t
// RUN: FileCheck --check-prefix=CHECK-B %s < %t // RUN: FileCheck --check-prefix=CHECK-B %s < %t
// RUN: FileCheck --check-prefix=CHECK-C %s < %t // RUN: FileCheck --check-prefix=CHECK-C %s < %t

6
clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp
View File

@ -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-A %s < %t
// RUN: FileCheck --check-prefix=VTABLE-SIMPLE-B %s < %t // RUN: FileCheck --check-prefix=VTABLE-SIMPLE-B %s < %t
// RUN: FileCheck --check-prefix=VTABLE-SIMPLE-C %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-G %s < %t
// RUN: FileCheck --check-prefix=VTABLE-EXTENDED-H %s < %t // RUN: FileCheck --check-prefix=VTABLE-EXTENDED-H %s < %t
// RUN: FileCheck --check-prefix=VTABLE-PR17738-A %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. // 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 { struct V1 {
virtual void f(); virtual void f();

4
clang/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp
View File

@ -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-C %s < %t
// RUN: FileCheck --check-prefix=VTABLE-D %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-T %s < %t
// RUN: FileCheck --check-prefix=RET-V %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 { }; struct Empty { };

2
clang/test/CodeGenCXX/vtable-layout.cpp
View File

@ -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-1 %s < %t
// RUN: FileCheck --check-prefix=CHECK-2 %s < %t // RUN: FileCheck --check-prefix=CHECK-2 %s < %t
// RUN: FileCheck --check-prefix=CHECK-3 %s < %t // RUN: FileCheck --check-prefix=CHECK-3 %s < %t