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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep 30 17:20:16 2010
New Revision: 115222

URL: http://llvm.org/viewvc/llvm-project?rev=115222&view=rev
Log:
Update LLVM and Clang merge lists.

Modified:
    cfe/branches/Apple/whitney-IB/ClangBNI.mk
    cfe/branches/Apple/whitney-IB/clang-merge-list.txt
    cfe/branches/Apple/whitney-IB/llvm-merge-list.txt

Modified: cfe/branches/Apple/whitney-IB/ClangBNI.mk
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/ClangBNI.mk?rev=115222&r1=115221&r2=115222&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/whitney-IB/ClangBNI.mk Thu Sep 30 17:20:16 2010
@@ -429,10 +429,8 @@
 	$(_v) $(MKDIR) "$(SRCROOT)"
 	$(_v) $(PAX) -rw . "$(SRCROOT)"
 	$(_v) $(FIND) "$(SRCROOT)" $(Find_Cruft) -depth -exec $(RMDIR) "{}" \;
-ifndef No_Remove_Tests	
 	$(_v) rm -rf "$(SRCROOT)"/src/test/*/
 	$(_v) rm -rf "$(SRCROOT)"/src/tools/clang/test/*/
-endif
 
 installhdrs:
 

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=115222&r1=115221&r2=115222&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/clang-merge-list.txt Thu Sep 30 17:20:16 2010
@@ -19,4 +19,8 @@
 # <rdar://problem/8479999> Enable caching of global code completions in "editing" options
 114810
 
+# <rdar://problem/8470540> spurious property definitions reported due to auto-synthesized properties
+114714
 
+# <rdar://problem/8483253> clang-116 gets confused about ":" in ObjC++ code
+114968

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=115222&r1=115221&r2=115222&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/whitney-IB/llvm-merge-list.txt Thu Sep 30 17:20:16 2010
@@ -1,2 +1,8 @@
 # <rdar://problem/8400094> [regression] [MultiSource/Benchmarks/Bullet/bullet.exec] inliner miscompile of btGjkEpa2 at -O3 -flto
 114781
+
+# <rdar://problem/8487514> [PR8250] valueprop assertion
+114972
+
+# <rdar://problem/8499254> [PR8247] JumpThreading Assertion `From != To && "ReplaceAndSimplifyAllUses(X,X) is not valid!"' failed.
+115082