[llvm-commits] [llvm-gcc-4.2] r56736 - in /llvm-gcc-4.2/trunk/gcc: calls.c reload1.c

[Bill Wendling]

Author: void
Date: Fri Sep 26 19:46:21 2008
New Revision: 56736

URL: http://llvm.org/viewvc/llvm-project?rev=56736&view=rev
Log:
Revert 5976588 due to ICE.

Modified:
    llvm-gcc-4.2/trunk/gcc/calls.c
    llvm-gcc-4.2/trunk/gcc/reload1.c

Modified: llvm-gcc-4.2/trunk/gcc/calls.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/calls.c?rev=56736&r1=56735&r2=56736&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/calls.c (original)
+++ llvm-gcc-4.2/trunk/gcc/calls.c Fri Sep 26 19:46:21 2008
@@ -249,8 +249,6 @@
   rtx rounded_stack_size_rtx = GEN_INT (rounded_stack_size);
   rtx call_insn;
   int already_popped = 0;
-  /* APPLE LOCAL async unwind info 5976588 */
-  rtx dwarf = NULL_RTX;
   HOST_WIDE_INT n_popped = RETURN_POPS_ARGS (fndecl, funtype, stack_size);
 #if defined (HAVE_call) && defined (HAVE_call_value)
   rtx struct_value_size_rtx;
@@ -370,18 +368,6 @@
   /* Find the call we just emitted.  */
   call_insn = last_call_insn ();
 
-  /* APPLE LOCAL begin async unwind info 5976588 */
-  if (already_popped && n_popped
-      && flag_asynchronous_unwind_tables && ACCUMULATE_OUTGOING_ARGS)
-    {
-      dwarf = gen_rtx_SET (VOIDmode, stack_pointer_rtx,
-			   plus_constant (stack_pointer_rtx, n_popped));
-      REG_NOTES (call_insn) = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR, dwarf,
-						 REG_NOTES (call_insn));
-      RTX_FRAME_RELATED_P (call_insn) = 1;
-    }
-  /* APPLE LOCAL end async unwind info 5976588 */
-
   /* Mark memory as used for "pure" function call.  */
   if (ecf_flags & ECF_PURE)
     call_fusage
@@ -494,20 +480,7 @@
      ??? It will be worthwhile to enable combine_stack_adjustments even for
      such machines.  */
   else if (n_popped)
-    /* APPLE LOCAL begin async unwind info 5976588 */
-    {
-      anti_adjust_stack (GEN_INT (n_popped));
-      if (dwarf)
-	{
-	  rtx last_insn = get_last_nonnote_insn ();
-	  dwarf = gen_rtx_SET (VOIDmode, stack_pointer_rtx,
-			       plus_constant (stack_pointer_rtx, -n_popped));
-	  REG_NOTES (last_insn) = gen_rtx_EXPR_LIST (REG_FRAME_RELATED_EXPR, dwarf,
-						     REG_NOTES (last_insn));
-	  RTX_FRAME_RELATED_P (last_insn) = 1;
-	}
-    }
-    /* APPLE LOCAL end async unwind info 5976588 */
+    anti_adjust_stack (GEN_INT (n_popped));
 }
 
 /* Determine if the function identified by NAME and FNDECL is one with

Modified: llvm-gcc-4.2/trunk/gcc/reload1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/reload1.c?rev=56736&r1=56735&r2=56736&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/reload1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/reload1.c Fri Sep 26 19:46:21 2008
@@ -2695,11 +2695,7 @@
 
     case CLOBBER:
     case ASM_OPERANDS:
-      /* APPLE LOCAL begin async unwind info 5976588 */
-      gcc_unreachable ();
     case SET:
-      break;
-      /* APPLE LOCAL end async unwind info 5976588 */
       gcc_unreachable ();
 
     default: