rollup merge of rust-lang#22332: dotdash/llvmup_20150213

Fixes the crash blocking rust-lang#21886.
alexcrichton · Feb 18, 2015 · 02c2761 · 02c2761
2 parents 25ccf3c + 543e148
commit 02c2761
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/llvm b/src/llvm
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2015-02-12
+2015-02-13
+0 −6		include/llvm/CodeGen/MachineModuleInfo.h
+6 −6		lib/Analysis/IPA/InlineCost.cpp
+7 −8		lib/CodeGen/AsmPrinter/EHStreamer.cpp
+4 −13		lib/CodeGen/AsmPrinter/EHStreamer.h
+1 −148		lib/CodeGen/AsmPrinter/Win64Exception.cpp
+0 −4		lib/CodeGen/AsmPrinter/Win64Exception.h
+0 −8		lib/CodeGen/MachineModuleInfo.cpp
+1 −1		lib/CodeGen/Passes.cpp
+9 −13		lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+5 −3		lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp
+4 −29		lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+0 −2		lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
+1 −63		lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+3 −0		lib/IR/DebugInfo.cpp
+4 −3		lib/IR/Type.cpp
+11 −6		lib/MC/WinCOFFObjectWriter.cpp
+2 −0		lib/Target/X86/X86ISelLowering.cpp
+9 −2		lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
+41 −0		lib/Transforms/Instrumentation/InstrProfiling.cpp
+3 −0		lib/Transforms/Scalar/EarlyCSE.cpp
+16 −4		lib/Transforms/Vectorize/SLPVectorizer.cpp
+23 −0		test/CodeGen/PowerPC/vsel-prom.ll
+35 −0		test/CodeGen/X86/constant-combines.ll
+12 −0		test/CodeGen/X86/pshufb-mask-comments.ll
+0 −175		test/CodeGen/X86/seh-basic.ll
+0 −196		test/CodeGen/X86/seh-safe-div.ll
+33 −0		test/DebugInfo/location-verifier.ll
+25 −0		test/MC/COFF/diff.s
+10 −1		test/Transforms/EarlyCSE/basic.ll
+19 −0		test/Transforms/Inline/inline-indirect.ll
+2 −0		test/Transforms/InstCombine/loadstore-metadata.ll
+50 −0		test/Transforms/SLPVectorizer/X86/bad_types.ll
+9 −0		test/tools/gold/no-map-whole-file.ll
+10 −9		tools/gold/gold-plugin.cpp