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

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 17 09:34:17 2011
New Revision: 123626

URL: http://llvm.org/viewvc/llvm-project?rev=123626&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=123626&r1=123625&r2=123626&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Mon Jan 17 09:34:17 2011
@@ -530,3 +530,18 @@
 
 # <rdar://problem/8790245> [PR8821] clang crashes when compiling webkit
 122536
+
+# <rdar://problem/8554072> Need API to look up file paths of imported files by name or import string
+122350
+
+# <rdar://problem/8759653> crashes consistently compiling source code
+122756
+
+# <rdar://problem/8761767> Assigning to static global doesn't use _objc_assign_global
+123391
+
+# <rdar://problem/8852495> cannot override warnings on per-file basis with Clang
+-118303
+
+# <rdar://problem/8854933> short enums do not work with llvm
+123510

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=123626&r1=123625&r2=123626&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/llvm-merge-list.txt Mon Jan 17 09:34:17 2011
@@ -176,6 +176,7 @@
 122529
 
 # <rdar://problem/8813415> [regression] [nt] External/SPEC/CINT2000/164_gzip/164_gzip.exec miscompile
+122771
 122772
 
 # <rdar://problem/8792542> misaligned branch destination