[llvm-branch-commits] [cfe-branch] r112511 - in /cfe/branches/Apple/williamson-IB: Makefile clang-merge-list.txt llvm-merge-list.txt

[Daniel Dunbar]

Author: ddunbar
Date: Mon Aug 30 15:21:48 2010
New Revision: 112511

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

Modified:
    cfe/branches/Apple/williamson-IB/Makefile
    cfe/branches/Apple/williamson-IB/clang-merge-list.txt
    cfe/branches/Apple/williamson-IB/llvm-merge-list.txt

Modified: cfe/branches/Apple/williamson-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson-IB/Makefile?rev=112511&r1=112510&r2=112511&view=diff
==============================================================================
--- cfe/branches/Apple/williamson-IB/Makefile (original)
+++ cfe/branches/Apple/williamson-IB/Makefile Mon Aug 30 15:21:48 2010
@@ -25,7 +25,7 @@
 # Source Info
 
 LLVM_Source_Branch := branches/Apple/williamson
-Clang_Source_Branch := trunk
+Clang_Source_Branch := branches/Apple/williamson
 CompilerRT_Source_Branch := trunk
 
 ##

Modified: cfe/branches/Apple/williamson-IB/clang-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson-IB/clang-merge-list.txt?rev=112511&r1=112510&r2=112511&view=diff
==============================================================================
--- cfe/branches/Apple/williamson-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/williamson-IB/clang-merge-list.txt Mon Aug 30 15:21:48 2010
@@ -22,3 +22,6 @@
 
 # <rdar://problem/8258844> x86_64 ABI miscompile
 109848
+
+# <rdar://problem/8360545> [IRgen] clang miscompiles pointer conversion to _Bool
+112021

Modified: cfe/branches/Apple/williamson-IB/llvm-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson-IB/llvm-merge-list.txt?rev=112511&r1=112510&r2=112511&view=diff
==============================================================================
--- cfe/branches/Apple/williamson-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/williamson-IB/llvm-merge-list.txt Mon Aug 30 15:21:48 2010
@@ -50,3 +50,6 @@
 110752
 110756
 110757
+
+# <rdar://problem/8360669> [regression] invalid reload of bool value in -O0 code
+111709