diff options
| author | Reid Kleckner <reid@kleckner.net> | 2015-05-04 23:22:36 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2015-05-04 23:22:36 +0000 |
| commit | 9dad227b85635f4f76b6afd12876ef21e16c5b35 (patch) | |
| tree | 92f502ed56f3ad64a35c2329a824fab232c4217e /llvm/lib/Target | |
| parent | 4dddbcfbb1cfae9b2adbd417a6e58b640bdeb1a0 (diff) | |
| download | bcm5719-llvm-9dad227b85635f4f76b6afd12876ef21e16c5b35.tar.gz bcm5719-llvm-9dad227b85635f4f76b6afd12876ef21e16c5b35.zip | |
[X86] Fix assertion while DAG combining offsets and ExternalSymbols
ExternalSymbol nodes do not contain offsets, unlike GlobalValue nodes.
llvm-svn: 236471
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp index ca1a30c05cc..c7b769585c1 100644 --- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -603,6 +603,9 @@ static bool isDispSafeForFrameIndex(int64_t Val) { bool X86DAGToDAGISel::FoldOffsetIntoAddress(uint64_t Offset, X86ISelAddressMode &AM) { + // Cannot combine ExternalSymbol displacements with integer offsets. + if (Offset != 0 && AM.ES) + return true; int64_t Val = AM.Disp + Offset; CodeModel::Model M = TM.getCodeModel(); if (Subtarget->is64Bit()) { @@ -1009,7 +1012,7 @@ bool X86DAGToDAGISel::MatchAddressRecursively(SDValue N, X86ISelAddressMode &AM, switch (N.getOpcode()) { default: break; case ISD::FRAME_ALLOC_RECOVER: { - if (!AM.hasSymbolicDisplacement()) + if (!AM.hasSymbolicDisplacement() && AM.Disp == 0) if (const auto *ESNode = dyn_cast<ExternalSymbolSDNode>(N.getOperand(0))) if (ESNode->getOpcode() == ISD::TargetExternalSymbol) { // Use the symbol and don't prefix it. |
