diff options
| -rw-r--r-- | llvm/include/llvm/Support/Program.h | 11 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Program.inc | 18 | ||||
| -rw-r--r-- | llvm/lib/Support/Windows/Program.inc | 17 | 
3 files changed, 0 insertions, 46 deletions
diff --git a/llvm/include/llvm/Support/Program.h b/llvm/include/llvm/Support/Program.h index 42efdb36bdc..e09d66446fc 100644 --- a/llvm/include/llvm/Support/Program.h +++ b/llvm/include/llvm/Support/Program.h @@ -100,17 +100,6 @@ namespace sys {        ///< is non-empty upon return an error occurred while waiting.        ); -    /// This function terminates the program. -    /// @returns true if an error occurred. -    /// @see Execute -    /// @brief Terminates the program. -    bool Kill -    ( std::string* ErrMsg = 0 ///< If non-zero, provides a pointer to a string -      ///< instance in which error messages will be returned. If the string -      ///< is non-empty upon return an error occurred while killing the -      ///< program. -      ); -      /// This static constructor (factory) will attempt to locate a program in      /// the operating system's file system using some pre-determined set of      /// locations to search (e.g. the PATH on Unix). Paths with slashes are diff --git a/llvm/lib/Support/Unix/Program.inc b/llvm/lib/Support/Unix/Program.inc index aac52414f11..c384316e209 100644 --- a/llvm/lib/Support/Unix/Program.inc +++ b/llvm/lib/Support/Unix/Program.inc @@ -389,24 +389,6 @@ Program::Wait(const sys::Path &path,  #endif  } -bool -Program::Kill(std::string* ErrMsg) { -  if (Data_ == 0) { -    MakeErrMsg(ErrMsg, "Process not started!"); -    return true; -  } - -  uint64_t pid64 = reinterpret_cast<uint64_t>(Data_); -  pid_t pid = static_cast<pid_t>(pid64); - -  if (kill(pid, SIGKILL) != 0) { -    MakeErrMsg(ErrMsg, "The process couldn't be killed!"); -    return true; -  } - -  return false; -} -  error_code Program::ChangeStdinToBinary(){    // Do nothing, as Unix doesn't differentiate between text and binary.    return make_error_code(errc::success); diff --git a/llvm/lib/Support/Windows/Program.inc b/llvm/lib/Support/Windows/Program.inc index dc214b82c07..691d6d45550 100644 --- a/llvm/lib/Support/Windows/Program.inc +++ b/llvm/lib/Support/Windows/Program.inc @@ -375,23 +375,6 @@ Program::Wait(const Path &path,    return 1;  } -bool -Program::Kill(std::string* ErrMsg) { -  if (Data_ == 0) { -    MakeErrMsg(ErrMsg, "Process not started!"); -    return true; -  } - -  Win32ProcessInfo* wpi = reinterpret_cast<Win32ProcessInfo*>(Data_); -  HANDLE hProcess = wpi->hProcess; -  if (TerminateProcess(hProcess, 1) == 0) { -    MakeErrMsg(ErrMsg, "The process couldn't be killed!"); -    return true; -  } - -  return false; -} -  error_code Program::ChangeStdinToBinary(){    int result = _setmode( _fileno(stdin), _O_BINARY );    if (result == -1)  | 

