[ms-inline asm] Output empty asm statements for the directives we don't
handle. Otherwise, the AsmParser will explode if we try to generate an
object files.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163345 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp
index c6432dd..5cab02d 100644
--- a/lib/Sema/SemaStmtAsm.cpp
+++ b/lib/Sema/SemaStmtAsm.cpp
@@ -454,11 +454,11 @@
return Res.str();
}
-#define DEF_SIMPLE_MSASM \
+#define DEF_SIMPLE_MSASM(STR) \
MSAsmStmt *NS = \
new (Context) MSAsmStmt(Context, AsmLoc, LBraceLoc, /*IsSimple*/ true, \
/*IsVolatile*/ true, AsmToks, Inputs, Outputs, \
- InputExprs, OutputExprs, AsmString, Constraints, \
+ InputExprs, OutputExprs, STR, Constraints, \
Clobbers, EndLoc);
StmtResult Sema::ActOnMSAsmStmt(SourceLocation AsmLoc,
@@ -478,11 +478,8 @@
SmallVector<std::string, 4> OutputExprNames;
// Empty asm statements don't need to instantiate the AsmParser, etc.
- if (AsmToks.empty()) {
- StringRef AsmString;
- DEF_SIMPLE_MSASM;
- return Owned(NS);
- }
+ StringRef EmptyAsmStr;
+ if (AsmToks.empty()) { DEF_SIMPLE_MSASM(EmptyAsmStr); return Owned(NS); }
std::vector<std::string> AsmStrings;
std::vector<std::pair<unsigned,unsigned> > AsmTokRanges;
@@ -495,7 +492,7 @@
bool IsSimple = isSimpleMSAsm(Pieces, Context.getTargetInfo());
// AsmParser doesn't fully support these asm statements.
- if (bailOnMSAsm(Pieces)) { DEF_SIMPLE_MSASM; return Owned(NS); }
+ if (bailOnMSAsm(Pieces)) { DEF_SIMPLE_MSASM(EmptyAsmStr); return Owned(NS); }
// Initialize targets and assembly printers/parsers.
llvm::InitializeAllTargetInfos();
@@ -549,7 +546,7 @@
bool HadError = TargetParser->ParseInstruction(OpcodeStr.str(), IDLoc,
Operands);
// If we had an error parsing the operands, fail gracefully.
- if (HadError) { DEF_SIMPLE_MSASM; return Owned(NS); }
+ if (HadError) { DEF_SIMPLE_MSASM(EmptyAsmStr); return Owned(NS); }
// Match the MCInstr.
unsigned Kind;
@@ -559,7 +556,7 @@
ErrorInfo,
/*matchingInlineAsm*/ true);
// If we had an error parsing the operands, fail gracefully.
- if (HadError) { DEF_SIMPLE_MSASM; return Owned(NS); }
+ if (HadError) { DEF_SIMPLE_MSASM(EmptyAsmStr); return Owned(NS); }
// Get the instruction descriptor.
llvm::MCInst Inst = Instrs[0];