diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-10-18 19:39:30 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-10-18 19:39:30 +0000 |
| commit | c8dd27e58301af85979facf291b817802d3523e5 (patch) | |
| tree | 0ae25382986499d48b67f03841cd1c4526e420ba /include | |
| parent | 8c1dcdf26dc7d597308698b5ae08680cebcd9d3f (diff) | |
| download | llvm-c8dd27e58301af85979facf291b817802d3523e5.tar.gz llvm-c8dd27e58301af85979facf291b817802d3523e5.tar.bz2 llvm-c8dd27e58301af85979facf291b817802d3523e5.tar.xz | |
[ms-inline asm] Have the LookupInlineAsmIdentifier() callback function return a
*NamedDecl. In turn, build the expressions after we're finished parsing the
asm. This avoids a crasher if the lookup fails.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166212 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/MC/MCParser/MCAsmParser.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/llvm/MC/MCParser/MCAsmParser.h b/include/llvm/MC/MCParser/MCAsmParser.h index ea20c15fe1..bb71a4633d 100644 --- a/include/llvm/MC/MCParser/MCAsmParser.h +++ b/include/llvm/MC/MCParser/MCAsmParser.h @@ -34,8 +34,7 @@ class Twine; /// MCAsmParserSemaCallback - Generic Sema callback for assembly parser. class MCAsmParserSemaCallback { public: - virtual void *LookupInlineAsmIdentifier(StringRef Name, void *Loc, - void **IdentifierInfoPtr) = 0; + virtual void *LookupInlineAsmIdentifier(StringRef Name, void *Loc) = 0; }; /// MCAsmParser - Generic assembler parser interface, for use by target specific @@ -89,9 +88,8 @@ public: /// ParseMSInlineAsm - Parse ms-style inline assembly. virtual bool ParseMSInlineAsm(void *AsmLoc, std::string &AsmString, unsigned &NumOutputs, unsigned &NumInputs, - SmallVectorImpl<void *> &Names, + SmallVectorImpl<void *> &OpDecls, SmallVectorImpl<std::string> &Constraints, - SmallVectorImpl<void *> &Exprs, SmallVectorImpl<std::string> &Clobbers, const MCInstrInfo *MII, const MCInstPrinter *IP, |