mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-03-15 07:33:18 +00:00
MC/AsmParser: Avoid unnecessary use of SourceMgr::FindBufferForLoc()
- Each macro instantiation introduces a new buffer, and FindBufferForLoc() is linear, so previously macro instantiation could be N^2 for some pathological inputs. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169073 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
657b75b994
commit
4259a1a7d8
@ -78,11 +78,14 @@ struct MacroInstantiation {
|
|||||||
/// The location of the instantiation.
|
/// The location of the instantiation.
|
||||||
SMLoc InstantiationLoc;
|
SMLoc InstantiationLoc;
|
||||||
|
|
||||||
|
/// The buffer where parsing should resume upon instantiation completion.
|
||||||
|
int ExitBuffer;
|
||||||
|
|
||||||
/// The location where parsing should resume upon instantiation completion.
|
/// The location where parsing should resume upon instantiation completion.
|
||||||
SMLoc ExitLoc;
|
SMLoc ExitLoc;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MacroInstantiation(const Macro *M, SMLoc IL, SMLoc EL,
|
MacroInstantiation(const Macro *M, SMLoc IL, int EB, SMLoc EL,
|
||||||
MemoryBuffer *I);
|
MemoryBuffer *I);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -252,7 +255,10 @@ private:
|
|||||||
/// \brief Reset the current lexer position to that given by \p Loc. The
|
/// \brief Reset the current lexer position to that given by \p Loc. The
|
||||||
/// current token is not set; clients should ensure Lex() is called
|
/// current token is not set; clients should ensure Lex() is called
|
||||||
/// subsequently.
|
/// subsequently.
|
||||||
void JumpToLoc(SMLoc Loc);
|
///
|
||||||
|
/// \param InBuffer If not -1, should be the known buffer id that contains the
|
||||||
|
/// location.
|
||||||
|
void JumpToLoc(SMLoc Loc, int InBuffer=-1);
|
||||||
|
|
||||||
virtual void EatToEndOfStatement();
|
virtual void EatToEndOfStatement();
|
||||||
|
|
||||||
@ -556,8 +562,12 @@ bool AsmParser::ProcessIncbinFile(const std::string &Filename) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void AsmParser::JumpToLoc(SMLoc Loc) {
|
void AsmParser::JumpToLoc(SMLoc Loc, int InBuffer) {
|
||||||
CurBuffer = SrcMgr.FindBufferContainingLoc(Loc);
|
if (InBuffer != -1) {
|
||||||
|
CurBuffer = InBuffer;
|
||||||
|
} else {
|
||||||
|
CurBuffer = SrcMgr.FindBufferContainingLoc(Loc);
|
||||||
|
}
|
||||||
Lexer.setBuffer(SrcMgr.getMemoryBuffer(CurBuffer), Loc.getPointer());
|
Lexer.setBuffer(SrcMgr.getMemoryBuffer(CurBuffer), Loc.getPointer());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1642,9 +1652,11 @@ bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
MacroInstantiation::MacroInstantiation(const Macro *M, SMLoc IL, SMLoc EL,
|
MacroInstantiation::MacroInstantiation(const Macro *M, SMLoc IL,
|
||||||
|
int EB, SMLoc EL,
|
||||||
MemoryBuffer *I)
|
MemoryBuffer *I)
|
||||||
: TheMacro(M), Instantiation(I), InstantiationLoc(IL), ExitLoc(EL)
|
: TheMacro(M), Instantiation(I), InstantiationLoc(IL), ExitBuffer(EB),
|
||||||
|
ExitLoc(EL)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1840,6 +1852,7 @@ bool AsmParser::HandleMacroEntry(StringRef Name, SMLoc NameLoc,
|
|||||||
// Create the macro instantiation object and add to the current macro
|
// Create the macro instantiation object and add to the current macro
|
||||||
// instantiation stack.
|
// instantiation stack.
|
||||||
MacroInstantiation *MI = new MacroInstantiation(M, NameLoc,
|
MacroInstantiation *MI = new MacroInstantiation(M, NameLoc,
|
||||||
|
CurBuffer,
|
||||||
getTok().getLoc(),
|
getTok().getLoc(),
|
||||||
Instantiation);
|
Instantiation);
|
||||||
ActiveMacros.push_back(MI);
|
ActiveMacros.push_back(MI);
|
||||||
@ -1854,7 +1867,7 @@ bool AsmParser::HandleMacroEntry(StringRef Name, SMLoc NameLoc,
|
|||||||
|
|
||||||
void AsmParser::HandleMacroExit() {
|
void AsmParser::HandleMacroExit() {
|
||||||
// Jump to the EndOfStatement we should return to, and consume it.
|
// Jump to the EndOfStatement we should return to, and consume it.
|
||||||
JumpToLoc(ActiveMacros.back()->ExitLoc);
|
JumpToLoc(ActiveMacros.back()->ExitLoc, ActiveMacros.back()->ExitBuffer);
|
||||||
Lex();
|
Lex();
|
||||||
|
|
||||||
// Pop the instantiation entry.
|
// Pop the instantiation entry.
|
||||||
@ -3490,6 +3503,7 @@ void AsmParser::InstantiateMacroLikeBody(Macro *M, SMLoc DirectiveLoc,
|
|||||||
// Create the macro instantiation object and add to the current macro
|
// Create the macro instantiation object and add to the current macro
|
||||||
// instantiation stack.
|
// instantiation stack.
|
||||||
MacroInstantiation *MI = new MacroInstantiation(M, DirectiveLoc,
|
MacroInstantiation *MI = new MacroInstantiation(M, DirectiveLoc,
|
||||||
|
CurBuffer,
|
||||||
getTok().getLoc(),
|
getTok().getLoc(),
|
||||||
Instantiation);
|
Instantiation);
|
||||||
ActiveMacros.push_back(MI);
|
ActiveMacros.push_back(MI);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user