diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/AST/RecordLayoutBuilder.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGRecordLayoutBuilder.cpp | 10 | ||||
| -rw-r--r-- | clang/test/ASTMerge/class.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CodeGen/bitfield-2.c | 2 | ||||
| -rw-r--r-- | clang/test/CodeGen/override-layout.c | 6 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/override-layout.cpp | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp index c9dd2e32cb6..51b1c062e0d 100644 --- a/clang/lib/AST/RecordLayoutBuilder.cpp +++ b/clang/lib/AST/RecordLayoutBuilder.cpp @@ -2423,8 +2423,8 @@ ASTContext::getASTRecordLayout(const RecordDecl *D) const { ASTRecordLayouts[D] = NewEntry; if (getLangOpts().DumpRecordLayouts) { - llvm::errs() << "\n*** Dumping AST Record Layout\n"; - DumpRecordLayout(D, llvm::errs(), getLangOpts().DumpRecordLayoutsSimple); + llvm::outs() << "\n*** Dumping AST Record Layout\n"; + DumpRecordLayout(D, llvm::outs(), getLangOpts().DumpRecordLayoutsSimple); } return *NewEntry; diff --git a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp index 8d692c5f69e..fd86df0bdb4 100644 --- a/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/clang/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -976,11 +976,11 @@ CGRecordLayout *CodeGenTypes::ComputeRecordLayout(const RecordDecl *D, // Dump the layout, if requested. if (getContext().getLangOpts().DumpRecordLayouts) { - llvm::errs() << "\n*** Dumping IRgen Record Layout\n"; - llvm::errs() << "Record: "; - D->dump(); - llvm::errs() << "\nLayout: "; - RL->dump(); + llvm::outs() << "\n*** Dumping IRgen Record Layout\n"; + llvm::outs() << "Record: "; + D->dump(llvm::outs()); + llvm::outs() << "\nLayout: "; + RL->print(llvm::outs()); } #ifndef NDEBUG diff --git a/clang/test/ASTMerge/class.cpp b/clang/test/ASTMerge/class.cpp index 885b65e983a..7b31187c469 100644 --- a/clang/test/ASTMerge/class.cpp +++ b/clang/test/ASTMerge/class.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -emit-pch -o %t.1.ast %S/Inputs/class1.cpp // RUN: %clang_cc1 -emit-pch -o %t.2.ast %S/Inputs/class2.cpp // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s -// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 -Wno-odr | count 0 +// RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 -Wno-odr -Werror // CHECK: class1.cpp:5:8: warning: type 'B' has incompatible definitions in different translation units // CHECK: class1.cpp:6:9: note: field 'y' has type 'float' here diff --git a/clang/test/CodeGen/bitfield-2.c b/clang/test/CodeGen/bitfield-2.c index bec55ffa751..64808155cc5 100644 --- a/clang/test/CodeGen/bitfield-2.c +++ b/clang/test/CodeGen/bitfield-2.c @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -emit-llvm -triple x86_64 -O3 -o %t.opt.ll %s \ -// RUN: -fdump-record-layouts 2> %t.dump.txt +// RUN: -fdump-record-layouts > %t.dump.txt // RUN: FileCheck -check-prefix=CHECK-RECORD < %t.dump.txt %s // RUN: FileCheck -check-prefix=CHECK-OPT < %t.opt.ll %s diff --git a/clang/test/CodeGen/override-layout.c b/clang/test/CodeGen/override-layout.c index 8a108a9f50c..57de8b525dc 100644 --- a/clang/test/CodeGen/override-layout.c +++ b/clang/test/CodeGen/override-layout.c @@ -1,6 +1,6 @@ -// RUN: %clang_cc1 -w -fdump-record-layouts %s 2> %t.layouts -// RUN: %clang_cc1 -w -fdump-record-layouts-simple %s > %t.before 2>&1 -// RUN: %clang_cc1 -w -DPACKED= -DALIGNED16= -fdump-record-layouts-simple -foverride-record-layout=%t.layouts %s > %t.after 2>&1 +// RUN: %clang_cc1 -w -fdump-record-layouts %s > %t.layouts +// RUN: %clang_cc1 -w -fdump-record-layouts-simple %s > %t.before +// RUN: %clang_cc1 -w -DPACKED= -DALIGNED16= -fdump-record-layouts-simple -foverride-record-layout=%t.layouts %s > %t.after // RUN: diff %t.before %t.after // RUN: FileCheck %s < %t.after diff --git a/clang/test/CodeGenCXX/override-layout.cpp b/clang/test/CodeGenCXX/override-layout.cpp index aba4c9179a6..418c4ffab63 100644 --- a/clang/test/CodeGenCXX/override-layout.cpp +++ b/clang/test/CodeGenCXX/override-layout.cpp @@ -1,6 +1,6 @@ -// RUN: %clang_cc1 -fdump-record-layouts-simple %s 2> %t.layouts -// RUN: %clang_cc1 -fdump-record-layouts-simple %s > %t.before 2>&1 -// RUN: %clang_cc1 -DPACKED= -DALIGNED16= -fdump-record-layouts-simple -foverride-record-layout=%t.layouts %s > %t.after 2>&1 +// RUN: %clang_cc1 -fdump-record-layouts-simple %s > %t.layouts +// RUN: %clang_cc1 -fdump-record-layouts-simple %s > %t.before +// RUN: %clang_cc1 -DPACKED= -DALIGNED16= -fdump-record-layouts-simple -foverride-record-layout=%t.layouts %s > %t.after // RUN: diff -u %t.before %t.after // RUN: FileCheck %s < %t.after |
