[llvm-commits] [llvm-gcc-4.2] r69001 - in /llvm-gcc-4.2/trunk/gcc: ChangeLog.apple c-typeck.c testsuite/g++.apple/6755006.C testsuite/gcc.apple/block-seq-2.c testsuite/gcc.apple/block-seq-3.c tree-ssa-loop-ivopts.c version.c
Bill Wendling
isanbard at gmail.com
Mon Apr 13 15:45:24 PDT 2009
Author: void
Date: Mon Apr 13 17:45:18 2009
New Revision: 69001
URL: http://llvm.org/viewvc/llvm-project?rev=69001&view=rev
Log:
--- Merging (from foreign repository) r68999 into '.':
A testsuite/gcc.apple/block-seq-2.c
A testsuite/gcc.apple/block-seq-3.c
A testsuite/g++.apple/6755006.C
U tree-ssa-loop-ivopts.c
U ChangeLog.apple
U c-typeck.c
U version.c
--- Merging (from foreign repository) r69000 into '.':
U testsuite/g++.apple/6755006.C
Update llvm-gcc to Apple gcc 5645.
Added:
llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C
llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-2.c
llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-3.c
Modified:
llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
llvm-gcc-4.2/trunk/gcc/c-typeck.c
llvm-gcc-4.2/trunk/gcc/tree-ssa-loop-ivopts.c
llvm-gcc-4.2/trunk/gcc/version.c
Modified: llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ChangeLog.apple?rev=69001&r1=69000&r2=69001&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/ChangeLog.apple Mon Apr 13 17:45:18 2009
@@ -1,3 +1,9 @@
+2009-04-06 Stuart Hastings <stuart at apple.com>
+
+ Radar 6755006
+ * tree-ssa-loop-ivopts.c (aff_combination_to_tree): Unsigned
+ types can't be negative.
+
2009-03-12 Caroline Tice <ctice at apple.com>
Radar 6144634
Modified: llvm-gcc-4.2/trunk/gcc/c-typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-typeck.c?rev=69001&r1=69000&r2=69001&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-typeck.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-typeck.c Mon Apr 13 17:45:18 2009
@@ -4232,7 +4232,7 @@
/* APPLE LOCAL begin __block assign sequence point 6639533 */
{
if (insert_sequence_point)
- result = build2 (COMPOUND_EXPR, TREE_TYPE (result), rhs, result);
+ result = build2 (COMPOUND_EXPR, TREE_TYPE (result), build1 (NOP_EXPR, void_type_node, rhs), result);
return result;
}
/* APPLE LOCAL end __block assign sequence point 6639533 */
@@ -4286,7 +4286,7 @@
/* APPLE LOCAL begin __block assign sequence point 6639533 */
{
if (insert_sequence_point)
- result = build2 (COMPOUND_EXPR, TREE_TYPE (result), rhs, result);
+ result = build2 (COMPOUND_EXPR, TREE_TYPE (result), build1 (NOP_EXPR, void_type_node, rhs), result);
return result;
}
/* APPLE LOCAL end __block assign sequence point 6639533 */
@@ -4299,7 +4299,7 @@
/* APPLE LOCAL begin __block assign sequence point 6639533 */
if (insert_sequence_point)
- result = build2 (COMPOUND_EXPR, TREE_TYPE (result), rhs, result);
+ result = build2 (COMPOUND_EXPR, TREE_TYPE (result), build1 (NOP_EXPR, void_type_node, rhs), result);
/* APPLE LOCAL end __block assign sequence point 6639533 */
/* If we got the LHS in a different type for storing in,
Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/6755006.C?rev=69001&view=auto
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C Mon Apr 13 17:45:18 2009
@@ -0,0 +1,28 @@
+// APPLE LOCAL file 6755006
+//#include <cassert>
+// { dg-do run }
+// { dg-options "-Os -m32" }
+#include <stdio.h>
+#include <stdlib.h>
+enum foo {
+ some_keyword0,
+ NUM_OBJC_KEYWORDS = 23
+};
+struct IdentifierInfo {
+ unsigned ObjCOrBuiltinID : 13;
+};
+unsigned X = 429;
+int main() {
+ IdentifierInfo IDs;
+ for (unsigned i = 0, e = X; i != e; ++i) {
+ IDs.ObjCOrBuiltinID = i+6583 + 23;
+ // assert(IDs.ObjCOrBuiltinID - 23 == i+6583 && "ID too large for field!");
+ if (IDs.ObjCOrBuiltinID - 23 != i+6583) {
+ abort();
+ // printf("ID too large for field! i == %d\n", i);
+ // return -1;
+ }
+ }
+ return 0;
+}
+
Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-2.c?rev=69001&view=auto
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-2.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-2.c Mon Apr 13 17:45:18 2009
@@ -0,0 +1,14 @@
+/* APPLE LOCAL file __block assign sequence point 6722072 */
+/* { dg-do run { target *-*-darwin[1-2][0-9]* } } */
+/* { dg-options "-fblocks" } */
+/* { dg-skip-if "" { powerpc*-*-darwin* } { "-m64" } { "" } } */
+
+int i = 0;
+
+int die() { return i++; }
+
+int main() {
+ __block int ret = 1;
+ ret = die();
+ return ret;
+}
Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-3.c?rev=69001&view=auto
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-3.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-seq-3.c Mon Apr 13 17:45:18 2009
@@ -0,0 +1,10 @@
+/* APPLE LOCAL file __block assign sequence point 6724165 */
+/* { dg-do compile { target *-*-darwin[1-2][0-9]* } } */
+/* { dg-options "-fblocks -Wall" } */
+
+int foo() {
+ __block int i = 0;
+ int value = 0;
+ i = (value != 0);
+ return i;
+}
Modified: llvm-gcc-4.2/trunk/gcc/tree-ssa-loop-ivopts.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-ssa-loop-ivopts.c?rev=69001&r1=69000&r2=69001&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree-ssa-loop-ivopts.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree-ssa-loop-ivopts.c Mon Apr 13 17:45:18 2009
@@ -2959,7 +2959,10 @@
expr = add_elt_to_tree (expr, type, comb->elts[i], comb->coefs[i],
comb->mask);
- if ((comb->offset | (comb->mask >> 1)) == comb->mask)
+ /* APPLE LOCAL begin 6755006 */
+ if (( ! TYPE_UNSIGNED (comb->type))
+ && ((comb->offset | (comb->mask >> 1)) == comb->mask))
+ /* APPLE LOCAL end 6755006 */
{
/* Offset is negative. */
off = (-comb->offset) & comb->mask;
Modified: llvm-gcc-4.2/trunk/gcc/version.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/version.c?rev=69001&r1=69000&r2=69001&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/version.c (original)
+++ llvm-gcc-4.2/trunk/gcc/version.c Mon Apr 13 17:45:18 2009
@@ -11,12 +11,12 @@
/* APPLE LOCAL begin Apple version */
#ifdef ENABLE_LLVM
#ifdef LLVM_VERSION_INFO
-#define VERSUFFIX " (Based on Apple Inc. build 5644) (LLVM build " LLVM_VERSION_INFO ")"
+#define VERSUFFIX " (Based on Apple Inc. build 5645) (LLVM build " LLVM_VERSION_INFO ")"
#else
-#define VERSUFFIX " (Based on Apple Inc. build 5644) (LLVM build)"
+#define VERSUFFIX " (Based on Apple Inc. build 5645) (LLVM build)"
#endif
#else
-#define VERSUFFIX " (Based on Apple Inc. build 5644)"
+#define VERSUFFIX " (Based on Apple Inc. build 5645)"
#endif
/* APPLE LOCAL end Apple version */
More information about the llvm-commits
mailing list