[llvm-commits] [llvm-gcc-4.2] r67409 - in /llvm-gcc-4.2/branches/Apple/Dib/gcc: c-typeck.c cp/typeck.c testsuite/g++.apple/block-seq-1.C testsuite/gcc.apple/block-seq-1.c version.c

[Bill Wendling]

Author: void
Date: Fri Mar 20 17:00:02 2009
New Revision: 67409

URL: http://llvm.org/viewvc/llvm-project?rev=67409&view=rev
Log:
--- Merging (from foreign repository) r67408 into '.':
A    gcc/testsuite/gcc.apple/block-seq-1.c
A    gcc/testsuite/g++.apple/block-seq-1.C
U    gcc/cp/typeck.c
U    gcc/c-typeck.c
U    gcc/version.c

Added:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/g++.apple/block-seq-1.C
    llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/gcc.apple/block-seq-1.c
Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/c-typeck.c
    llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/typeck.c
    llvm-gcc-4.2/branches/Apple/Dib/gcc/version.c

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/c-typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/c-typeck.c?rev=67409&r1=67408&r2=67409&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/c-typeck.c (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/c-typeck.c Fri Mar 20 17:00:02 2009
@@ -4203,10 +4203,12 @@
 	      if (TREE_CODE (inner) == VAR_DECL
 		  && COPYABLE_BYREF_LOCAL_VAR (inner))
 		{
+		  tree old_rhs = rhs;
 		  /* then we save the rhs.  */
 		  rhs = save_expr (rhs);
-		  /* And arrage for the sequence point to be inserted.  */
-		  insert_sequence_point = true;
+		  if (rhs != old_rhs)
+		    /* And arrage for the sequence point to be inserted.  */
+		    insert_sequence_point = true;
 		}
 	    }
 	}

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/typeck.c?rev=67409&r1=67408&r2=67409&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/typeck.c (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/cp/typeck.c Fri Mar 20 17:00:02 2009
@@ -6259,10 +6259,12 @@
 	      if (TREE_CODE (inner) == VAR_DECL
 		  && COPYABLE_BYREF_LOCAL_VAR (inner))
 		{
+		  tree old_rhs = rhs;
 		  /* then we save the rhs.  */
 		  rhs = save_expr (rhs);
-		  /* And arrage for the sequence point to be inserted.  */
-		  insert_sequence_point = true;
+		  if (rhs != old_rhs)
+		    /* And arrage for the sequence point to be inserted.  */
+		    insert_sequence_point = true;
 		}
 	    }
 	}

Added: llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/g++.apple/block-seq-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/g%2B%2B.apple/block-seq-1.C?rev=67409&view=auto

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/g++.apple/block-seq-1.C (added)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/g++.apple/block-seq-1.C Fri Mar 20 17:00:02 2009
@@ -0,0 +1,9 @@
+/* APPLE LOCAL file __block assign sequence point 6639533 */
+/* { dg-options "-Wall" } */
+/* { dg-do compile } */
+
+int foo() {
+    __block int retval;
+    retval = 0;
+    return retval;
+}

Added: llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/gcc.apple/block-seq-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/gcc.apple/block-seq-1.c?rev=67409&view=auto

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/gcc.apple/block-seq-1.c (added)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/testsuite/gcc.apple/block-seq-1.c Fri Mar 20 17:00:02 2009
@@ -0,0 +1,9 @@
+/* APPLE LOCAL file __block assign sequence point 6639533 */
+/* { dg-options "-Wall" } */
+/* { dg-do compile } */
+
+int foo() {
+    __block int retval;
+    retval = 0;
+    return retval;
+}

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/version.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/version.c?rev=67409&r1=67408&r2=67409&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/version.c (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/version.c Fri Mar 20 17:00:02 2009
@@ -11,12 +11,12 @@
 /* APPLE LOCAL begin Apple version */
 #ifdef ENABLE_LLVM
 #ifdef LLVM_VERSION_INFO
-#define VERSUFFIX " (Based on Apple Inc. build 5641) (dot 1) (LLVM build " LLVM_VERSION_INFO ")"
+#define VERSUFFIX " (Based on Apple Inc. build 5643) (LLVM build " LLVM_VERSION_INFO ")"
 #else
-#define VERSUFFIX " (Based on Apple Inc. build 5641) (dot 1) (LLVM build)"
+#define VERSUFFIX " (Based on Apple Inc. build 5643) (LLVM build)"
 #endif
 #else
-#define VERSUFFIX " (Based on Apple Inc. build 5641) (dot 1)"
+#define VERSUFFIX " (Based on Apple Inc. build 5643)"
 #endif
 /* APPLE LOCAL end Apple version */