[llvm-branch-commits] [cfe-branch] r117834 - in /cfe/branches/Apple/whitney-IB: clang-merge-list.txt llvm-merge-list.txt

[Daniel Dunbar]

Author: ddunbar
Date: Sat Oct 30 14:44:16 2010
New Revision: 117834

URL: http://llvm.org/viewvc/llvm-project?rev=117834&view=rev
Log:
Update merge lists.

Modified:
    cfe/branches/Apple/whitney-IB/clang-merge-list.txt
    cfe/branches/Apple/whitney-IB/llvm-merge-list.txt

Modified: cfe/branches/Apple/whitney-IB/clang-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/clang-merge-list.txt?rev=117834&r1=117833&r2=117834&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Sat Oct 30 14:44:16 2010
@@ -0,0 +1,2 @@
+# Reversion of r117678, which broke various projects.
+117829

Modified: cfe/branches/Apple/whitney-IB/llvm-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/llvm-merge-list.txt?rev=117834&r1=117833&r2=117834&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/llvm-merge-list.txt Sat Oct 30 14:44:16 2010
@@ -6,3 +6,6 @@
 
 # <rdar://problem/8611556> [PR8471] - [scev] clang segfaults while optimizing a snippet of C code
 117698
+
+# Test fix needed for <rdar://problem/8611144> [PR8506] valueprop crash
+117712