Re: [PATCH] Fix crash when handling an argument parsing-related warning.

[Alexander Kornienko]

  Moved end of line comment before the statement.

Hi djasper, klimek,

http://llvm-reviews.chandlerc.com/D2676

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D2676?vs=6827&id=6828#toc

BRANCH
  svn

ARCANIST PROJECT
  clang-tools-extra

Files:
  clang-tidy/ClangTidyDiagnosticConsumer.cpp
  test/clang-tidy/diagnostic.cpp

Index: clang-tidy/ClangTidyDiagnosticConsumer.cpp
===================================================================
--- clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -82,7 +82,9 @@
   // FIXME: Demultiplex diagnostics.
   // FIXME: Ensure that we don't get notes from user code related to errors
   // from non-user code.
-  if (Diags->getSourceManager().isInSystemHeader(Info.getLocation()))
+  // Let argument parsing-related warnings through.
+  if (Diags->hasSourceManager() &&
+      Diags->getSourceManager().isInSystemHeader(Info.getLocation()))
     return;
   if (DiagLevel != DiagnosticsEngine::Note) {
     Errors.push_back(
Index: test/clang-tidy/diagnostic.cpp
===================================================================
--- /dev/null
+++ test/clang-tidy/diagnostic.cpp
@@ -0,0 +1,5 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
+// RUN: clang-tidy %t.cpp -- -fan-unknown-option > %t2.cpp
+// RUN: FileCheck -input-file=%t2.cpp %s
+
+// CHECK: warning: unknown argument: '-fan-unknown-option'

Index: clang-tidy/ClangTidyDiagnosticConsumer.cpp
===================================================================
--- clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -82,7 +82,9 @@
   // FIXME: Demultiplex diagnostics.
   // FIXME: Ensure that we don't get notes from user code related to errors
   // from non-user code.
-  if (Diags->getSourceManager().isInSystemHeader(Info.getLocation()))
+  // Let argument parsing-related warnings through.
+  if (Diags->hasSourceManager() &&
+      Diags->getSourceManager().isInSystemHeader(Info.getLocation()))
     return;
   if (DiagLevel != DiagnosticsEngine::Note) {
     Errors.push_back(
Index: test/clang-tidy/diagnostic.cpp
===================================================================
--- /dev/null
+++ test/clang-tidy/diagnostic.cpp
@@ -0,0 +1,5 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
+// RUN: clang-tidy %t.cpp -- -fan-unknown-option > %t2.cpp
+// RUN: FileCheck -input-file=%t2.cpp %s
+
+// CHECK: warning: unknown argument: '-fan-unknown-option'

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits