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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 11 11:19:56 2011
New Revision: 125371

URL: http://llvm.org/viewvc/llvm-project?rev=125371&view=rev
Log:
Update LLVM and Clang merge lists (forgot most of this earlier).

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=125371&r1=125370&r2=125371&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Fri Feb 11 11:19:56 2011
@@ -552,5 +552,51 @@
 # <rdar://problem/8858342> libclang does not honor -W/-w flags
 123793
 
+# <rdar://problem/8494734> clang doesn't support register pinning
+122643
+
+# <rdar://problem/8910446> clang fails to build Firefox 4
+123871
+
+## <rdar://problem/8913298> Upcasts which discard qualifiers are treated as bitcasts
+#124340 (custom merge)
+#
+# Merged at: 124418
+
+# <rdar://problem/8757124> Wrong value showing in debugger when variable name reused.
+123802
+
+# <rdar://problem/8807535> Compile-as-you-type doesn't use same SSE options as real build
+124382
+
+# <rdar://problem/8925013> deadlock due to unsafe signal handler
+124612
+124613
+
+# <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)
+
 # <rdar://problem/8981530> use most recent 'as' for compiler-rt build
 125328
+
+# <rdar://problem/8984201> ObjC syntax coloring seems arbitrary(?)
+124800 (custom patch: clang-8984201.patch)

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=125371&r1=125370&r2=125371&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/llvm-merge-list.txt Fri Feb 11 11:19:56 2011
@@ -186,3 +186,16 @@
 
 # <rdar://problem/8795958> clang crash
 122104
+
+# <rdar://problem/8876232> __thread implementation doesn't preserve enough registers (ABI issue)
+123712
+
+# <rdar://problem/8898416> build failure at -O0
+#
+# Required reversion of 123010 and 123008. Manually patched via Eric in r124427.
+
+# <rdar://problem/8926440> illegal instruction targeting sp
+119977
+
+# <rdar://problem/8960959> crash during thumb isel
+123864