[llvm] r278577 - X86: Fix another dereferenced end() iterator after r278532

Hans Wennborg via llvm-commits llvm-commits at lists.llvm.org
Fri Aug 12 16:36:00 PDT 2016


Author: hans
Date: Fri Aug 12 18:35:59 2016
New Revision: 278577

URL: http://llvm.org/viewvc/llvm-project?rev=278577&view=rev
Log:
X86: Fix another dereferenced end() iterator after r278532

Modified:
    llvm/trunk/lib/Target/X86/X86FrameLowering.cpp

Modified: llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FrameLowering.cpp?rev=278577&r1=278576&r2=278577&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86FrameLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FrameLowering.cpp Fri Aug 12 18:35:59 2016
@@ -1959,7 +1959,7 @@ bool X86FrameLowering::restoreCalleeSave
   if (CSI.empty())
     return false;
 
-  if (isFuncletReturnInstr(*MI) && STI.isOSWindows()) {
+  if (MI != MBB.end() && isFuncletReturnInstr(*MI) && STI.isOSWindows()) {
     // Don't restore CSRs in 32-bit EH funclets. Matches
     // spillCalleeSavedRegisters.
     if (STI.is32Bit())




More information about the llvm-commits mailing list