diff options
| author | dim <dim@FreeBSD.org> | 2016-03-26 17:38:15 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-03-26 17:38:15 +0000 |
| commit | 9de2279aa4422b117768134cf799f0ed5a82eb9e (patch) | |
| tree | 600f248306cba8a8886049e635c940ff579a2fb8 | |
| parent | 3ceaefacf80b806fed2146e447900243081c1a4b (diff) | |
| download | FreeBSD-src-9de2279aa4422b117768134cf799f0ed5a82eb9e.zip FreeBSD-src-9de2279aa4422b117768134cf799f0ed5a82eb9e.tar.gz | |
Pull in r264465 from upstream llvm trunk (by David Majnemer):
[X86] Emit a proper ADJCALLSTACKDOWN in EmitLoweredTLSAddr
We forgot to add the second machine operand to our ADJCALLSTACKDOWN,
resulting in crashes in PEI.
This fixes PR27071.
This should fix an assertion failure during buildworld, when using -Os,
and targeting either i386 directly, or building the 32-bit libraries on
amd64.
Reported by: Eric Camachat <eric.camachat@gmail.com>
| -rw-r--r-- | contrib/llvm/lib/Target/X86/X86ISelLowering.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp b/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp index dd9966f..25288a7 100644 --- a/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -22242,7 +22242,7 @@ X86TargetLowering::EmitLoweredTLSAddr(MachineInstr *MI, // Emit CALLSEQ_START right before the instruction. unsigned AdjStackDown = TII.getCallFrameSetupOpcode(); MachineInstrBuilder CallseqStart = - BuildMI(MF, DL, TII.get(AdjStackDown)).addImm(0); + BuildMI(MF, DL, TII.get(AdjStackDown)).addImm(0).addImm(0); BB->insert(MachineBasicBlock::iterator(MI), CallseqStart); // Emit CALLSEQ_END right after the instruction. |
