diff options
| author | Frederic Riss <friss@apple.com> | 2015-06-25 21:57:33 +0000 |
|---|---|---|
| committer | Frederic Riss <friss@apple.com> | 2015-06-25 21:57:33 +0000 |
| commit | 16238d90b2755009fa6cfc752863ef80a5adefe4 (patch) | |
| tree | 85c499fc2e3662b7e8e06b34abe9d5dcdc2e1ea5 /llvm/lib | |
| parent | 594c028183b92988797f4c169b5e06a06de22ea0 (diff) | |
| download | bcm5719-llvm-16238d90b2755009fa6cfc752863ef80a5adefe4.tar.gz bcm5719-llvm-16238d90b2755009fa6cfc752863ef80a5adefe4.zip | |
IAS: Use the root macro instanciation for location
r224810 fixed the handling of macro debug locations in AsmParser. This patch
fixes the logic to actually do what was intended: it uses the first macro of
the macro stack instead of the last one. The updated testcase shows that the
current scheme doesn't work when macro instanciations are nested and multiple
files are used.
Reviewers: compnerd
Differential Revision: http://reviews.llvm.org/D10463
llvm-svn: 240705
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCParser/AsmParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 2245a466e62..04d141389c9 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -1646,8 +1646,8 @@ bool AsmParser::parseStatement(ParseStatementInfo &Info, if (ActiveMacros.empty()) Line = SrcMgr.FindLineNumber(IDLoc, CurBuffer); else - Line = SrcMgr.FindLineNumber(ActiveMacros.back()->InstantiationLoc, - ActiveMacros.back()->ExitBuffer); + Line = SrcMgr.FindLineNumber(ActiveMacros.front()->InstantiationLoc, + ActiveMacros.front()->ExitBuffer); // If we previously parsed a cpp hash file line comment then make sure the // current Dwarf File is for the CppHashFilename if not then emit the |
