[llvm-branch-commits] [llvm-branch] r291914 - Merging r291863:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Jan 13 10:57:29 2017
New Revision: 291914

URL: http://llvm.org/viewvc/llvm-project?rev=291914&view=rev
Log:
Merging r291863:
------------------------------------------------------------------------
r291863 | chapuni | 2017-01-12 16:17:15 -0800 (Thu, 12 Jan 2017) | 1 line

xray-account: Avoid std::errc::bad_message to appease mingw.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/   (props changed)
    llvm/branches/release_40/tools/llvm-xray/xray-account.cc

Propchange: llvm/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 10:57:29 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241
+/llvm/trunk:155241,291863

Modified: llvm/branches/release_40/tools/llvm-xray/xray-account.cc
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/tools/llvm-xray/xray-account.cc?rev=291914&r1=291913&r2=291914&view=diff
==============================================================================
--- llvm/branches/release_40/tools/llvm-xray/xray-account.cc (original)
+++ llvm/branches/release_40/tools/llvm-xray/xray-account.cc Fri Jan 13 10:57:29 2017
@@ -463,7 +463,7 @@ static CommandRegistration Unused(&Accou
         return make_error<StringError>(
             Twine("Failed accounting function calls in file '") + AccountInput +
                 "'.",
-            std::make_error_code(std::errc::bad_message));
+            std::make_error_code(std::errc::executable_format_error));
     }
     switch (AccountOutputFormat) {
     case AccountOutputFormats::TEXT: