diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2009-04-12 23:00:38 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2009-04-12 23:00:38 +0000 |
| commit | 4204c66752e45e06ce0eb186e80a50abee05a5f3 (patch) | |
| tree | 5da19d2f1f668be77d0f91ce52b2d1623ed1a0ad /lib/Target | |
| parent | 9e6b6d0be6396e5395e9a2381349dbfc80508a8d (diff) | |
| download | external_llvm-4204c66752e45e06ce0eb186e80a50abee05a5f3.zip external_llvm-4204c66752e45e06ce0eb186e80a50abee05a5f3.tar.gz external_llvm-4204c66752e45e06ce0eb186e80a50abee05a5f3.tar.bz2 | |
In X86DAGToDAGISel::MatchWrapper, if base or index are set, avoid matching
only if symbolic addresses are RIP relatives.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@68924 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/X86/X86ISelDAGToDAG.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index f82e9f3..bb8061f 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -787,11 +787,16 @@ bool X86DAGToDAGISel::MatchWrapper(SDValue N, X86ISelAddressMode &AM) { bool is64Bit = Subtarget->is64Bit(); DOUT << "Wrapper: 64bit " << is64Bit; DOUT << " AM "; DEBUG(AM.dump()); DOUT << "\n"; + // Under X86-64 non-small code model, GV (and friends) are 64-bits. - // Also, base and index reg must be 0 in order to use rip as base. - if (is64Bit && (TM.getCodeModel() != CodeModel::Small || - AM.Base.Reg.getNode() || AM.IndexReg.getNode())) + if (is64Bit && (TM.getCodeModel() != CodeModel::Small)) + return true; + + // Base and index reg must be 0 in order to use rip as base. + bool canUsePICRel = !AM.Base.Reg.getNode() && !AM.IndexReg.getNode(); + if (is64Bit && !canUsePICRel && TM.symbolicAddressesAreRIPRel()) return true; + if (AM.hasSymbolicDisplacement()) return true; // If value is available in a register both base and index components have |