Index: Common/ErrorHandler.cpp
===================================================================
--- Common/ErrorHandler.cpp
+++ Common/ErrorHandler.cpp
@@ -65,7 +65,18 @@
   raw_svector_ostream OS(S);
   DiagnosticPrinterRawOStream DP(OS);
   DI.print(DP);
-  warn(S);
+  switch (DI.getSeverity()) {
+    case DS_Error:
+      error(S);
+      break;
+    case DS_Warning:
+      warn(S);
+      break;
+    case DS_Remark:
+    case DS_Note:
+      message(S);
+      break;
+  }
 }
 
 void lld::checkError(Error E) {
Index: test/ELF/lto/Inputs/sample-profile.prof
===================================================================
--- /dev/null
+++ test/ELF/lto/Inputs/sample-profile.prof
@@ -0,0 +1 @@
+f:0:0
Index: test/ELF/lto/sample-profile.ll
===================================================================
--- test/ELF/lto/sample-profile.ll
+++ test/ELF/lto/sample-profile.ll
@@ -2,12 +2,13 @@
 ; RUN: opt -module-summary %s -o %t1.o
 ; RUN: opt -module-summary %p/Inputs/thinlto.ll -o %t2.o
 
+; RUN: echo "" > %t.empty.prof
 ; RUN: rm -f %t1.lto.o %t2.lto.o
-; RUN: ld.lld --lto-sample-profile=/dev/null %t1.o %t2.o -o %t3
+; RUN: ld.lld --lto-sample-profile=%p/Inputs/sample-profile.prof %t1.o %t2.o -o %t3
 ; RUN  opt -S %t3.lto.o | FileCheck %s
 
 ; RUN: rm -f %t1.lto.o %t2.lto.o
-; RUN: ld.lld --plugin-opt=sample-profile=/dev/null %t1.o %t2.o -o %t3
+; RUN: ld.lld --plugin-opt=sample-profile=%p/Inputs/sample-profile.prof %t1.o %t2.o -o %t3
 ; RUN  opt -S %t3.lto.o | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Index: test/wasm/lto/diagnostics.ll
===================================================================
--- /dev/null
+++ test/wasm/lto/diagnostics.ll
@@ -0,0 +1,22 @@
+; verify that errors in the LLVM backend during LTO manifest as lld
+; errors
+
+; RUN: llvm-as %s -o %t.o
+; RUN: not wasm-ld --lto-O0 %t.o -o %t2 2>&1 | FileCheck %s
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+define void @_start() {
+  call i8* @foo()
+  ret void
+}
+
+define i8* @foo() {
+  %1 = call i8* @llvm.returnaddress(i32 0)
+  ret i8* %1
+}
+
+declare i8* @llvm.returnaddress(i32)
+
+; CHECK: error: {{.*}} WebAssembly hasn't implemented __builtin_return_address