gistfile1.diff

diff --cc lib/IRGen/IRGenModule.cpp
index 099d3c0,03468f7..0000000
--- a/lib/IRGen/IRGenModule.cpp
+++ b/lib/IRGen/IRGenModule.cpp
@@@ -93,9 -93,7 +93,13 @@@ static clang::CodeGenerator *createClan
    case IRGenDebugInfoKind::LineTables:
      CGO.setDebugInfo(clang::codegenoptions::DebugInfoKind::DebugLineTablesOnly);
      break;
++<<<<<<< a513ba4847a45aed980eb1a85b811edb9ff20412
 +  case IRGenDebugInfoKind::ASTTypes:
 +    // TODO: Enable -gmodules for the clang code generator.
 +  case IRGenDebugInfoKind::DwarfTypes:
++=======
+  case IRGenDebugInfoKind::Normal:
++>>>>>>> [upstream-update] Rename of namespace clang::CodeGenOptions => clang::codegenoptions. NFC.
      CGO.setDebugInfo(clang::codegenoptions::DebugInfoKind::FullDebugInfo);
      break;
    }