Speculatively roll back r207724-r207726, which are code cleanup changes and

appear to be breaking a bootstrapped build of compiler-rt.

llvm-svn: 207732

1 files changed, 4 insertions, 7 deletions

diff --git a/llvm/include/llvm/CodeGen/LexicalScopes.h b/llvm/include/llvm/CodeGen/LexicalScopes.h
index f5561a1b120..d6468bd75c2 100644
--- a/llvm/include/llvm/CodeGen/LexicalScopes.h
+++ b/llvm/include/llvm/CodeGen/LexicalScopes.h
@@ -25,7 +25,6 @@
 #include "llvm/IR/Metadata.h"
 #include "llvm/IR/ValueHandle.h"
 #include <utility>
-#include <memory>
 namespace llvm {
 
 class MachineInstr;
@@ -90,8 +89,7 @@ public:
 
   /// findAbstractScope - Find an abstract scope or return NULL.
   LexicalScope *findAbstractScope(const MDNode *N) {
-    auto I = AbstractScopeMap.find(N);
-    return I != AbstractScopeMap.end() ? I->second.get() : nullptr;
+    return AbstractScopeMap.lookup(N);
   }
 
   /// findInlinedScope - Find an inlined scope for the given DebugLoc or return
@@ -102,8 +100,7 @@ public:
 
   /// findLexicalScope - Find regular lexical scope or return NULL.
   LexicalScope *findLexicalScope(const MDNode *N) {
-    auto I = LexicalScopeMap.find(N);
-    return I != LexicalScopeMap.end() ? I->second.get() : nullptr;
+    return LexicalScopeMap.lookup(N);
   }
 
   /// dump - Print data structures to dbgs().
@@ -137,7 +134,7 @@ private:
 
   /// LexicalScopeMap - Tracks the scopes in the current function.  Owns the
   /// contained LexicalScope*s.
-  DenseMap<const MDNode *, std::unique_ptr<LexicalScope>> LexicalScopeMap;
+  DenseMap<const MDNode *, LexicalScope *> LexicalScopeMap;
 
   /// InlinedLexicalScopeMap - Tracks inlined function scopes in current
   /// function.
@@ -145,7 +142,7 @@ private:
 
   /// AbstractScopeMap - These scopes are  not included LexicalScopeMap.
   /// AbstractScopes owns its LexicalScope*s.
-  DenseMap<const MDNode *, std::unique_ptr<LexicalScope>> AbstractScopeMap;
+  DenseMap<const MDNode *, LexicalScope *> AbstractScopeMap;
 
   /// AbstractScopesList - Tracks abstract scopes constructed while processing
   /// a function.