[llvm-commits] [llvm-gcc-4.2] r51270 - in /llvm-gcc-4.2/trunk/gcc: ipa-inline.c passes.c

[Devang Patel]

Author: dpatel
Date: Mon May 19 15:22:07 2008
New Revision: 51270

URL: http://llvm.org/viewvc/llvm-project?rev=51270&view=rev
Log:
Revert ipa patch to fix llvmgcc42 bootstrap on x86-darwin.

Modified:
    llvm-gcc-4.2/trunk/gcc/ipa-inline.c
    llvm-gcc-4.2/trunk/gcc/passes.c

Modified: llvm-gcc-4.2/trunk/gcc/ipa-inline.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ipa-inline.c?rev=51270&r1=51269&r2=51270&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ipa-inline.c (original)
+++ llvm-gcc-4.2/trunk/gcc/ipa-inline.c Mon May 19 15:22:07 2008
@@ -941,11 +941,7 @@
 	/* At the moment, no IPA passes change function bodies before inlining.
 	   Save some time by not recomputing function body sizes if early inlining
 	   already did so.  */
-        /* LLVM local begin - Don't rely on pass_early_ipa_inline being run.  */
-#ifndef ENABLE_LLVM
 	if (!flag_early_inlining)
-#endif
-        /* LLVM local end */
 	  node->local.self_insns = node->global.insns
 	     = estimate_num_insns (node->decl);
 
@@ -1032,8 +1028,6 @@
 		 overall_insns - old_insns);
     }
 
-  /* LLVM local begin */
-#ifndef ENABLE_LLVM
   if (!flag_really_no_inline)
     cgraph_decide_inlining_of_small_functions ();
 
@@ -1107,8 +1101,6 @@
 	    }
 	}
     }
-#endif
-  /* LLVM local end */
 
   if (dump_file)
     fprintf (dump_file,
@@ -1155,8 +1147,6 @@
 	inlined = true;
       }
 
-  /* LLVM local begin */
-#ifndef ENABLE_LLVM
   /* Now do the automatic inlining.  */
   if (!flag_really_no_inline)
     for (e = node->callees; e; e = e->next_callee)
@@ -1189,8 +1179,6 @@
 	  else if (!early)
 	    e->inline_failed = failed_reason;
 	}
-#endif
-  /* LLVM local end */
   if (early && inlined)
     {
       push_cfun (DECL_STRUCT_FUNCTION (node->decl));

Modified: llvm-gcc-4.2/trunk/gcc/passes.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/passes.c?rev=51270&r1=51269&r2=51270&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/passes.c (original)
+++ llvm-gcc-4.2/trunk/gcc/passes.c Mon May 19 15:22:07 2008
@@ -484,9 +484,9 @@
   NEXT_PASS (pass_early_ipa_inline);
   NEXT_PASS (pass_early_local_passes);
   NEXT_PASS (pass_ipa_cp);
-  NEXT_PASS (pass_ipa_inline);
 /* LLVM LOCAL begin */
 #ifndef ENABLE_LLVM
+  NEXT_PASS (pass_ipa_inline);
   NEXT_PASS (pass_ipa_reference);
   NEXT_PASS (pass_ipa_pure_const); 
   NEXT_PASS (pass_ipa_type_escape);