Fix ambiguous call to make_unique and clang-format.

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

diff --git a/utils/TableGen/FixedLenDecoderEmitter.cpp b/utils/TableGen/FixedLenDecoderEmitter.cpp
index 0a8179f443d92e482c29f797d726826340646bed..a4eb8292bd2ecf9376641a0bbbeea65887416aab 100644 (file)
--- a/utils/TableGen/FixedLenDecoderEmitter.cpp
+++ b/utils/TableGen/FixedLenDecoderEmitter.cpp
@@ -551,13 +551,10 @@ void Filter::recurse() {
 
     // Delegates to an inferior filter chooser for further processing on this
     // group of instructions whose segment values are variable.
-    FilterChooserMap.insert(std::make_pair(
-                              -1U,
-                              make_unique<FilterChooser>(Owner->AllInstructions,
-                                                         VariableInstructions,
-                                                         Owner->Operands,
-                                                         BitValueArray,
-                                                         *Owner)));
+    FilterChooserMap.insert(
+        std::make_pair(-1U, llvm::make_unique<FilterChooser>(
+                                Owner->AllInstructions, VariableInstructions,
+                                Owner->Operands, BitValueArray, *Owner)));
   }
 
   // No need to recurse for a singleton filtered instruction.
@@ -584,12 +581,9 @@ void Filter::recurse() {
     // Delegates to an inferior filter chooser for further processing on this
     // category of instructions.
     FilterChooserMap.insert(std::make_pair(
-                              mapIterator->first,
-                              make_unique<FilterChooser>(Owner->AllInstructions,
-                                                         mapIterator->second,
-                                                         Owner->Operands,
-                                                         BitValueArray,
-                                                         *Owner)));
+        mapIterator->first, llvm::make_unique<FilterChooser>(
+                                Owner->AllInstructions, mapIterator->second,
+                                Owner->Operands, BitValueArray, *Owner)));
   }
 }