Import LLVM 6.0.1 release including clang, lld and lldb.

"where is the kaboom?" deraadt@

1 files changed, 2 insertions, 2 deletions

diff --git a/gnu/llvm/lib/CodeGen/LiveIntervalUnion.cpp b/gnu/llvm/lib/CodeGen/LiveIntervalUnion.cpp
index b3248e53d0a..3e742a6c2f2 100644
--- a/gnu/llvm/lib/CodeGen/LiveIntervalUnion.cpp
+++ b/gnu/llvm/lib/CodeGen/LiveIntervalUnion.cpp
@@ -17,8 +17,8 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SparseBitVector.h"
 #include "llvm/CodeGen/LiveInterval.h"
+#include "llvm/CodeGen/TargetRegisterInfo.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetRegisterInfo.h"
 #include <cassert>
 #include <cstdlib>
 
@@ -87,7 +87,7 @@ LiveIntervalUnion::print(raw_ostream &OS, const TargetRegisterInfo *TRI) const {
   }
   for (LiveSegments::const_iterator SI = Segments.begin(); SI.valid(); ++SI) {
     OS << " [" << SI.start() << ' ' << SI.stop() << "):"
-       << PrintReg(SI.value()->reg, TRI);
+       << printReg(SI.value()->reg, TRI);
   }
   OS << '\n';
 }