This is a patch to fix a compile error in STLExtras.h, and

a bug in GraphWriter.cpp.

Patch by Florian Brandner

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

diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h
index af4996502fc7e631929f584a048d9c4fa49f3a8f..14137e3c1017e0ff6e13fb209ad2e9ff4b4b79be 100644 (file)
--- a/include/llvm/ADT/STLExtras.h
+++ b/include/llvm/ADT/STLExtras.h
@@ -71,7 +71,7 @@ public:
   typedef RootIt iterator_type;
   typedef mapped_iterator<RootIt, UnaryFunc> _Self;
 
-  inline RootIt &getCurrent() const { return current; }
+  inline const RootIt &getCurrent() const { return current; }
 
   inline explicit mapped_iterator(const RootIt &I, UnaryFunc F)
     : current(I), Fn(F) {}

diff --git a/lib/Support/GraphWriter.cpp b/lib/Support/GraphWriter.cpp
index 31d8d797bedbbb49c7335587d5a2b8ce021e7c99..eab76dff5d586f16938935c93d90d407223e147b 100644 (file)
--- a/lib/Support/GraphWriter.cpp
+++ b/lib/Support/GraphWriter.cpp
@@ -70,6 +70,7 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
   sys::Path dotty(LLVM_PATH_DOTTY);
 
   std::vector<const char*> args;
+  args.push_back(dotty.c_str());
   args.push_back(Filename.c_str());
   args.push_back(0);