[llvm-commits] [llvm-gcc-4.2] r62485 - in /llvm-gcc-4.2/trunk/gcc: c-typeck.c function.h langhooks-def.h tree-ssa.c

[Bill Wendling]

Author: void
Date: Sun Jan 18 20:33:57 2009
New Revision: 62485

URL: http://llvm.org/viewvc/llvm-project?rev=62485&view=rev
Log:
Many many blocks fixes.

Modified:
    llvm-gcc-4.2/trunk/gcc/c-typeck.c
    llvm-gcc-4.2/trunk/gcc/function.h
    llvm-gcc-4.2/trunk/gcc/langhooks-def.h
    llvm-gcc-4.2/trunk/gcc/tree-ssa.c

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=62485&r1=62484&r2=62485&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-typeck.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-typeck.c Sun Jan 18 20:33:57 2009
@@ -4084,12 +4084,16 @@
 {
   tree function_ptr_exp;
   tree typelist;
+  bool block_ptr_exp_side_effect = TREE_SIDE_EFFECTS (block_ptr_exp);
 
   /* First convert BLOCK_PTR_EXP to 'void *'. */
   block_ptr_exp = convert (ptr_type_node, block_ptr_exp);
   gcc_assert (generic_block_literal_struct_type);
   block_ptr_exp = convert (build_pointer_type (generic_block_literal_struct_type),
 			   block_ptr_exp);
+  if (block_ptr_exp_side_effect)
+    block_ptr_exp = save_expr (block_ptr_exp);
+
   /* BLOCK_PTR_VAR->__FuncPtr */
   function_ptr_exp = build_component_ref (build_indirect_ref (block_ptr_exp, "->"),
 					  get_identifier ("__FuncPtr"));

Modified: llvm-gcc-4.2/trunk/gcc/function.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/function.h?rev=62485&r1=62484&r2=62485&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/function.h (original)
+++ llvm-gcc-4.2/trunk/gcc/function.h Sun Jan 18 20:33:57 2009
@@ -273,6 +273,12 @@
   int iasm_frame_size;
   /* APPLE LOCAL end CW asm blocks */
 
+  /* APPLE LOCAL begin radar 6411649 */
+  /* Holds a unique number for this function. It is used to
+     generate block number for block names. */
+  int unqiue_block_number;
+  /* APPLE LOCAL end radar 6411649 */
+
   /* Offset to end of allocated area of stack frame.
      If stack grows down, this is the address of the last stack slot allocated.
      If stack grows up, this is the address for the next slot.  */

Modified: llvm-gcc-4.2/trunk/gcc/langhooks-def.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/langhooks-def.h?rev=62485&r1=62484&r2=62485&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/langhooks-def.h (original)
+++ llvm-gcc-4.2/trunk/gcc/langhooks-def.h Sun Jan 18 20:33:57 2009
@@ -101,6 +101,9 @@
 extern tree lhd_build_generic_block_struct_type (void);
 /* APPLE LOCAL end 6353006  */
 
+/* APPLE LOCAL radar 6386976  */
+extern bool lhd_is_runtime_specific_type (tree);
+
 #define LANG_HOOKS_NAME			"GNU unknown"
 #define LANG_HOOKS_IDENTIFIER_SIZE	sizeof (struct lang_identifier)
 #define LANG_HOOKS_INIT			hook_bool_void_false
@@ -235,6 +238,8 @@
 #define LANG_HOOKS_TYPE_MAX_SIZE	lhd_return_null_tree
 #define LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES \
   lhd_omp_firstprivatize_type_sizes
+/* APPLE LOCAL radar 6386976  */
+#define LANG_HOOKS_IS_RUNTIME_SPECIFIC_TYPE lhd_is_runtime_specific_type
 #define LANG_HOOKS_HASH_TYPES		true
 
 #define LANG_HOOKS_FOR_TYPES_INITIALIZER { \
@@ -249,6 +254,8 @@
   LANG_HOOKS_INCOMPLETE_TYPE_ERROR, \
   LANG_HOOKS_TYPE_MAX_SIZE, \
   LANG_HOOKS_OMP_FIRSTPRIVATIZE_TYPE_SIZES, \
+   /* APPLE LOCAL radar 6386976  */ \
+  LANG_HOOKS_IS_RUNTIME_SPECIFIC_TYPE, \
   LANG_HOOKS_HASH_TYPES \
 }
 

Modified: llvm-gcc-4.2/trunk/gcc/tree-ssa.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-ssa.c?rev=62485&r1=62484&r2=62485&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree-ssa.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree-ssa.c Sun Jan 18 20:33:57 2009
@@ -1192,7 +1192,8 @@
   locus = (context != NULL && EXPR_HAS_LOCATION (context)
 	   ? EXPR_LOCUS (context)
 	   : &DECL_SOURCE_LOCATION (var));
-  warning (0, gmsgid, locus, var);
+  /* APPLE LOCAL 6218859 */
+  warning (OPT_Wuninitialized, gmsgid, locus, var);
   fun_locus = &DECL_SOURCE_LOCATION (cfun->decl);
   if (locus->file != fun_locus->file
       || locus->line < fun_locus->line