From 1df10f15807f9b7deba3f714d27e21578a8b4748 Mon Sep 17 00:00:00 2001 From: Shoaib Meenai Date: Fri, 16 Jun 2023 15:44:28 -0700 Subject: [PATCH] [Frontend] Remove ShowIncludesPretendHeader 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. Reviewed By: hans Differential Revision: https://reviews.llvm.org/D153176 --- clang/include/clang/Frontend/DependencyOutputOptions.h | 3 --- clang/lib/Frontend/HeaderIncludeGen.cpp | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/clang/include/clang/Frontend/DependencyOutputOptions.h b/clang/include/clang/Frontend/DependencyOutputOptions.h index e140ff9..e4b26d9 100644 --- a/clang/include/clang/Frontend/DependencyOutputOptions.h +++ b/clang/include/clang/Frontend/DependencyOutputOptions.h @@ -76,9 +76,6 @@ public: /// target. std::vector> 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; diff --git a/clang/lib/Frontend/HeaderIncludeGen.cpp b/clang/lib/Frontend/HeaderIncludeGen.cpp index 27cd8b7..9ada227 100644 --- a/clang/lib/Frontend/HeaderIncludeGen.cpp +++ b/clang/lib/Frontend/HeaderIncludeGen.cpp @@ -214,13 +214,8 @@ void HeaderIncludesCallback::FileChanged(SourceLocation Loc, // 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 @@ void HeaderIncludesCallback::FileChanged(SourceLocation Loc, unsigned IncludeDepth = CurrentIncludeDepth; if (!HasProcessedPredefines) --IncludeDepth; // Ignore indent from . - else if (!DepOpts.ShowIncludesPretendHeader.empty()) - ++IncludeDepth; // Pretend inclusion by ShowIncludesPretendHeader. // FIXME: Identify headers in a more robust way than comparing their name to // "" and "" in a bunch of places. -- 2.7.4