[llvm-branch-commits] [llvm-branch] r110282 - in /llvm/branches/Apple/Pertwee: ./ lib/CodeGen/LLVMTargetMachine.cpp test/CodeGen/X86/2010-08-04-MingWCrash.ll

[Bill Wendling]

Author: void
Date: Wed Aug  4 18:39:38 2010
New Revision: 110282

URL: http://llvm.org/viewvc/llvm-project?rev=110282&view=rev
Log:
$ svn merge -c 110279 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r110279 into '.':
A    test/CodeGen/X86/2010-08-04-MingWCrash.ll
U    lib/CodeGen/LLVMTargetMachine.cpp


Added:
    llvm/branches/Apple/Pertwee/test/CodeGen/X86/2010-08-04-MingWCrash.ll
      - copied unchanged from r110279, llvm/trunk/test/CodeGen/X86/2010-08-04-MingWCrash.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 18:39:38 2010
@@ -1 +1 @@
-/llvm/trunk:109842,109879,110170,110233,110248-110249,110254
+/llvm/trunk:109842,109879,110170,110233,110248-110249,110254,110279

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=110282&r1=110281&r2=110282&view=diff
==============================================================================
--- llvm/branches/Apple/Pertwee/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/branches/Apple/Pertwee/lib/CodeGen/LLVMTargetMachine.cpp Wed Aug  4 18:39:38 2010
@@ -288,13 +288,15 @@
     // pad is shared by multiple invokes and is also a target of a normal
     // edge from elsewhere.
     PM.add(createSjLjEHPass(getTargetLowering()));
-    PM.add(createDwarfEHPass(this, OptLevel==CodeGenOpt::None));
-    break;
+    // FALLTHROUGH
   case ExceptionHandling::Dwarf:
     PM.add(createDwarfEHPass(this, OptLevel==CodeGenOpt::None));
     break;
   case ExceptionHandling::None:
     PM.add(createLowerInvokePass(getTargetLowering()));
+
+    // The lower invoke pass may create unreachable code. Remove it.
+    PM.add(createUnreachableBlockEliminationPass());
     break;
   }