diff options
author | Craig Topper <craig.topper@intel.com> | 2018-06-20 04:32:05 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@intel.com> | 2018-06-20 04:32:05 +0000 |
commit | 59da74370b6c304f1f7e1d36c23e7459b7266677 (patch) | |
tree | d6330b6170b69a4a0328ba7ee50e0b5d751c38c8 | |
parent | d22ad8568c463157d0064611509c92d7e217c33b (diff) | |
download | bcm5719-llvm-59da74370b6c304f1f7e1d36c23e7459b7266677.tar.gz bcm5719-llvm-59da74370b6c304f1f7e1d36c23e7459b7266677.zip |
[SelectionDAG] Don't crash on inline assembly errors when the inline assembly return type is a struct.
Summary:
If we get an error building the SelectionDAG for inline assembly we try to continue and still build the DAG.
But if the return type for the inline assembly is a struct we end up crashing because we try to create an UNDEF node with a struct type which isn't valid.
Instead we need to create an UNDEF for each element of the struct and join them with merge_values.
This patch relies on single operand merge_values being handled gracefully by getMergeValues. If the return type is void there will be no VTs returned by ComputeValueVTs and now we just return instead of calling setValue. Hopefully that's ok, I assumed nothing would need to look up the mapped value for void node.
Fixes PR37359
Reviewers: rengolin, rovka, echristo, efriedma, bogner
Reviewed By: efriedma
Subscribers: craig.topper, llvm-commits
Differential Revision: https://reviews.llvm.org/D46560
llvm-svn: 335093
-rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 13 | ||||
-rw-r--r-- | llvm/test/CodeGen/X86/pr37359.ll | 17 |
2 files changed, 28 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index b6f691dacc0..740147fd79e 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -7741,8 +7741,17 @@ void SelectionDAGBuilder::emitInlineAsmError(ImmutableCallSite CS, // Make sure we leave the DAG in a valid state const TargetLowering &TLI = DAG.getTargetLoweringInfo(); - auto VT = TLI.getValueType(DAG.getDataLayout(), CS.getType()); - setValue(CS.getInstruction(), DAG.getUNDEF(VT)); + SmallVector<EVT, 1> ValueVTs; + ComputeValueVTs(TLI, DAG.getDataLayout(), CS->getType(), ValueVTs); + + if (ValueVTs.empty()) + return; + + SmallVector<SDValue, 1> Ops; + for (unsigned i = 0, e = ValueVTs.size(); i != e; ++i) + Ops.push_back(DAG.getUNDEF(ValueVTs[i])); + + setValue(CS.getInstruction(), DAG.getMergeValues(Ops, getCurSDLoc())); } void SelectionDAGBuilder::visitVAStart(const CallInst &I) { diff --git a/llvm/test/CodeGen/X86/pr37359.ll b/llvm/test/CodeGen/X86/pr37359.ll new file mode 100644 index 00000000000..40cddb21016 --- /dev/null +++ b/llvm/test/CodeGen/X86/pr37359.ll @@ -0,0 +1,17 @@ +; RUN: not llc -o /dev/null %s 2>&1 | FileCheck %s +target triple = "x86_64--" + +@a = global i32 0, align 4 + +; CHECK: error: couldn't allocate input reg for constraint 'x' +define i32 @main() { +entry: + %0 = load i32, i32* @a, align 4 + %cmp = icmp ne i32 %0, 0 + %1 = call { i32, i32 } asm "", "={ax},={dx},x,~{dirflag},~{fpsr},~{flags}"(i1 %cmp) + %asmresult = extractvalue { i32, i32 } %1, 0 + %asmresult1 = extractvalue { i32, i32 } %1, 1 + store i32 %asmresult, i32* @a, align 4 + store i32 %asmresult1, i32* @a, align 4 + ret i32 0 +} |