Do not #include files into the llvm namespace

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

1 files changed, 8 insertions, 3 deletions

diff --git a/utils/TableGen/RegisterInfoEmitter.cpp b/utils/TableGen/RegisterInfoEmitter.cpp
index b8f79c9..4ed1a0f 100644
--- a/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/utils/TableGen/RegisterInfoEmitter.cpp
@@ -29,6 +29,7 @@ void RegisterInfoEmitter::runEnums(std::ostream &OS) {
   std::string Namespace = Registers[0].TheDef->getValueAsString("Namespace");
 
   EmitSourceFileHeader("Target Register Enum Values", OS);
+  OS << "namespace llvm {\n\n";
 
   if (!Namespace.empty())
     OS << "namespace " << Namespace << " {\n";
@@ -40,7 +41,7 @@ void RegisterInfoEmitter::runEnums(std::ostream &OS) {
   OS << "  };\n";
   if (!Namespace.empty())
     OS << "}\n";
-  EmitSourceFileTail(OS);
+  OS << "} // End llvm namespace \n";
 }
 
 void RegisterInfoEmitter::runHeader(std::ostream &OS) {
@@ -51,6 +52,8 @@ void RegisterInfoEmitter::runHeader(std::ostream &OS) {
 
   OS << "#include \"llvm/Target/MRegisterInfo.h\"\n\n";
 
+  OS << "namespace llvm {\n\n";
+
   OS << "struct " << ClassName << " : public MRegisterInfo {\n"
      << "  " << ClassName
      << "(int CallFrameSetupOpcode = -1, int CallFrameDestroyOpcode = -1);\n"
@@ -67,7 +70,7 @@ void RegisterInfoEmitter::runHeader(std::ostream &OS) {
       OS << "  extern TargetRegisterClass *" << Name << "RegisterClass;\n";
   }
   OS << "} // end of namespace " << TargetName << "\n\n";
-  EmitSourceFileTail(OS);
+  OS << "} // End llvm namespace \n";
 }
 
 // RegisterInfoEmitter::run - Main register file description emitter.
@@ -76,6 +79,8 @@ void RegisterInfoEmitter::run(std::ostream &OS) {
   CodeGenTarget Target;
   EmitSourceFileHeader("Register Information Source Fragment", OS);
 
+  OS << "namespace llvm {\n\n";
+
   // Start out by emitting each of the register classes... to do this, we build
   // a set of registers which belong to a register class, this is to ensure that
   // each register is only in a single register class.
@@ -236,5 +241,5 @@ void RegisterInfoEmitter::run(std::ostream &OS) {
   for (unsigned i = 0, e = CSR.size(); i != e; ++i)
     OS << getQualifiedName(CSR[i]) << ", ";  
   OS << " 0\n  };\n  return CalleeSaveRegs;\n}\n\n";
-  EmitSourceFileTail(OS);
+  OS << "} // End llvm namespace \n";
 }