From 335809335c9ebb5d6e2f96c993c34f138922b6f4 Mon Sep 17 00:00:00 2001
From: Eugene Zelenko <eugene.zelenko@gmail.com>
Date: Wed, 10 May 2017 23:53:40 +0000
Subject: [PATCH] [IR] Rollback changes in r302744 which caused buildbots
 failures.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@302745 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/IR/Value.h | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/include/llvm/IR/Value.h b/include/llvm/IR/Value.h
index 1e01e5b6c27..00f82139925 100644
--- a/include/llvm/IR/Value.h
+++ b/include/llvm/IR/Value.h
@@ -1,4 +1,4 @@
-//===- llvm/Value.h - Definition of the Value class -------------*- C++ -*-===//
+//===-- llvm/Value.h - Definition of the Value class ------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -44,12 +44,12 @@ class LLVMContext;
 class Module;
 class ModuleSlotTracker;
 class raw_ostream;
-template<typename ValueTy> class StringMapEntry;
 class StringRef;
 class Twine;
 class Type;
 
-using ValueName = StringMapEntry<Value*>;
+template<typename ValueTy> class StringMapEntry;
+typedef StringMapEntry<Value*> ValueName;
 
 //===----------------------------------------------------------------------===//
 //                                 Value Class
@@ -120,14 +120,12 @@ private:
   template <typename UseT> // UseT == 'Use' or 'const Use'
   class use_iterator_impl
       : public std::iterator<std::forward_iterator_tag, UseT *> {
-    friend class Value;
-
-    UseT *U = nullptr;
-
+    UseT *U;
     explicit use_iterator_impl(UseT *u) : U(u) {}
+    friend class Value;
 
   public:
-    use_iterator_impl() = default;
+    use_iterator_impl() : U() {}
 
     bool operator==(const use_iterator_impl &x) const { return U == x.U; }
     bool operator!=(const use_iterator_impl &x) const { return !operator==(x); }
@@ -159,11 +157,9 @@ private:
   template <typename UserTy> // UserTy == 'User' or 'const User'
   class user_iterator_impl
       : public std::iterator<std::forward_iterator_tag, UserTy *> {
-    friend class Value;
-
     use_iterator_impl<Use> UI;
-
     explicit user_iterator_impl(Use *U) : UI(U) {}
+    friend class Value;
 
   public:
     user_iterator_impl() = default;
@@ -313,8 +309,8 @@ public:
     return UseList == nullptr;
   }
 
-  using use_iterator = use_iterator_impl<Use>;
-  using const_use_iterator =  use_iterator_impl<const Use>;
+  typedef use_iterator_impl<Use> use_iterator;
+  typedef use_iterator_impl<const Use> const_use_iterator;
   use_iterator materialized_use_begin() { return use_iterator(UseList); }
   const_use_iterator materialized_use_begin() const {
     return const_use_iterator(UseList);
@@ -349,8 +345,8 @@ public:
     return UseList == nullptr;
   }
 
-  using user_iterator = user_iterator_impl<User>;
-  using const_user_iterator = user_iterator_impl<const User>;
+  typedef user_iterator_impl<User> user_iterator;
+  typedef user_iterator_impl<const User> const_user_iterator;
   user_iterator materialized_user_begin() { return user_iterator(UseList); }
   const_user_iterator materialized_user_begin() const {
     return const_user_iterator(UseList);
@@ -564,6 +560,7 @@ public:
   /// block.
   const Value *DoPHITranslation(const BasicBlock *CurBB,
                                 const BasicBlock *PredBB) const;
+
   Value *DoPHITranslation(const BasicBlock *CurBB, const BasicBlock *PredBB) {
     return const_cast<Value *>(
              static_cast<const Value *>(this)->DoPHITranslation(CurBB, PredBB));
@@ -609,7 +606,7 @@ private:
     Use *Merged;
     Use **Next = &Merged;
 
-    while (true) {
+    for (;;) {
       if (!L) {
         *Next = R;
         break;
-- 
2.50.1