[Orc] Remove the 'takeOwnershipOfBuffers' kludge.

[oota-llvm.git] / utils / not / not.cpp

diff --git a/utils/not/not.cpp b/utils/not/not.cpp
index af942500186474bb390347ef053c1ed6d5b49e23..23062fb323d7fdef7f10591bfa83f82508a54376 100644 (file)
--- a/utils/not/not.cpp
+++ b/utils/not/not.cpp
@@ -6,6 +6,11 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+// Usage:
+//   not cmd
+//     Will return true if cmd doesn't crash and returns false.
+//   not --crash cmd
+//     Will return true if cmd crashes (e.g. for testing crash reporting).
 
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
@@ -27,16 +32,22 @@ int main(int argc, const char **argv) {
   if (argc == 0)
     return 1;
 
-  std::string Program = sys::FindProgramByName(argv[0]);
+  auto Program = sys::findProgramByName(argv[0]);
+  if (!Program) {
+    errs() << "Error: Unable to find `" << argv[0]
+           << "' in PATH: " << Program.getError().message() << "\n";
+    return 1;
+  }
 
   std::string ErrMsg;
-  int Result = sys::ExecuteAndWait(Program, argv, nullptr, nullptr, 0, 0,
+  int Result = sys::ExecuteAndWait(*Program, argv, nullptr, nullptr, 0, 0,
                                    &ErrMsg);
 #ifdef _WIN32
-  // Handle abort() in msvcrt -- It has exit code as 3.
-  // abort(), aka unreachable, may be handled as crash.
-  // FIXME: Could we move this into Win32/Program.inc?
-  if (Result == 3)
+  // Handle abort() in msvcrt -- It has exit code as 3.  abort(), aka
+  // unreachable, should be recognized as a crash.  However, some binaries use
+  // exit code 3 on non-crash failure paths, so only do this if we expect a
+  // crash.
+  if (ExpectCrash && Result == 3)
     Result = -3;
 #endif
   if (Result < 0) {