[llvm-branch-commits] [llvm-tag] r100201 - in /llvm/tags/Apple/llvmCore-2326.5: ./ lib/CodeGen/MachineCSE.cpp lib/CodeGen/SelectionDAG/FastISel.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp lib/Transforms/IPO/FunctionAttrs.cpp lib/Transforms/Scalar/IndVarSimplify.cpp test/CodeGen/PowerPC/2010-04-01-MachineCSEBug.ll test/Transforms/IndVarSimplify/dangling-use.ll
Bill Wendling
isanbard at gmail.com
Fri Apr 2 11:43:45 PDT 2010
Author: void
Date: Fri Apr 2 13:43:45 2010
New Revision: 100201
URL: http://llvm.org/viewvc/llvm-project?rev=100201&view=rev
Log:
Create llvmCore-2326.5, which is llvmCore-2326.3 plus fixes for:
<rdar://problem/7819940>
<rdar://problem/7819990>
<rdar://problem/7819936>
Added:
llvm/tags/Apple/llvmCore-2326.5/ (props changed)
- copied from r100160, llvm/tags/Apple/llvmCore-2326.3/
llvm/tags/Apple/llvmCore-2326.5/test/CodeGen/PowerPC/2010-04-01-MachineCSEBug.ll
- copied unchanged from r100170, llvm/trunk/test/CodeGen/PowerPC/2010-04-01-MachineCSEBug.ll
llvm/tags/Apple/llvmCore-2326.5/test/Transforms/IndVarSimplify/dangling-use.ll
- copied unchanged from r100186, llvm/trunk/test/Transforms/IndVarSimplify/dangling-use.ll
Modified:
llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/MachineCSE.cpp
llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/FastISel.cpp
llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
llvm/tags/Apple/llvmCore-2326.5/lib/Transforms/IPO/FunctionAttrs.cpp (props changed)
llvm/tags/Apple/llvmCore-2326.5/lib/Transforms/Scalar/IndVarSimplify.cpp
Propchange: llvm/tags/Apple/llvmCore-2326.5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 2 13:43:45 2010
@@ -0,0 +1,22 @@
+Debug
+Release
+Release-Asserts
+mklib
+Makefile.config
+config.log
+config.status
+cvs.out
+autom4te.cache
+configure.out
+LLVM-*
+_distcheckdir
+llvm.spec
+svn-commit.*
+*.patch
+*.patch.raw
+cscope.*
+Debug+Coverage-Asserts
+Release+Coverage-Asserts
+Debug+Coverage
+Release+Coverage
+Debug+Checks
Propchange: llvm/tags/Apple/llvmCore-2326.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 2 13:43:45 2010
@@ -0,0 +1,3 @@
+/llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
+/llvm/branches/Apple/Morbo:100162
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324,99336,99378,99418,99423,99429,99455,99463,99465,99469,99484,99490,99492-99494,99537,99539,99544,99570,99575,99629-99630,99671,99692,99695,99697,99699,99722,99846,99850,99910,100149,100170,100186
Modified: llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/MachineCSE.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/MachineCSE.cpp?rev=100201&r1=100160&r2=100201&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/MachineCSE.cpp (original)
+++ llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/MachineCSE.cpp Fri Apr 2 13:43:45 2010
@@ -294,8 +294,12 @@
bool FoundCSE = VNT.count(MI);
if (!FoundCSE) {
// Look for trivial copy coalescing opportunities.
- if (PerformTrivialCoalescing(MI, MBB))
+ if (PerformTrivialCoalescing(MI, MBB)) {
+ // After coalescing MI itself may become a copy.
+ if (isCopy(MI, TII))
+ continue;
FoundCSE = VNT.count(MI);
+ }
}
// FIXME: commute commutable instructions?
Modified: llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/FastISel.cpp?rev=100201&r1=100160&r2=100201&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/FastISel.cpp (original)
+++ llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/FastISel.cpp Fri Apr 2 13:43:45 2010
@@ -346,10 +346,13 @@
}
// Building the map above is target independent. Generating DBG_VALUE
// inline is target dependent; do this now.
- (void)TargetSelectInstruction(cast<Instruction>(I));
+ // FIXME: We are not yet ready to handle dbg_value.
+ // (void)TargetSelectInstruction(cast<Instruction>(I));
return true;
}
case Intrinsic::dbg_value: {
+ // FIXME: We are not yet ready to handle dbg_value.
+ return 0;
// This requires target support, but right now X86 is the only Fast target.
DbgValueInst *DI = cast<DbgValueInst>(I);
const TargetInstrDesc &II = TII.get(TargetOpcode::DBG_VALUE);
Modified: llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=100201&r1=100160&r2=100201&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/tags/Apple/llvmCore-2326.5/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Fri Apr 2 13:43:45 2010
@@ -3800,6 +3800,8 @@
return 0;
}
case Intrinsic::dbg_value: {
+ // FIXME: We are not yet ready to handle dbg_value.
+ return 0;
DwarfWriter *DW = DAG.getDwarfWriter();
if (!DW)
return 0;
Propchange: llvm/tags/Apple/llvmCore-2326.5/lib/Transforms/IPO/FunctionAttrs.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 2 13:43:45 2010
@@ -1 +1,2 @@
-/llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp:99492,99539,99699,99836,99846,99850,99910
+/llvm/branches/Apple/Morbo/lib/Transforms/IPO/FunctionAttrs.cpp:100162
+/llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp:99492,99539,99699,99836,99846,99850,99910,100170,100186
Modified: llvm/tags/Apple/llvmCore-2326.5/lib/Transforms/Scalar/IndVarSimplify.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2326.5/lib/Transforms/Scalar/IndVarSimplify.cpp?rev=100201&r1=100160&r2=100201&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2326.5/lib/Transforms/Scalar/IndVarSimplify.cpp (original)
+++ llvm/tags/Apple/llvmCore-2326.5/lib/Transforms/Scalar/IndVarSimplify.cpp Fri Apr 2 13:43:45 2010
@@ -506,6 +506,13 @@
// Now expand it into actual Instructions and patch it into place.
Value *NewVal = Rewriter.expandCodeFor(AR, UseTy, InsertPt);
+ // Inform ScalarEvolution that this value is changing. The change doesn't
+ // affect its value, but it does potentially affect which use lists the
+ // value will be on after the replacement, which affects ScalarEvolution's
+ // ability to walk use lists and drop dangling pointers when a value is
+ // deleted.
+ SE->forgetValue(User);
+
// Patch the new value into place.
if (Op->hasName())
NewVal->takeName(Op);
More information about the llvm-branch-commits
mailing list