Fix modules build of AVRAsmParser.cpp

arichardson · arichardson · commit 4eb93907f782 · 2018-11-13T10:54:44.000Z
Summary: Without this change I get the following error: lib/Target/AVR/AVRGenAsmMatcher.inc:1135:1: error: redundant #include of module 'LLVM_Utils.Support.Format' appears within namespace 'llvm' [-Wmodules-import-nested-redundant] Reviewers: dylanmckay Reviewed By: dylanmckay Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D53425 llvm-svn: 346750
diff --git a/llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp b/llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp
@@ -34,8 +34,9 @@
 
 #define DEBUG_TYPE "avr-asm-parser"
 
-namespace llvm {
+using namespace llvm;
 
+namespace {
 /// Parses AVR assembly from a stream.
 class AVRAsmParser : public MCTargetAsmParser {
   const MCSubtargetInfo &STI;
@@ -245,6 +246,8 @@ class AVROperand : public MCParsedAsmOperand {
   }
 };
 
+} // end anonymous namespace.
+
 // Auto-generated Match Functions
 
 /// Maps from the set of all register names to a register number.
@@ -708,5 +711,3 @@ unsigned AVRAsmParser::validateTargetOperandClass(MCParsedAsmOperand &AsmOp,
   }
   return Match_InvalidOperand;
 }
-
-} // end of namespace llvm

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,9 @@`
`34`	`34`
`35`	`35`	`#define DEBUG_TYPE "avr-asm-parser"`
`36`	`36`
`37`		`-namespace llvm {`
	`37`	`+using namespace llvm;`
`38`	`38`
	`39`	`+namespace {`
`39`	`40`	`/// Parses AVR assembly from a stream.`
`40`	`41`	`class AVRAsmParser : public MCTargetAsmParser {`
`41`	`42`	`const MCSubtargetInfo &STI;`
`@@ -245,6 +246,8 @@ class AVROperand : public MCParsedAsmOperand {`
`245`	`246`	`}`
`246`	`247`	`};`
`247`	`248`
	`249`	`+} // end anonymous namespace.`
	`250`	`+`
`248`	`251`	`// Auto-generated Match Functions`
`249`	`252`
`250`	`253`	`/// Maps from the set of all register names to a register number.`
`@@ -708,5 +711,3 @@ unsigned AVRAsmParser::validateTargetOperandClass(MCParsedAsmOperand &AsmOp,`
`708`	`711`	`}`
`709`	`712`	`return Match_InvalidOperand;`
`710`	`713`	`}`
`711`		`-`
`712`		`-} // end of namespace llvm`