Revert "llvm-cov: Added command-line option to change dir."

This reverts commit d8acf0078cf363252727acff00f85ae8074f95b3.

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

diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp
index 9f4b5367e1925e98f8dd06e446f236c700150b09..a33da2a55251d48c08520f6c77738a5c2b0c2b25 100644 (file)
--- a/lib/IR/GCOV.cpp
+++ b/lib/IR/GCOV.cpp
@@ -266,20 +266,18 @@ void FileInfo::print(raw_fd_ostream &OS, StringRef gcnoFile,
   for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end();
        I != E; ++I) {
     StringRef Filename = I->first();
-    OwningPtr<MemoryBuffer> Buff;
-    if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) {
-      errs() << Filename << ": " << ec.message() << "\n";
-      return;
-    }
-    StringRef AllLines = Buff.take()->getBuffer();
-
     OS << "        -:    0:Source:" << Filename << "\n";
     OS << "        -:    0:Graph:" << gcnoFile << "\n";
     OS << "        -:    0:Data:" << gcdaFile << "\n";
     OS << "        -:    0:Runs:" << RunCount << "\n";
     OS << "        -:    0:Programs:" << ProgramCount << "\n";
-
     LineCounts &L = LineInfo[Filename];
+    OwningPtr<MemoryBuffer> Buff;
+    if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) {
+      errs() << Filename << ": " << ec.message() << "\n";
+      return;
+    }
+    StringRef AllLines = Buff.take()->getBuffer();
     uint32_t i = 0;
     while (!AllLines.empty()) {
       if (L.find(i) != L.end()) {

diff --git a/tools/llvm-cov/llvm-cov.cpp b/tools/llvm-cov/llvm-cov.cpp
index 18277737b6a9618637c6e31479fad4fe548f0c64..ad6c67181548b59fcdb93fe4f3e796c7af8673f6 100644 (file)
--- a/tools/llvm-cov/llvm-cov.cpp
+++ b/tools/llvm-cov/llvm-cov.cpp
@@ -20,7 +20,6 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/system_error.h"
-#include <unistd.h>
 using namespace llvm;
 
 static cl::opt<bool>
@@ -35,9 +34,6 @@ InputGCDA("gcda", cl::desc("<input gcda file>"), cl::init(""));
 static cl::opt<std::string>
 OutputFile("o", cl::desc("<output llvm-cov file>"), cl::init("-"));
 
-static cl::opt<std::string>
-WorkingDir("C", cl::desc("change path of working directory"),
-           cl::init(""));
 
 //===----------------------------------------------------------------------===//
 int main(int argc, char **argv) {
@@ -48,13 +44,6 @@ int main(int argc, char **argv) {
 
   cl::ParseCommandLineOptions(argc, argv, "llvm coverage tool\n");
 
-  if (!WorkingDir.empty()) {
-    if (chdir(WorkingDir.c_str()) == -1) {
-      errs() << "Cannot change to directory: " << WorkingDir << ".\n";
-      return 1;
-    }
-  }
-
   std::string ErrorInfo;
   raw_fd_ostream OS(OutputFile.c_str(), ErrorInfo);
   if (!ErrorInfo.empty())
@@ -88,6 +77,7 @@ int main(int argc, char **argv) {
     }
   }
 
+
   if (DumpGCOV)
     GF.dump();