Author: rnk Date: Fri Nov 8 15:28:00 2013 New Revision: 194279 URL: http://llvm.org/viewvc/llvm-project?rev=194279&view=rev Log: 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 Modified: cfe/trunk/lib/AST/VTableBuilder.cpp cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp cfe/trunk/test/CodeGenCXX/vtable-layout.cpp Modified: cfe/trunk/lib/AST/VTableBuilder.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/VTableBuilder.cpp?rev=194279&r1=194278&r2=194279&view=diff ============================================================================== --- cfe/trunk/lib/AST/VTableBuilder.cpp (original) +++ cfe/trunk/lib/AST/VTableBuilder.cpp Fri Nov 8 15:28:00 2013 @@ -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::computeVTab MethodVFTableLocations.insert(NewMethodLocations.begin(), NewMethodLocations.end()); if (Context.getLangOpts().DumpVTableLayouts) - dumpMethodLocations(RD, NewMethodLocations, llvm::errs()); + dumpMethodLocations(RD, NewMethodLocations, llvm::outs()); } void MicrosoftVTableContext::dumpMethodLocations( Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp?rev=194279&r1=194278&r2=194279&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp (original) +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp Fri Nov 8 15:28:00 2013 @@ -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! Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp?rev=194279&r1=194278&r2=194279&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp (original) +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-single-inheritance.cpp Fri Nov 8 15:28:00 2013 @@ -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 Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp?rev=194279&r1=194278&r2=194279&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp (original) +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance-vtordisps.cpp Fri Nov 8 15:28:00 2013 @@ -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(); Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp?rev=194279&r1=194278&r2=194279&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp (original) +++ cfe/trunk/test/CodeGenCXX/microsoft-abi-vtables-virtual-inheritance.cpp Fri Nov 8 15:28:00 2013 @@ -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 { }; Modified: cfe/trunk/test/CodeGenCXX/vtable-layout.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/vtable-layout.cpp?rev=194279&r1=194278&r2=194279&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/vtable-layout.cpp (original) +++ cfe/trunk/test/CodeGenCXX/vtable-layout.cpp Fri Nov 8 15:28:00 2013 @@ -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 _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
