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

[Daniel Dunbar]

Author: ddunbar
Date: Tue Oct  5 15:58:05 2010
New Revision: 115677

URL: http://llvm.org/viewvc/llvm-project?rev=115677&view=rev
Log:
Update LLVM and Clang 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=115677&r1=115676&r2=115677&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Tue Oct  5 15:58:05 2010
@@ -63,3 +63,11 @@
 
 # <rdar://problem/8506806> memory growing completely out of control (16GB memory block allocated!)
 115527
+
+# <rdar://problem/8511624> Infinite loop in PrintStack(llvm::PrettyStackTraceEntry const*, llvm::raw_ostream&)
+115647
+
+# <rdar://problem/8075961> crash indexing Boost code (possible non-termination bug in TryCopyInitialization?)
+115617
+115618
+115621

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=115677&r1=115676&r2=115677&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/llvm-merge-list.txt Tue Oct  5 15:58:05 2010
@@ -6,3 +6,6 @@
 
 # <rdar://problem/8499254> [PR8247] JumpThreading Assertion `From != To && "ReplaceAndSimplifyAllUses(X,X) is not valid!"' failed.
 115082
+
+# <rdar://problem/8075961> crash indexing Boost code (possible non-termination bug in TryCopyInitialization?)
+115616