Allow notes to be printed following a fatal error, then suppress any

diagnostics following those notes. 

Make exceeding the template instantiation depth a fatal error.

Thanks to Daniel for pointing out the problem!

llvm-svn: 67320

1 files changed, 2 insertions, 0 deletions

diff --git a/clang/Driver/Warnings.cpp b/clang/Driver/Warnings.cpp
index 3a9943516bc..18e44d72e3c 100644
--- a/clang/Driver/Warnings.cpp
+++ b/clang/Driver/Warnings.cpp
@@ -170,6 +170,8 @@ bool ProcessWarningOptions(Diagnostic &Diags) {
                              diag::MAP_IGNORE);
 
   Diags.setDiagnosticMapping(diag::err_pp_file_not_found, diag::MAP_FATAL);
+  Diags.setDiagnosticMapping(diag::err_template_recursion_depth_exceeded, 
+                             diag::MAP_FATAL);
   Diags.setSuppressSystemWarnings(!OptWarnInSystemHeaders);
 
   for (OptionsList::iterator it = Options.begin(), e = Options.end();