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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep 30 22:42:47 2010
New Revision: 115284

URL: http://llvm.org/viewvc/llvm-project?rev=115284&view=rev
Log:
Update Clang merge list.

Modified:
    cfe/branches/Apple/whitney-IB/clang-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=115284&r1=115283&r2=115284&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Thu Sep 30 22:42:47 2010
@@ -24,3 +24,18 @@
 
 # <rdar://problem/8483253> clang-116 gets confused about ":" in ObjC++ code
 114968
+
+# <rdar://problem/8488270> Preprocessor trace not serialized correctly
+114913
+114922
+
+# <rdar://problem/8488304> Preprocessor trace deserialized incorrectly
+114940
+
+# <rdar://problem/8488323> Use-after-free in deserializing declaration contexts lexical contents
+114937
+
+# <rdar://problem/8499034> Fix-it explosion opening Sketch
+115259
+115260
+115263