From 5fd80a05510dde2aace7ebdcd1d3414ad9a8ed49 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Wed, 23 Nov 2022 23:13:55 -0800 Subject: [PATCH] [MC] Move AsmMacroMaxNestingDepth inside llvm:: after D72680 --- llvm/lib/MC/MCParser/AsmParser.cpp | 4 ++-- llvm/lib/MC/MCParser/MCAsmParser.cpp | 2 ++ llvm/lib/MC/MCParser/MasmParser.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 240828f..ce90c21 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -74,8 +74,6 @@ using namespace llvm; MCAsmParserSemaCallback::~MCAsmParserSemaCallback() = default; -extern cl::opt AsmMacroMaxNestingDepth; - namespace { /// Helper types for tracking macro definitions. @@ -753,6 +751,8 @@ public: namespace llvm { +extern cl::opt AsmMacroMaxNestingDepth; + extern MCAsmParserExtension *createDarwinAsmParser(); extern MCAsmParserExtension *createELFAsmParser(); extern MCAsmParserExtension *createCOFFAsmParser(); diff --git a/llvm/lib/MC/MCParser/MCAsmParser.cpp b/llvm/lib/MC/MCParser/MCAsmParser.cpp index 7fc1dbf5..bfeba31 100644 --- a/llvm/lib/MC/MCParser/MCAsmParser.cpp +++ b/llvm/lib/MC/MCParser/MCAsmParser.cpp @@ -21,9 +21,11 @@ using namespace llvm; +namespace llvm { cl::opt AsmMacroMaxNestingDepth( "asm-macro-max-nesting-depth", cl::init(20), cl::Hidden, cl::desc("The maximum nesting depth allowed for assembly macros.")); +} MCAsmParser::MCAsmParser() = default; diff --git a/llvm/lib/MC/MCParser/MasmParser.cpp b/llvm/lib/MC/MCParser/MasmParser.cpp index 372538c..595d1f7 100644 --- a/llvm/lib/MC/MCParser/MasmParser.cpp +++ b/llvm/lib/MC/MCParser/MasmParser.cpp @@ -75,8 +75,6 @@ using namespace llvm; -extern cl::opt AsmMacroMaxNestingDepth; - namespace { /// Helper types for tracking macro definitions. @@ -1082,6 +1080,8 @@ private: namespace llvm { +extern cl::opt AsmMacroMaxNestingDepth; + extern MCAsmParserExtension *createCOFFMasmParser(); } // end namespace llvm -- 2.7.4