[llvm-branch-commits] [llvm-branch] r84779 - in /llvm/branches/Apple/Leela/lib: Target/X86/X86InstrInfo.td Transforms/IPO/GlobalDCE.cpp

[Bill Wendling]

Author: void
Date: Wed Oct 21 15:56:53 2009
New Revision: 84779

URL: http://llvm.org/viewvc/llvm-project?rev=84779&view=rev
Log:
$ svn merge -c 84731 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r84731 into '.':
U    lib/Transforms/IPO/GlobalDCE.cpp


Modified:
    llvm/branches/Apple/Leela/lib/Target/X86/X86InstrInfo.td
    llvm/branches/Apple/Leela/lib/Transforms/IPO/GlobalDCE.cpp

Modified: llvm/branches/Apple/Leela/lib/Target/X86/X86InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/X86/X86InstrInfo.td?rev=84779&r1=84778&r2=84779&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/X86/X86InstrInfo.td (original)
+++ llvm/branches/Apple/Leela/lib/Target/X86/X86InstrInfo.td Wed Oct 21 15:56:53 2009
@@ -3598,6 +3598,7 @@
 
 // Optimized codegen when the non-memory output is not used.
 // FIXME: Use normal add / sub instructions and add lock prefix dynamically.
+let Defs = [EFLAGS] in {
 def LOCK_ADD8mr  : I<0x00, MRMDestMem, (outs), (ins i8mem:$dst, GR8:$src2),
                     "lock\n\t"
                     "add{b}\t{$src2, $dst|$dst, $src2}", []>, LOCK;
@@ -3667,6 +3668,7 @@
 def LOCK_DEC32m : I<0xFF, MRM1m, (outs), (ins i32mem:$dst),
                     "lock\n\t"
                     "dec{l}\t$dst", []>, LOCK;
+}
 
 // Atomic exchange, and, or, xor
 let Constraints = "$val = $dst", Defs = [EFLAGS],

Modified: llvm/branches/Apple/Leela/lib/Transforms/IPO/GlobalDCE.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Transforms/IPO/GlobalDCE.cpp?rev=84779&r1=84778&r2=84779&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Transforms/IPO/GlobalDCE.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Transforms/IPO/GlobalDCE.cpp Wed Oct 21 15:56:53 2009
@@ -150,7 +150,8 @@
   AliveGlobals.clear();
 
   // Remove dead metadata.
-  Changed |= M.getContext().RemoveDeadMetadata();
+  // FIXME - Enable this.
+  // Changed |= M.getContext().RemoveDeadMetadata();
   return Changed;
 }