1 files changed, 17 insertions, 19 deletions
diff --git a/llvm/utils/TableGen/Basic/TargetFeaturesEmitter.cpp b/llvm/utils/TableGen/Basic/TargetFeaturesEmitter.cpp
index 6b723bc..e2b5241 100644
--- a/llvm/utils/TableGen/Basic/TargetFeaturesEmitter.cpp
+++ b/llvm/utils/TableGen/Basic/TargetFeaturesEmitter.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "TargetFeaturesEmitter.h"
+#include "llvm/TableGen/CodeGenHelpers.h"
 #include "llvm/TableGen/Error.h"
 #include "llvm/TableGen/TableGenBackend.h"
 #include "llvm/TargetParser/SubtargetFeature.h"
@@ -43,7 +44,7 @@ FeatureMapTy TargetFeaturesEmitter::enumeration(raw_ostream &OS) {
     PrintFatalError(
         "Too many subtarget features! Bump MAX_SUBTARGET_FEATURES.");
 
-  OS << "namespace " << Target << " {\n";
+  NamespaceEmitter NS(OS, Target);
 
   OS << "enum {\n";
 
@@ -58,9 +59,8 @@ FeatureMapTy TargetFeaturesEmitter::enumeration(raw_ostream &OS) {
 
   OS << "  " << "NumSubtargetFeatures = " << N << "\n";
 
-  // Close enumeration and namespace
+  // Close enumeration.
   OS << "};\n";
-  OS << "} // end namespace " << Target << "\n";
   return FeatureMap;
 }
 
@@ -149,25 +149,23 @@ void TargetFeaturesEmitter::printCPUKeyValues(raw_ostream &OS,
 void TargetFeaturesEmitter::run(raw_ostream &OS) {
   OS << "// Autogenerated by TargetFeatureEmitter.cpp\n\n";
 
-  OS << "\n#ifdef GET_SUBTARGETFEATURES_ENUM\n";
-  OS << "#undef GET_SUBTARGETFEATURES_ENUM\n\n";
-
-  OS << "namespace llvm {\n";
-  auto FeatureMap = enumeration(OS);
-  OS << "} // end namespace llvm\n\n";
-  OS << "#endif // GET_SUBTARGETFEATURES_ENUM\n\n";
+  FeatureMapTy FeatureMap;
+  {
+    IfDefEmitter IfDef(OS, "GET_SUBTARGETFEATURES_ENUM");
+    NamespaceEmitter NS(OS, "llvm");
+    FeatureMap = enumeration(OS);
+  }
 
-  OS << "\n#ifdef GET_SUBTARGETFEATURES_KV\n";
-  OS << "#undef GET_SUBTARGETFEATURES_KV\n\n";
+  {
+    IfDefEmitter IfDef(OS, "GET_SUBTARGETFEATURES_KV");
+    NamespaceEmitter NS(OS, "llvm");
 
-  OS << "namespace llvm {\n";
-  printFeatureKeyValues(OS, FeatureMap);
-  OS << "\n";
+    printFeatureKeyValues(OS, FeatureMap);
+    OS << "\n";
 
-  printCPUKeyValues(OS, FeatureMap);
-  OS << "\n";
-  OS << "} // end namespace llvm\n\n";
-  OS << "#endif // GET_SUBTARGETFEATURES_KV\n\n";
+    printCPUKeyValues(OS, FeatureMap);
+    OS << "\n";
+  }
 }
 
 static TableGen::Emitter::OptClass<TargetFeaturesEmitter>