smeenai created this revision. smeenai added reviewers: hans, rnk, thakis. Herald added a project: All. smeenai requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits.
It hasn't been written to since https://reviews.llvm.org/D46652, so it was always empty. I don't have enough context on that diff to know if the removal of the write to ShowIncludesPretendHeader in that diff was intentional, but no one's complained about it for five years, so I assume we're okay to just get rid of it entirely. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D153176 Files: clang/include/clang/Frontend/DependencyOutputOptions.h clang/lib/Frontend/HeaderIncludeGen.cpp Index: clang/lib/Frontend/HeaderIncludeGen.cpp =================================================================== --- clang/lib/Frontend/HeaderIncludeGen.cpp +++ clang/lib/Frontend/HeaderIncludeGen.cpp @@ -214,13 +214,8 @@ // We track when we are done with the predefines by watching for the first // place where we drop back to a nesting depth of 1. - if (CurrentIncludeDepth == 1 && !HasProcessedPredefines) { - if (!DepOpts.ShowIncludesPretendHeader.empty()) { - PrintHeaderInfo(OutputFile, DepOpts.ShowIncludesPretendHeader, - ShowDepth, 2, MSStyle); - } + if (CurrentIncludeDepth == 1 && !HasProcessedPredefines) HasProcessedPredefines = true; - } return; } else { @@ -233,8 +228,6 @@ unsigned IncludeDepth = CurrentIncludeDepth; if (!HasProcessedPredefines) --IncludeDepth; // Ignore indent from <built-in>. - else if (!DepOpts.ShowIncludesPretendHeader.empty()) - ++IncludeDepth; // Pretend inclusion by ShowIncludesPretendHeader. // FIXME: Identify headers in a more robust way than comparing their name to // "<command line>" and "<built-in>" in a bunch of places. Index: clang/include/clang/Frontend/DependencyOutputOptions.h =================================================================== --- clang/include/clang/Frontend/DependencyOutputOptions.h +++ clang/include/clang/Frontend/DependencyOutputOptions.h @@ -76,9 +76,6 @@ /// target. std::vector<std::pair<std::string, ExtraDepKind>> ExtraDeps; - /// In /showIncludes mode, pretend the main TU is a header with this name. - std::string ShowIncludesPretendHeader; - /// The file to write GraphViz-formatted header dependencies to. std::string DOTOutputFile;
Index: clang/lib/Frontend/HeaderIncludeGen.cpp =================================================================== --- clang/lib/Frontend/HeaderIncludeGen.cpp +++ clang/lib/Frontend/HeaderIncludeGen.cpp @@ -214,13 +214,8 @@ // We track when we are done with the predefines by watching for the first // place where we drop back to a nesting depth of 1. - if (CurrentIncludeDepth == 1 && !HasProcessedPredefines) { - if (!DepOpts.ShowIncludesPretendHeader.empty()) { - PrintHeaderInfo(OutputFile, DepOpts.ShowIncludesPretendHeader, - ShowDepth, 2, MSStyle); - } + if (CurrentIncludeDepth == 1 && !HasProcessedPredefines) HasProcessedPredefines = true; - } return; } else { @@ -233,8 +228,6 @@ unsigned IncludeDepth = CurrentIncludeDepth; if (!HasProcessedPredefines) --IncludeDepth; // Ignore indent from <built-in>. - else if (!DepOpts.ShowIncludesPretendHeader.empty()) - ++IncludeDepth; // Pretend inclusion by ShowIncludesPretendHeader. // FIXME: Identify headers in a more robust way than comparing their name to // "<command line>" and "<built-in>" in a bunch of places. Index: clang/include/clang/Frontend/DependencyOutputOptions.h =================================================================== --- clang/include/clang/Frontend/DependencyOutputOptions.h +++ clang/include/clang/Frontend/DependencyOutputOptions.h @@ -76,9 +76,6 @@ /// target. std::vector<std::pair<std::string, ExtraDepKind>> ExtraDeps; - /// In /showIncludes mode, pretend the main TU is a header with this name. - std::string ShowIncludesPretendHeader; - /// The file to write GraphViz-formatted header dependencies to. std::string DOTOutputFile;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits