diff --git a/lib/CodeGen/AsmPrinter/DwarfException.cpp b/lib/CodeGen/AsmPrinter/DwarfException.cpp
index bb33b8e41d0..93cc012edce 100644
--- a/lib/CodeGen/AsmPrinter/DwarfException.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfException.cpp
@@ -485,10 +485,9 @@ bool DwarfException::CallToNoUnwindFunction(const MachineInstr *MI) {
           MarkedNoUnwind = false;
           break;
         }
-        if (F->doesNotThrow()) {
-          SawFunc = true;
-          MarkedNoUnwind = true;
-        }
+
+        MarkedNoUnwind = F->doesNotThrow();
+        SawFunc = true;
       }
     }
   }