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

[Daniel Dunbar]

Author: ddunbar
Date: Mon Feb  7 14:00:42 2011
New Revision: 125041

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

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

Modified: cfe/branches/Apple/sill-IB/clang-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/clang-merge-list.txt?rev=125041&r1=125040&r2=125041&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/clang-merge-list.txt Mon Feb  7 14:00:42 2011
@@ -575,3 +575,22 @@
 
 # <rdar://problem/8918721> crash at clang::SrcMgr::ContentCache::getBuffer const + 68
 124616
+
+# <rdar://problem/8940150> Fixits replace too much text when showing suggestion
+124833 (custom patch: clang-8940150.patch)
+
+# <rdar://problem/8958461> C++ PCH reader/writer can't handle empty explicit template argument lists
+124862 (custom patch: clang-8958461.patch)
+
+# <rdar://problem/8928220> AST re-parsing broken when file has ".." in path
+124800
+
+# <rdar://problem/8949262> USRs for methods shouldn't include category name
+124859
+124920
+
+# <rdar://problem/8855151> missing symbol highlights in source editor
+124858
+
+# <rdar://problem/8939444> clang loses symbol coloring & index support
+124971 (custom patch: clang-8939444.patch)

Modified: cfe/branches/Apple/sill-IB/llvm-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/llvm-merge-list.txt?rev=125041&r1=125040&r2=125041&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/llvm-merge-list.txt Mon Feb  7 14:00:42 2011
@@ -196,3 +196,6 @@
 
 # <rdar://problem/8926440> illegal instruction targeting sp
 119977
+
+# <rdar://problem/8960959> crash during thumb isel
+123864