[lld] r194746 - Don't use getFileOrStdin() at where we don't want to read from stdin.

Rui Ueyama ruiu at google.com
Thu Nov 14 15:21:25 PST 2013


Author: ruiu
Date: Thu Nov 14 17:21:25 2013
New Revision: 194746

URL: http://llvm.org/viewvc/llvm-project?rev=194746&view=rev
Log:
Don't use getFileOrStdin() at where we don't want to read from stdin.

Modified:
    lld/trunk/lib/Passes/RoundTripNativePass.cpp
    lld/trunk/lib/Passes/RoundTripYAMLPass.cpp
    lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp

Modified: lld/trunk/lib/Passes/RoundTripNativePass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Passes/RoundTripNativePass.cpp?rev=194746&r1=194745&r2=194746&view=diff
==============================================================================
--- lld/trunk/lib/Passes/RoundTripNativePass.cpp (original)
+++ lld/trunk/lib/Passes/RoundTripNativePass.cpp Thu Nov 14 17:21:25 2013
@@ -32,7 +32,7 @@ void RoundTripNativePass::perform(std::u
   // writing to the file or when reading atoms back from the file.
   nativeWriter->writeFile(*mergedFile, tmpNativeFile.str());
   OwningPtr<MemoryBuffer> buff;
-  if (MemoryBuffer::getFileOrSTDIN(tmpNativeFile.str(), buff))
+  if (MemoryBuffer::getFile(tmpNativeFile.str(), buff))
     return;
 
   std::unique_ptr<MemoryBuffer> mb(buff.take());

Modified: lld/trunk/lib/Passes/RoundTripYAMLPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Passes/RoundTripYAMLPass.cpp?rev=194746&r1=194745&r2=194746&view=diff
==============================================================================
--- lld/trunk/lib/Passes/RoundTripYAMLPass.cpp (original)
+++ lld/trunk/lib/Passes/RoundTripYAMLPass.cpp Thu Nov 14 17:21:25 2013
@@ -36,7 +36,7 @@ void RoundTripYAMLPass::perform(std::uni
   // writing to the file or when reading atoms back from the file.
   yamlWriter->writeFile(*mergedFile, tmpYAMLFile.str());
   OwningPtr<MemoryBuffer> buff;
-  if (MemoryBuffer::getFileOrSTDIN(tmpYAMLFile.str(), buff))
+  if (MemoryBuffer::getFile(tmpYAMLFile.str(), buff))
     return;
 
   if (buff->getBufferSize() < MAX_YAML_FILE_SIZE) {

Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp?rev=194746&r1=194745&r2=194746&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp Thu Nov 14 17:21:25 2013
@@ -891,7 +891,7 @@ private:
 
     // Read and parse the COFF
     OwningPtr<MemoryBuffer> opmb;
-    if (error_code ec = MemoryBuffer::getFileOrSTDIN(*coffFilePath, opmb))
+    if (error_code ec = MemoryBuffer::getFile(*coffFilePath, opmb))
       return ec;
     std::unique_ptr<MemoryBuffer> newmb(opmb.take());
     return parseCOFFFile(newmb, result);





More information about the llvm-commits mailing list