This revision was automatically updated to reflect the committed changes. Closed by commit rG1df10f15807f: [Frontend] Remove ShowIncludesPretendHeader (authored by smeenai).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D153176/new/ 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