- Fixed broken Win32 build

- Removed warning about clobbered parameter in Bytecode/Reader


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30026 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 24 insertions, 20 deletions

diff --git a/lib/System/Win32/MappedFile.inc b/lib/System/Win32/MappedFile.inc
index d5bedfcfed..877ff52be5 100644
--- a/lib/System/Win32/MappedFile.inc
+++ b/lib/System/Win32/MappedFile.inc
@@ -55,6 +55,8 @@ bool MappedFile::initialize(std::string* ErrMsg) {
     return MakeErrMsg(ErrMsg, 
       std::string("Can't get size of file: ") + path_.toString());
   }
+
+  return false;
 }
 
 void MappedFile::terminate() {
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 96a59ded6f..048bf60297 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -315,12 +315,12 @@ bool Path::makeReadableOnDisk(std::string* ErrMsg) {
   return false;
 }
 
-void Path::makeWriteableOnDisk(std::string* ErrMsg) {
+bool Path::makeWriteableOnDisk(std::string* ErrMsg) {
   DWORD attr = GetFileAttributes(path.c_str());
 
   // If it doesn't exist, we're done.
   if (attr == INVALID_FILE_ATTRIBUTES)
-    return;
+    return false;
 
   if (attr & FILE_ATTRIBUTE_READONLY) {
     if (!SetFileAttributes(path.c_str(), attr & ~FILE_ATTRIBUTE_READONLY)) {
@@ -338,7 +338,11 @@ bool Path::makeExecutableOnDisk(std::string* ErrMsg) {
 
 bool
 Path::getDirectoryContents(std::set<Path>& result, std::string* ErrMsg) const {
-  if (!isDirectory()) {
+  FileStatus Status;
+  if (getFileStatus(Status, ErrMsg))
+    return true;
+
+  if (!Status.isDir) {
     MakeErrMsg(ErrMsg, path + ": not a directory");
     return true;
   }
@@ -512,7 +516,7 @@ Path::createDirectoryOnDisk(bool create_parents, std::string* ErrMsg) {
     // Drop trailing slash.
     pathname[len-1] = 0;
     if (!CreateDirectory(pathname, NULL)) {
-      return MakeErrMsg(, std::string(pathname) + ": Can't create directory: ");
+      return MakeErrMsg(ErrMsg, std::string(pathname) + ": Can't create directory: ");
     }
   }
   return false;
@@ -652,10 +656,12 @@ Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) {
 }
 
 bool
-Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrStr) const {
+Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrMsg) const {
   // FIXME: should work on directories also.
-  if (!isFile()) return true;
-
+  if (!si.isFile) {
+    return true;
+  }
+  
   HANDLE h = CreateFile(path.c_str(),
                         FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES,
                         FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
@@ -671,7 +677,7 @@ Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrStr) const {
     DWORD err = GetLastError();
     CloseHandle(h);
     SetLastError(err);
-    return MakeErrMsg(ErrStr, path + ": GetFileInformationByHandle: ");
+    return MakeErrMsg(ErrMsg, path + ": GetFileInformationByHandle: ");
   }
 
   FILETIME ft;
@@ -681,7 +687,7 @@ Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrStr) const {
   CloseHandle(h);
   if (!ret) {
     SetLastError(err);
-    return MakeErrMsg(path + ": SetFileTime: ");
+    return MakeErrMsg(ErrMsg, path + ": SetFileTime: ");
   }
 
   // Best we can do with Unix permission bits is to interpret the owner
@@ -690,13 +696,13 @@ Path::setStatusInfoOnDisk(const FileStatus &si, std::string *ErrStr) const {
     if (bhfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY) {
       if (!SetFileAttributes(path.c_str(),
               bhfi.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY))
-        return MakeErrMsg(ErrStr, path + ": SetFileAttributes: ");
+        return MakeErrMsg(ErrMsg, path + ": SetFileAttributes: ");
     }
   } else {
     if (!(bhfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) {
       if (!SetFileAttributes(path.c_str(),
               bhfi.dwFileAttributes | FILE_ATTRIBUTE_READONLY))
-        return MakeErrMsg(ErrStr, path + ": SetFileAttributes: ");
+        return MakeErrMsg(ErrMsg, path + ": SetFileAttributes: ");
     }
   }
 
@@ -739,13 +745,13 @@ Path::makeUnique(bool reuse_current, std::string* ErrMsg) {
 bool
 Path::createTemporaryFileOnDisk(bool reuse_current, std::string* ErrMsg) {
   // Make this into a unique file name
-  makeUnique(reuse_current);
+  makeUnique(reuse_current, ErrMsg);
 
   // Now go and create it
   HANDLE h = CreateFile(path.c_str(), GENERIC_WRITE, 0, NULL, CREATE_NEW,
                         FILE_ATTRIBUTE_NORMAL, NULL);
   if (h == INVALID_HANDLE_VALUE)
-    return MakeErrMsg(ErrMsg, path.toString() + ": can't create file");
+    return MakeErrMsg(ErrMsg, path + ": can't create file");
 
   CloseHandle(h);
   return false;
diff --git a/lib/System/Win32/Program.inc b/lib/System/Win32/Program.inc
index b45cad1bb4..e1ad155bb3 100644
--- a/lib/System/Win32/Program.inc
+++ b/lib/System/Win32/Program.inc
@@ -158,14 +158,14 @@ Program::ExecuteAndWait(const Path& path,
       MakeErrMsg(ErrMsg, "can't redirect stdin");
       return -1;
     }
-    si.hStdOutput = RedirectIO(redirects[1], 1);
+    si.hStdOutput = RedirectIO(redirects[1], 1, ErrMsg);
     if (si.hStdOutput == INVALID_HANDLE_VALUE) {
       CloseHandle(si.hStdInput);
       MakeErrMsg(ErrMsg, "can't redirect stdout");
       return -1;
     }
     if (redirects[1] && redirects[2] && *(redirects[1]) != *(redirects[2])) {
-      si.hStdError = RedirectIO(redirects[2], 2);
+      si.hStdError = RedirectIO(redirects[2], 2, ErrMsg);
       if (si.hStdError == INVALID_HANDLE_VALUE) {
         CloseHandle(si.hStdInput);
         CloseHandle(si.hStdOutput);
diff --git a/lib/System/Win32/Win32.h b/lib/System/Win32/Win32.h
index 0180bfabcf..74406aec54 100644
--- a/lib/System/Win32/Win32.h
+++ b/lib/System/Win32/Win32.h
@@ -30,11 +30,7 @@ inline bool MakeErrMsg(std::string* ErrMsg, const std::string& prefix) {
   char *buffer = NULL;
   FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
       NULL, GetLastError(), 0, (LPSTR)&buffer, 1, NULL);
-  ErrMsg = prefix + buffer;
+  *ErrMsg = prefix + buffer;
   LocalFree(buffer);
   return true;
 }
-
-inline void MakeErrnoMsg(std::string* ErrMsg, const std::string & prefix) {
-  MakeErrorMsg(prefix + ": " + strerror(errno));
-}