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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Nov 19 14:05:49 2010
New Revision: 119829

URL: http://llvm.org/viewvc/llvm-project?rev=119829&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=119829&r1=119828&r2=119829&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Fri Nov 19 14:05:49 2010
@@ -343,3 +343,18 @@
 
 # <rdar://problem/8678459> clang_getCursor() broken in the return types of functions
 119514
+
+# <rdar://problem/8631263> bogus warning on ill-formed protocol-qualifer list
+119805
+
+# <rdar://problem/8686426> Need API to get a category number from CXDiagnostic
+119802
+
+# <rdar://problem/8681766> iVar getting clobbered when compile under "LLVM Compiler 2.0"
+119751
+
+# <rdar://problem/8556628> linker error passing -demangle
+119809
+
+# <rdar://problem/8686888> crash in CheckBuiltinFunctionCall
+119813

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=119829&r1=119828&r2=119829&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/llvm-merge-list.txt Fri Nov 19 14:05:49 2010
@@ -122,3 +122,6 @@
 
 # <rdar://problem/8675131> PR8366: -march=native on i5 emits unaligned movaps
 119605
+
+# <rdar://problem/8673046> support .symbol_resolver directive
+119816