diff options
Diffstat (limited to 'lib/VMCore')
| -rw-r--r-- | lib/VMCore/AsmWriter.cpp | 5 | ||||
| -rw-r--r-- | lib/VMCore/ConstantsContext.h | 4 | ||||
| -rw-r--r-- | lib/VMCore/Core.cpp | 2 | ||||
| -rw-r--r-- | lib/VMCore/InlineAsm.cpp | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index f937ebdd32..f3f24ae5c8 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -1029,8 +1029,9 @@ static void WriteAsOperandInternal(raw_ostream &Out, const Value *V, Out << "sideeffect "; if (IA->isAlignStack()) Out << "alignstack "; - if (IA->getDialect() != 0) - Out << "nsdialect "; + // We don't emit the AD_ATT dialect as it's the assumed default. + if (IA->getDialect() == InlineAsm::AD_Intel) + Out << "inteldialect "; Out << '"'; PrintEscapedString(IA->getAsmString(), Out); Out << "\", \""; diff --git a/lib/VMCore/ConstantsContext.h b/lib/VMCore/ConstantsContext.h index ddd680a55d..0f81b3ee4e 100644 --- a/lib/VMCore/ConstantsContext.h +++ b/lib/VMCore/ConstantsContext.h @@ -352,7 +352,7 @@ struct ExprMapKeyType { struct InlineAsmKeyType { InlineAsmKeyType(StringRef AsmString, StringRef Constraints, bool hasSideEffects, - bool isAlignStack, unsigned asmDialect) + bool isAlignStack, InlineAsm::AsmDialect asmDialect) : asm_string(AsmString), constraints(Constraints), has_side_effects(hasSideEffects), is_align_stack(isAlignStack), asm_dialect(asmDialect) {} @@ -360,7 +360,7 @@ struct InlineAsmKeyType { std::string constraints; bool has_side_effects; bool is_align_stack; - unsigned asm_dialect; + InlineAsm::AsmDialect asm_dialect; bool operator==(const InlineAsmKeyType& that) const { return this->asm_string == that.asm_string && this->constraints == that.constraints && diff --git a/lib/VMCore/Core.cpp b/lib/VMCore/Core.cpp index 9ce76f87fa..ab27f9b8b7 100644 --- a/lib/VMCore/Core.cpp +++ b/lib/VMCore/Core.cpp @@ -1056,7 +1056,7 @@ LLVMValueRef LLVMConstInlineAsm(LLVMTypeRef Ty, const char *AsmString, const char *Constraints, LLVMBool HasSideEffects, LLVMBool IsAlignStack, - unsigned AsmDialect) { + InlineAsm::AsmDialect AsmDialect) { return wrap(InlineAsm::get(dyn_cast<FunctionType>(unwrap(Ty)), AsmString, Constraints, HasSideEffects, IsAlignStack, AsmDialect)); diff --git a/lib/VMCore/InlineAsm.cpp b/lib/VMCore/InlineAsm.cpp index 92414e0cef..2e636aacfd 100644 --- a/lib/VMCore/InlineAsm.cpp +++ b/lib/VMCore/InlineAsm.cpp @@ -27,7 +27,7 @@ InlineAsm::~InlineAsm() { InlineAsm *InlineAsm::get(FunctionType *Ty, StringRef AsmString, StringRef Constraints, bool hasSideEffects, - bool isAlignStack, unsigned asmDialect) { + bool isAlignStack, AsmDialect asmDialect) { InlineAsmKeyType Key(AsmString, Constraints, hasSideEffects, isAlignStack, asmDialect); LLVMContextImpl *pImpl = Ty->getContext().pImpl; @@ -36,11 +36,11 @@ InlineAsm *InlineAsm::get(FunctionType *Ty, StringRef AsmString, InlineAsm::InlineAsm(PointerType *Ty, const std::string &asmString, const std::string &constraints, bool hasSideEffects, - bool isAlignStack, unsigned asmDialect) + bool isAlignStack, AsmDialect asmDialect) : Value(Ty, Value::InlineAsmVal), AsmString(asmString), Constraints(constraints), HasSideEffects(hasSideEffects), IsAlignStack(isAlignStack), - AsmDialect(asmDialect) { + Dialect(asmDialect) { // Do various checks on the constraint string and type. assert(Verify(getFunctionType(), constraints) && |