[llvm-branch-commits] [llvm-branch] r110252 - in /llvm/branches/Apple/Pertwee: ./ lib/CodeGen/LLVMTargetMachine.cpp test/CodeGen/ARM/2010-08-04-EHCrash.ll

[Bill Wendling]

Author: void
Date: Wed Aug  4 17:02:14 2010
New Revision: 110252

URL: http://llvm.org/viewvc/llvm-project?rev=110252&view=rev
Log:
$ svn merge -c 110249 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r110249 into '.':
A    test/CodeGen/ARM/2010-08-04-EHCrash.ll
$ svn merge -c 110248 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r110248 into '.':
U    lib/CodeGen/LLVMTargetMachine.cpp


Added:
    llvm/branches/Apple/Pertwee/test/CodeGen/ARM/2010-08-04-EHCrash.ll
      - copied unchanged from r110249, llvm/trunk/test/CodeGen/ARM/2010-08-04-EHCrash.ll
Modified:
    llvm/branches/Apple/Pertwee/   (props changed)
    llvm/branches/Apple/Pertwee/lib/CodeGen/LLVMTargetMachine.cpp

Propchange: llvm/branches/Apple/Pertwee/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  4 17:02:14 2010
@@ -1 +1 @@
-/llvm/trunk:109842,109879,110170,110233
+/llvm/trunk:109842,109879,110170,110233,110248-110249

Modified: llvm/branches/Apple/Pertwee/lib/CodeGen/LLVMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Pertwee/lib/CodeGen/LLVMTargetMachine.cpp?rev=110252&r1=110251&r2=110252&view=diff
==============================================================================
--- llvm/branches/Apple/Pertwee/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/branches/Apple/Pertwee/lib/CodeGen/LLVMTargetMachine.cpp Wed Aug  4 17:02:14 2010
@@ -272,6 +272,11 @@
       PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &dbgs()));
   }
 
+  PM.add(createGCLoweringPass());
+
+  // Make sure that no unreachable blocks are instruction selected.
+  PM.add(createUnreachableBlockEliminationPass());
+
   // Turn exception handling constructs into something the code generators can
   // handle.
   switch (getMCAsmInfo()->getExceptionHandlingType()) {
@@ -293,11 +298,6 @@
     break;
   }
 
-  PM.add(createGCLoweringPass());
-
-  // Make sure that no unreachable blocks are instruction selected.
-  PM.add(createUnreachableBlockEliminationPass());
-
   if (OptLevel != CodeGenOpt::None && !DisableCGP)
     PM.add(createCodeGenPreparePass(getTargetLowering()));