revert "r209526 List the function/method name in the index page of scan-build "

Depends on http://reviews.llvm.org/D3762

llvm-svn: 209527

2 files changed, 3 insertions, 17 deletions

diff --git a/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp b/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp
index a2997739fe7..07a793e6ef7 100644
--- a/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp
+++ b/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp
@@ -215,10 +215,6 @@ void HTMLDiagnostics::ReportDiag(const PathDiagnostic& D,
 
     os << "\n<!-- BUGFILE " << DirName << Entry->getName() << " -->\n";
 
-    os << "\n<!-- FILENAME " << llvm::sys::path::filename(Entry->getName()) << " -->\n";
-
-    os  << "\n<!-- FUNCTIONNAME " <<  declName << " -->\n";
-
     os << "\n<!-- BUGLINE "
        << path.back()->getLocation().asLocation().getExpansionLineNumber()
        << " -->\n";
diff --git a/clang/tools/scan-build/scan-build b/clang/tools/scan-build/scan-build
index c444249c0a2..7502a424320 100755
--- a/clang/tools/scan-build/scan-build
+++ b/clang/tools/scan-build/scan-build
@@ -368,7 +368,6 @@ sub ScanFile {
 
   my $BugType        = "";
   my $BugFile        = "";
-  my $BugFunction    = "";
   my $BugCategory    = "";
   my $BugDescription = "";
   my $BugPathLength  = 1;
@@ -396,10 +395,6 @@ sub ScanFile {
     elsif (/<!-- BUGDESC (.*) -->$/) {
       $BugDescription = $1;
     }
-    elsif (/<!-- FUNCTIONNAME (.*) -->$/) {
-      $BugFunction = $1;
-    }
-
   }
 
   close(IN);
@@ -414,7 +409,7 @@ sub ScanFile {
     return;
   }
 
-  push @$Index,[ $FName, $BugCategory, $BugType, $BugFile, $BugFunction, $BugLine,
+  push @$Index,[ $FName, $BugCategory, $BugType, $BugFile, $BugLine,
                  $BugPathLength ];
 }
 
@@ -704,7 +699,6 @@ print OUT <<ENDTEXT;
   <td>Bug Group</td>
   <td class="sorttable_sorted">Bug Type<span id="sorttable_sortfwdind">&nbsp;&#x25BE;</span></td>
   <td>File</td>
-  <td>Function/Method</td>
   <td class="Q">Line</td>
   <td class="Q">Path Length</td>
   <td class="sorttable_nosort"></td>
@@ -762,17 +756,13 @@ ENDTEXT
       }
       print OUT "</td>";
 
-      print OUT "<td class=\"DESC\">";
-      print OUT $row->[4];
-      print OUT "</td>";
-
       # Print out the quantities.
-      for my $j ( 5 .. 6 ) {
+      for my $j ( 4 .. 5 ) {
         print OUT "<td class=\"Q\">$row->[$j]</td>";
       }
 
       # Print the rest of the columns.
-      for (my $j = 7; $j <= $#{$row}; ++$j) {
+      for (my $j = 6; $j <= $#{$row}; ++$j) {
         print OUT "<td>$row->[$j]</td>"
       }