diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-18 14:20:07 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-18 14:20:07 -0700 |
| commit | 556121338c248ba1bb49b369388b697250e848c3 (patch) | |
| tree | 0dc5059be0416f7d806424759f08a177279f0c11 /lib/CodeGen/ExecutionDepsFix.cpp | |
| parent | 722d055f70a29c4af58c60dde2682cecc9003f41 (diff) | |
| parent | 3298959540ca744ec16b4c65db244534a929a862 (diff) | |
Merge commit '3298959540ca744ec16b4c65db244534a929a862'
Conflicts:
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp
Diffstat (limited to 'lib/CodeGen/ExecutionDepsFix.cpp')
| -rw-r--r-- | lib/CodeGen/ExecutionDepsFix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/ExecutionDepsFix.cpp b/lib/CodeGen/ExecutionDepsFix.cpp index 2311842671..ed78f19421 100644 --- a/lib/CodeGen/ExecutionDepsFix.cpp +++ b/lib/CodeGen/ExecutionDepsFix.cpp @@ -657,7 +657,7 @@ bool ExeDepsFix::runOnMachineFunction(MachineFunction &mf) { bool anyregs = false; for (TargetRegisterClass::const_iterator I = RC->begin(), E = RC->end(); I != E; ++I) - if (MF->getRegInfo().isPhysRegOrOverlapUsed(*I)) { + if (MF->getRegInfo().isPhysRegUsed(*I)) { anyregs = true; break; } |