[llvm-commits] [llvm-gcc-4.2] r50378 - /llvm-gcc-4.2/branches/Apple/Tak/gcc/llvm-backend.cpp

[Dale Johannesen]

Author: johannes
Date: Mon Apr 28 17:26:52 2008
New Revision: 50378

URL: http://llvm.org/viewvc/llvm-project?rev=50378&view=rev
Log:
Revert part of 50039 that changed inlining behavior.
Fixes 5895098 and 5886557.  Note this is not being
applied to mainline, only the release branch.


Modified:
    llvm-gcc-4.2/branches/Apple/Tak/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/branches/Apple/Tak/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Tak/gcc/llvm-backend.cpp?rev=50378&r1=50377&r2=50378&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Tak/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Tak/gcc/llvm-backend.cpp Mon Apr 28 17:26:52 2008
@@ -356,10 +356,9 @@
     if (flag_unit_at_a_time && flag_exceptions)
       PM->add(createPruneEHPass());               // Remove dead EH info
 
-    if (flag_inline_trees)                      // respect -fno-inline-functions
-      PM->add(createFunctionInliningPass());    // Inline small functions
-
     if (optimize > 1) {
+      if (flag_inline_trees > 1)                  // respect -fno-inline-functions
+        PM->add(createFunctionInliningPass());    // Inline small functions
       if (flag_unit_at_a_time && !lang_hooks.flag_no_builtin())
         PM->add(createSimplifyLibCallsPass());  // Library Call Optimizations