Use ErrorOS for log messages as well as error

[sbc100]

Summary

These log messages are also diagnostics so it seems like
they should to the same place as errors and debug
messages.

Without this change when I enable --verbose those messages
go to stdout, but when I enable "-mllvm -debug" those messages
go to stderr (because dbgs() goes to stderr by default).

So I end up having to do this a lot:
lld <args> > output_message 2>&1

[sbc100]

• cleanup

[ruiu]

I agree that log should go to stderr, but I think message should still go to stdout. We have that function to print out a regular message, such as printing out version information or some hint message. We have this function mainly because we want to acquire the global lock before printing out something in the multithreaded environment.

[sbc100]

• feedback

[ruiu]

LGTM

[sbc100]

• update tests

lld/trunk/Common/ErrorHandler.cpp

void ErrorHandler::print(StringRef S, raw_ostream::Colors C) {
   } else {
     *ErrorOS << S;
   }
 }
 
 void ErrorHandler::log(const Twine &Msg) {
   if (Verbose) {
     std::lock_guard<std::mutex> Lock(Mu);
-    outs() << LogName << ": " << Msg << "\n";
-    outs().flush();
+    *ErrorOS << LogName << ": " << Msg << "\n";
   }
 }
 
 void ErrorHandler::message(const Twine &Msg) {
   std::lock_guard<std::mutex> Lock(Mu);
   outs() << Msg << "\n";
   outs().flush();
 }

lld/trunk/test/COFF/libpath.test

 # RUN: mkdir -p %t/a %t/b %t/c
 # RUN: cp %p/Inputs/std64.lib %t/a/
 # RUN: cp %p/Inputs/std64.lib %t/b/
 # RUN: cp %p/Inputs/std64.lib %t/c/
 
 # RUN: env LIB=%t/a lld-link /out:%t.exe /entry:main /verbose \
 # RUN:   std64.lib /subsystem:console %p/Inputs/hello64.obj \
-# RUN:   /libpath:%t/b /libpath:%t/c > %t.log
+# RUN:   /libpath:%t/b /libpath:%t/c 2> %t.log
 # RUN: FileCheck -check-prefix=CHECK1 %s < %t.log
 
 CHECK1: b{{[/\\]}}std64.lib
 
 # RUN: lld-link /out:%t.exe /entry:main /verbose \
 # RUN:   std64.lib /subsystem:console %p/Inputs/hello64.obj \
-# RUN:   /libpath:%t/a /libpath:%t/b /libpath:%t/c > %t.log
+# RUN:   /libpath:%t/a /libpath:%t/b /libpath:%t/c 2> %t.log
 # RUN: FileCheck -check-prefix=CHECK2 %s < %t.log
 
 CHECK2: a{{[/\\]}}std64.lib

lld/trunk/test/COFF/msvclto-archive.ll

 ; REQUIRES: x86
 ;; Make sure we re-create archive files to strip bitcode files.
 
 ;; Do not create empty archives because the MSVC linker
 ;; doesn't support them.
 ; RUN: llvm-as -o %t.obj %s
 ; RUN: rm -f %t-main1.a
 ; RUN: llvm-ar cru %t-main1.a %t.obj
 ; RUN: mkdir -p %t.dir
 ; RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t.dir/bitcode.obj %p/Inputs/msvclto.s
 ; RUN: lld-link %t-main1.a %t.dir/bitcode.obj /msvclto /out:%t.exe /opt:lldlto=1 /opt:icf \
-; RUN:   /entry:main /verbose > %t.log || true
+; RUN:   /entry:main /verbose 2> %t.log || true
 ; RUN: FileCheck -check-prefix=BC %s < %t.log
 ; BC-NOT: Creating a temporary archive for
 
 ; RUN: rm -f %t-main2.a
 ; RUN: llvm-ar cru %t-main2.a %t.dir/bitcode.obj
 ; RUN: lld-link %t.obj %t-main2.a /msvclto /out:%t.exe /opt:lldlto=1 /opt:icf \
-; RUN:   /entry:main /verbose > %t.log || true
+; RUN:   /entry:main /verbose 2> %t.log || true
 ; RUN: FileCheck -check-prefix=OBJ %s < %t.log
 ; OBJ-NOT: Creating a temporary archive
 
 ;; Make sure that we always rebuild thin archives because
 ;; the MSVC linker doesn't support thin archives.
 ; RUN: rm -f %t-main3.a
 ; RUN: llvm-ar cruT %t-main3.a %t.dir/bitcode.obj
 ; RUN: lld-link %t.obj %t-main3.a /msvclto /out:%t.exe /opt:lldlto=1 /opt:icf \
-; RUN:   /entry:main /verbose > %t.log || true
+; RUN:   /entry:main /verbose 2> %t.log || true
 ; RUN: FileCheck -check-prefix=THIN %s < %t.log
 ; THIN: Creating a temporary archive
 
 target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc"
 
 declare void @foo()
 
 define i32 @main() {
   call void @foo()
   ret i32 0
 }

lld/trunk/test/COFF/msvclto-order.ll

 ; REQUIRES: x86
 ; RUN: opt -thinlto-bc %s -o %t.obj
 ; RUN: llc -filetype=obj %S/Inputs/msvclto-order-a.ll -o %T/msvclto-order-a.obj
 ; RUN: llvm-ar crs %T/msvclto-order-a.lib %T/msvclto-order-a.obj
 ; RUN: llc -filetype=obj %S/Inputs/msvclto-order-b.ll -o %T/msvclto-order-b.obj
 ; RUN: llvm-ar crs %T/msvclto-order-b.lib %T/msvclto-order-b.obj
 ; RUN: lld-link /verbose /msvclto /out:%t.exe /entry:main %t.obj \
-; RUN:     %T/msvclto-order-a.lib %T/msvclto-order-b.lib > %t.log || true
+; RUN:     %T/msvclto-order-a.lib %T/msvclto-order-b.lib 2> %t.log || true
 ; RUN: FileCheck %s < %t.log
 
 ; CHECK: : link.exe
 ; CHECK-NOT: .lib{{$}}
 ; CHECK: lld-msvclto-order-a{{.*}}.obj
 ; CHECK-NOT: lld-msvclto-order-b{{.*}}.obj
 ; CHECK: .lib{{$}}
 

lld/trunk/test/COFF/msvclto.ll

 ; REQUIRES: x86
 ; RUN: llvm-as -o %t.obj %s
 ; RUN: mkdir -p %t.dir
 ; RUN: llvm-mc -triple=x86_64-pc-windows-msvc -filetype=obj -o %t.dir/bitcode.obj %p/Inputs/msvclto.s
 ; RUN: lld-link %t.obj %t.dir/bitcode.obj /msvclto /out:%t.exe /opt:lldlto=1 /opt:icf \
-; RUN:   /entry:main /verbose > %t.log || true
+; RUN:   /entry:main /verbose 2> %t.log || true
 ; RUN: FileCheck %s < %t.log
 
 ; CHECK: /opt:icf /entry:main
 ; CHECK: /verbose
 
 target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc"
 
 declare void @foo()
 
 define i32 @main() {
   call void @foo()
   ret i32 0
 }

lld/trunk/test/ELF/icf-absolute.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-absolute.s -o %t2
-# RUN: ld.lld %t %t2 -o %t3 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t %t2 -o %t3 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK: selected .text.f1
 # CHECK:   removed .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   .byte a1
 
 .section .text.f2, "ax"
 f2:
   .byte a2

lld/trunk/test/ELF/icf-comdat.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK: selected .text.f1
 # CHECK:   removed .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 

lld/trunk/test/ELF/icf-i386.s

 # REQUIRES: x86
 # This test is to make sure that we can handle implicit addends properly.
 
 # RUN: llvm-mc -filetype=obj -triple=i386-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK:     selected .text.f1
 # CHECK:       removed .text.f2
 # CHECK-NOT:   removed .text.f3
 
 .globl _start, f1, f2, f3
 _start:
   ret

lld/trunk/test/ELF/icf-merge-sec.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge-sec.s -o %t2
-# RUN: ld.lld %t %t2 -o %t3 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t %t2 -o %t3 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK: selected .text.f1
 # CHECK:   removed .text.f2
 
 .section .rodata.str,"aMS",@progbits,1
 .asciz "foo"
 .asciz "string 1"
 .asciz "string 2"
 
 .section .text.f1,"ax"
 .globl f1
 f1:
 .quad .rodata.str

lld/trunk/test/ELF/icf-merge.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge.s -o %t1
-# RUN: ld.lld %t %t1 -o %t1.out --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t %t1 -o %t1.out --icf=all --verbose 2>&1 | FileCheck %s
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge2.s -o %t2
-# RUN: ld.lld %t %t2 -o %t3.out --icf=all --verbose | FileCheck --check-prefix=NOMERGE %s
+# RUN: ld.lld %t %t2 -o %t3.out --icf=all --verbose 2>&1 | FileCheck --check-prefix=NOMERGE %s
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/icf-merge3.s -o %t3
-# RUN: ld.lld %t %t3 -o %t3.out --icf=all --verbose | FileCheck --check-prefix=NOMERGE %s
+# RUN: ld.lld %t %t3 -o %t3.out --icf=all --verbose 2>&1 | FileCheck --check-prefix=NOMERGE %s
 
 # CHECK: selected .text.f1
 # CHECK:   removed .text.f2
 
 # NOMERGE-NOT: selected .text.f
 
 .section .rodata.str,"aMS",@progbits,1
 foo:
 .asciz "foo"
 .asciz "string 1"
 .asciz "string 2"
 
 .section .text.f1,"ax"
 .globl f1
 f1:
 lea foo+42(%rip), %rax

lld/trunk/test/ELF/icf-non-mergeable.s

 // REQUIRES: x86
 
 // This file contains two functions. They are themselves identical,
 // but because they have relocations against different data sections,
 // they are not mergeable.
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux \
 // RUN:    %p/Inputs/icf-non-mergeable.s -o %t2
 
-// RUN: ld.lld %t1 %t2 -o %t3 --icf=all --verbose | FileCheck %s
+// RUN: ld.lld %t1 %t2 -o %t3 --icf=all --verbose 2>&1 | FileCheck %s
 
 // CHECK-NOT: selected .text.f1
 // CHECK-NOT:   removed .text.f2
 
 .globl _start, f1, f2, d1, d2
 _start:
   ret
 

lld/trunk/test/ELF/icf-none.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --icf=none --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --icf=none --verbose 2>&1 | FileCheck %s
 
 # CHECK-NOT: selected .text.f1
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"

lld/trunk/test/ELF/icf1.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK: selected .text.f1
 # CHECK:   removed .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 

lld/trunk/test/ELF/icf2.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/icf2.s -o %t2
-# RUN: ld.lld %t1 %t2 -o %t --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t1 %t2 -o %t --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK: selected .text.f1
 # CHECK:   removed .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $60, %rdi
   call f2

lld/trunk/test/ELF/icf3.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/icf2.s -o %t2
-# RUN: ld.lld %t1 %t2 -o %t --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t1 %t2 -o %t --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK-NOT: Selected .text.f1
 # CHECK-NOT: Selected .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 
 # This section is not mergeable because the content is different from f2.
 .section .text.f1, "ax"
 f1:
   mov $60, %rdi
   call f2
   mov $0, %rax

lld/trunk/test/ELF/icf4.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK-NOT: Selected .text.f1
 # CHECK-NOT: Selected .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $1, %rax
 
 .section .text.f2, "ax"
 f2:
   mov $0, %rax

lld/trunk/test/ELF/icf5.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK-NOT: Selected .text.f1
 # CHECK-NOT: Selected .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   mov $0, %rax
 
 .section .text.f2, "awx"
 f2:
   mov $0, %rax

lld/trunk/test/ELF/icf6.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 
 # CHECK-NOT: Selected .text.f1
 # CHECK-NOT: Selected .text.f2
 
 .globl _start, f1, f2
 _start:
   ret
 

lld/trunk/test/ELF/icf7.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 # RUN: llvm-objdump -t %t2 | FileCheck -check-prefix=ALIGN %s
 
 # CHECK: selected .text.f1
 # CHECK:   removed .text.f2
 
 # ALIGN: 0000000000201000 .text 00000000 _start
 # ALIGN: 0000000000201100 .text 00000000 f1
 

lld/trunk/test/ELF/icf9.s

 # REQUIRES: x86
 
 ### Make sure that we do not merge data.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-# RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
+# RUN: ld.lld %t -o %t2 --icf=all --verbose 2>&1 | FileCheck %s
 # RUN: llvm-readelf -S -W %t2 | FileCheck --check-prefix=SEC %s
 
 # SEC:  .rodata      PROGBITS  0000000000200120 000120 000002 00 A 0 0 1
 
 # CHECK-NOT: selected .rodata.d1
 # CHECK-NOT: selected .rodata.d2
 
 .globl _start, d1, d2