Emit error unsupported when asm string conversion fails instead of
assert.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57721 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index 20312de..ece4aee 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -624,7 +624,9 @@
}
static std::string ConvertAsmString(const char *Start, unsigned NumOperands,
- bool IsSimple) {
+ bool IsSimple, bool &Failed) {
+ Failed = false;
+
static unsigned AsmCounter = 0;
AsmCounter++;
std::string Result;
@@ -696,7 +698,8 @@
Result += "${" + llvm::utostr(n) + ':' + EscapedChar + '}';
Start = End - 1;
} else {
- assert(0 && "Unhandled asm escaped character!");
+ Failed = true;
+ return "";
}
}
Start++;
@@ -731,10 +734,17 @@
}
void CodeGenFunction::EmitAsmStmt(const AsmStmt &S) {
+ bool Failed;
std::string AsmString =
ConvertAsmString(std::string(S.getAsmString()->getStrData(),
S.getAsmString()->getByteLength()).c_str(),
- S.getNumOutputs() + S.getNumInputs(), S.isSimple());
+ S.getNumOutputs() + S.getNumInputs(), S.isSimple(),
+ Failed);
+
+ if (Failed) {
+ ErrorUnsupported(&S, "asm string");
+ return;
+ }
std::string Constraints;