[llvm-commits] [llvm-gcc-4.2] r54230 - in /llvm-gcc-4.2/trunk/gcc: c-common.h dwarf2out.c stub-c.c tree.h

[Bill Wendling]

Author: void
Date: Wed Jul 30 14:41:32 2008
New Revision: 54230

URL: http://llvm.org/viewvc/llvm-project?rev=54230&view=rev
Log:
Fix for using invoke_impl_ptr in dwarf2out.c.

Modified:
    llvm-gcc-4.2/trunk/gcc/c-common.h
    llvm-gcc-4.2/trunk/gcc/dwarf2out.c
    llvm-gcc-4.2/trunk/gcc/stub-c.c
    llvm-gcc-4.2/trunk/gcc/tree.h

Modified: llvm-gcc-4.2/trunk/gcc/c-common.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.h?rev=54230&r1=54229&r2=54230&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.h (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.h Wed Jul 30 14:41:32 2008
@@ -1164,7 +1164,6 @@
 extern struct block_sema_info *cur_block;
 extern tree build_helper_func_decl (tree, tree);
 extern bool building_block_byref_decl;
-extern tree invoke_impl_ptr_type;
 extern tree build_block_byref_decl (tree, tree, tree);
 extern tree build_block_ref_decl (tree, tree);
 extern tree begin_block (void);

Modified: llvm-gcc-4.2/trunk/gcc/dwarf2out.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/dwarf2out.c?rev=54230&r1=54229&r2=54230&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/dwarf2out.c (original)
+++ llvm-gcc-4.2/trunk/gcc/dwarf2out.c Wed Jul 30 14:41:32 2008
@@ -11480,9 +11480,8 @@
   dw_die_ref type_die  = NULL;
 
   /* APPLE LOCAL begin radar 5811943 - Fix type of pointers to blocks  */
-  if (code == BLOCK_POINTER_TYPE)
+  if (code == BLOCK_POINTER_TYPE && invoke_impl_ptr_type)
     {
-      gcc_assert (invoke_impl_ptr_type);
       type = invoke_impl_ptr_type;
       code = TREE_CODE (type);
     }

Modified: llvm-gcc-4.2/trunk/gcc/stub-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/stub-c.c?rev=54230&r1=54229&r2=54230&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/stub-c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/stub-c.c Wed Jul 30 14:41:32 2008
@@ -32,6 +32,7 @@
 bool iasm_in_operands ATTRIBUTE_WEAK;
 int flag_iasm_blocks ATTRIBUTE_WEAK;
 int parse_in ATTRIBUTE_WEAK;
+tree invoke_impl_ptr_type;
 
 
 tree iasm_addr (tree) ATTRIBUTE_WEAK;

Modified: llvm-gcc-4.2/trunk/gcc/tree.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree.h?rev=54230&r1=54229&r2=54230&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree.h (original)
+++ llvm-gcc-4.2/trunk/gcc/tree.h Wed Jul 30 14:41:32 2008
@@ -4845,4 +4845,8 @@
 extern void note_alternative_entry_points (void);
 /* APPLE LOCAL end CW asm blocks */
 
+/* LLVM LOCAL pointers to blocks */
+extern tree invoke_impl_ptr_type;
+/* LLVM LOCAL pointers to blocks */
+
 #endif  /* GCC_TREE_H  */