Index: lib/Lex/Lexer.cpp
===================================================================
--- lib/Lex/Lexer.cpp
+++ lib/Lex/Lexer.cpp
@@ -672,6 +672,7 @@
       // directive or it was one that can't occur in the preamble at this
       // point. Roll back the current token to the location of the '#'.
       InPreprocessorDirective = false;
+      (void) InPreprocessorDirective;
       TheTok = HashTok;
     }
 
Index: lib/Lex/ModuleMap.cpp
===================================================================
--- lib/Lex/ModuleMap.cpp
+++ lib/Lex/ModuleMap.cpp
@@ -2197,6 +2197,7 @@
     if (Framework) {
       Diags.Report(StarLoc, diag::err_mmap_inferred_framework_submodule);
       Framework = false;
+      (void) Framework;
     }
   } else if (Explicit) {
     Diags.Report(StarLoc, diag::err_mmap_explicit_inferred_framework);