Commit abdd33c8 authored by Charusso's avatar Charusso
Browse files

[analyzer] AnalyzerOptions: Remove 'fixits-as-remarks' 

Summary: The new way of checking fix-its is `%check_analyzer_fixit`.

Reviewed By: NoQ, Szelethus, xazax.hun

Differential Revision: https://reviews.llvm.org/D73729
parent f69c74db

clang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.def

+0 −4
Original line number Diff line number Diff line
@@ -306,10 +306,6 @@ ANALYZER_OPTION(bool, ShouldTrackConditionsDebug, "track-conditions-debug", 
                "Whether to place an event at each tracked condition.",

                false)



ANALYZER_OPTION(bool, ShouldEmitFixItHintsAsRemarks, "fixits-as-remarks",

                "Emit fix-it hints as remarks for testing purposes",

                false)



ANALYZER_OPTION(bool, ShouldApplyFixIts, "apply-fixits",

                "Apply the fix-it hints to the files",

                false)

clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp

+6 −29
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ class ClangDiagPathDiagConsumer : public PathDiagnosticConsumer { 


  bool IncludePath = false;

  bool ShouldEmitAsError = false;

  bool FixitsAsRemarks = false;

  bool ApplyFixIts = false;



public:
@@ -110,7 +109,6 @@ public: 


  void enablePaths() { IncludePath = true; }

  void enableWerror() { ShouldEmitAsError = true; }

  void enableFixitsAsRemarks() { FixitsAsRemarks = true; }

  void enableApplyFixIts() { ApplyFixIts = true; }



  void FlushDiagnosticsImpl(std::vector<const PathDiagnostic *> &Diags,
@@ -120,35 +118,18 @@ public: 
            ? Diag.getCustomDiagID(DiagnosticsEngine::Error, "%0")

            : Diag.getCustomDiagID(DiagnosticsEngine::Warning, "%0");

    unsigned NoteID = Diag.getCustomDiagID(DiagnosticsEngine::Note, "%0");

    unsigned RemarkID = Diag.getCustomDiagID(DiagnosticsEngine::Remark, "%0");

    SourceManager &SM = Diag.getSourceManager();



    Replacements Repls;

    auto reportPiece = [&](unsigned ID, FullSourceLoc Loc, StringRef String,

                           ArrayRef<SourceRange> Ranges,

                           ArrayRef<FixItHint> Fixits) {

      if (!FixitsAsRemarks && !ApplyFixIts) {

      if (!ApplyFixIts) {

        Diag.Report(Loc, ID) << String << Ranges << Fixits;

        return;

      }



      Diag.Report(Loc, ID) << String << Ranges;

      if (FixitsAsRemarks) {

        for (const FixItHint &Hint : Fixits) {

          llvm::SmallString<128> Str;

          llvm::raw_svector_ostream OS(Str);

          // FIXME: Add support for InsertFromRange and

          // BeforePreviousInsertion.

          assert(!Hint.InsertFromRange.isValid() && "Not implemented yet!");

          assert(!Hint.BeforePreviousInsertions && "Not implemented yet!");

          OS << SM.getSpellingColumnNumber(Hint.RemoveRange.getBegin()) << "-"

             << SM.getSpellingColumnNumber(Hint.RemoveRange.getEnd()) << ": '"

             << Hint.CodeToInsert << "'";

          Diag.Report(Loc, RemarkID) << OS.str();

        }

      }



      if (ApplyFixIts) {

      for (const FixItHint &Hint : Fixits) {

        Replacement Repl(SM, Hint.RemoveRange, Hint.CodeToInsert);
@@ -157,7 +138,6 @@ public: 
                       << ": " << Err << "\n";

        }

      }

      }

    };



    for (std::vector<const PathDiagnostic *>::iterator I = Diags.begin(),
@@ -298,9 +278,6 @@ public: 
      if (Opts->AnalyzerWerror)

        clangDiags->enableWerror();



      if (Opts->ShouldEmitFixItHintsAsRemarks)

        clangDiags->enableFixitsAsRemarks();



      if (Opts->ShouldApplyFixIts)

        clangDiags->enableApplyFixIts();

clang/test/Analysis/analyzer-config.c

+1 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
// CHECK-NEXT: experimental-enable-naive-ctu-analysis = false

// CHECK-NEXT: exploration_strategy = unexplored_first_queue

// CHECK-NEXT: faux-bodies = true

// CHECK-NEXT: fixits-as-remarks = false

// CHECK-NEXT: graph-trim-interval = 1000

// CHECK-NEXT: inline-lambdas = true

// CHECK-NEXT: ipa = dynamic-bifurcate
@@ -101,4 +100,4 @@ 
// CHECK-NEXT: unroll-loops = false

// CHECK-NEXT: widen-loops = false

// CHECK-NEXT: [stats]

// CHECK-NEXT: num-entries = 98
 
// CHECK-NEXT: num-entries = 97

clang/test/Analysis/dead-stores.c

+20 −11
Original line number Diff line number Diff line 
// RUN: %clang_analyze_cc1 -Wunused-variable -fblocks -Wno-unreachable-code \

// RUN: %check_analyzer_fixit %s %t \

// RUN:   -Wunused-variable -fblocks -Wno-unreachable-code \

// RUN:   -analyzer-checker=core,deadcode.DeadStores \

// RUN:   -analyzer-config deadcode.DeadStores:ShowFixIts=true \

// RUN:   -analyzer-config fixits-as-remarks=true \

// RUN:   -analyzer-config \

// RUN:       deadcode.DeadStores:WarnForDeadNestedAssignments=false \

// RUN:   -verify=non-nested %s

// RUN:   -verify=non-nested



// RUN: %clang_analyze_cc1 -Wunused-variable -fblocks -Wno-unreachable-code \

// RUN: %check_analyzer_fixit %s %t \

// RUN:   -Wunused-variable -fblocks -Wno-unreachable-code \

// RUN:   -analyzer-checker=core,deadcode.DeadStores \

// RUN:   -analyzer-config deadcode.DeadStores:ShowFixIts=true \

// RUN:   -analyzer-config fixits-as-remarks=true \

// RUN:   -verify=non-nested,nested %s

// RUN:   -verify=non-nested,nested



void f1() {

  int k, y; // non-nested-warning {{unused variable 'k'}}
@@ -18,14 +18,17 @@ void f1() { 
  int abc = 1;

  long idx = abc + 3 * 5; // non-nested-warning {{never read}}

                          // non-nested-warning@-1 {{unused variable 'idx'}}

                          // non-nested-remark@-2 {{11-24: ''}}

  // CHECK-FIXES:      int abc = 1;

  // CHECK-FIXES-NEXT: long idx;

}



void f2(void *b) {

  char *c = (char *)b; // no-warning

  char *d = b + 1;     // non-nested-warning {{never read}}

                       // non-nested-warning@-1 {{unused variable 'd'}}

                       // non-nested-remark@-2 {{10-17: ''}}

  // CHECK-FIXES:      char *c = (char *)b;

  // CHECK-FIXES-NEXT: char *d;



  printf("%s", c);

  // non-nested-warning@-1 {{implicitly declaring library function 'printf' with type 'int (const char *, ...)'}}

  // non-nested-note@-2 {{include the header <stdio.h> or explicitly provide a declaration for 'printf'}}
@@ -51,7 +54,8 @@ void f5() { 
  int x = 4;   // no-warning

  int *p = &x; // non-nested-warning {{never read}}

               // non-nested-warning@-1 {{unused variable 'p'}}

               // non-nested-remark@-2 {{9-13: ''}}

  // CHECK-FIXES:      int x = 4;

  // CHECK-FIXES-NEXT: int *p;

}



int f6() {
@@ -415,7 +419,8 @@ void f23_pos(int argc, char **argv) { 
  int shouldLog = (argc > 1);

  // non-nested-warning@-1 {{Value stored to 'shouldLog' during its initialization is never read}}

  // non-nested-warning@-2 {{unused variable 'shouldLog'}}

  // non-nested-remark@-3 {{16-28: ''}}

  // CHECK-FIXES:      void f23_pos(int argc, char **argv) {

  // CHECK-FIXES-NEXT:   int shouldLog;

  ^{

    f23_aux("I did too use it!\n");

  }();
@@ -428,7 +433,11 @@ void f24_A(int y) { 
    int z = x + y;

    // non-nested-warning@-1 {{Value stored to 'z' during its initialization is never read}}

    // non-nested-warning@-2 {{unused variable 'z'}}

    // non-nested-remark@-3 {{10-17: ''}}

    // CHECK-FIXES:      void f24_A(int y) {

    // CHECK-FIXES-NEXT:   //

    // CHECK-FIXES-NEXT:   int x = (y > 2);

    // CHECK-FIXES-NEXT:   ^{

    // CHECK-FIXES-NEXT:     int z;

  }();

}

clang/test/Analysis/virtualcall-fixit.cpp

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
// RUN: %check_analyzer_fixit %s %t \

// RUN:   -analyzer-checker=core,optin.cplusplus.VirtualCall \

// RUN:   -analyzer-config optin.cplusplus.VirtualCall:ShowFixIts=true



struct S {

  virtual void foo();

  S() {

    foo();

    // expected-warning@-1 {{Call to virtual method 'S::foo' during construction bypasses virtual dispatch}}

    // CHECK-FIXES: S::foo();

  }

  ~S();

};