[llvm-commits] [llvm-gcc-4.2] r64841 - /llvm-gcc-4.2/branches/release_25/gcc/tree-optimize.c

[Tanya Lattner]

Author: tbrethou
Date: Tue Feb 17 16:58:40 2009
New Revision: 64841

URL: http://llvm.org/viewvc/llvm-project?rev=64841&view=rev
Log:
Merge from mainline (64819).
Do not run optimize_inline_calls since llvm-gcc doesn't use gcc inliner any more.
-gThis line, and those below, will be ignored--

M    gcc/tree-optimize.c

Modified:
    llvm-gcc-4.2/branches/release_25/gcc/tree-optimize.c

Modified: llvm-gcc-4.2/branches/release_25/gcc/tree-optimize.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_25/gcc/tree-optimize.c?rev=64841&r1=64840&r2=64841&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/release_25/gcc/tree-optimize.c (original)
+++ llvm-gcc-4.2/branches/release_25/gcc/tree-optimize.c Tue Feb 17 16:58:40 2009
@@ -439,6 +439,8 @@
   cfun->x_dont_save_pending_sizes_p = 1;
   cfun->after_inlining = true;
 
+/* LLVM LOCAL begin */
+#ifndef ENABLE_LLVM
   if (flag_inline_trees)
     {
       struct cgraph_edge *e;
@@ -452,6 +454,8 @@
 	  timevar_pop (TV_INTEGRATION);
 	}
     }
+#endif
+/* LLVM LOCAL end */
   /* In non-unit-at-a-time we must mark all referenced functions as needed.
      */
   if (!flag_unit_at_a_time)