From 21da04f701735ecd42f1d43b3f58b708ad382905 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 27 Apr 2021 12:31:09 -0400 Subject: [PATCH] [llvm, clang] Remove stdlib includes from .h files without `std::` Found files not containing `std::` with: INCL="algorithm|array|list|map|memory|queue|set|string|utility|vector|unordered_map|unordered_set" git ls-files llvm/include/llvm | grep '\.h$' | xargs grep -L std:: | \ xargs grep -El "#include <($INCL)>$" > to_process.txt git ls-files clang/include/clang | grep '\.h$' | xargs grep -L std:: | \ xargs grep -El "#include <($INCL)>$" >> to_process.txt Then removed these headers from those files with INCL_ESCAPED="$(echo $INCL|sed 's/|/\\|/g')" cat to_process.txt | xargs sed -i "/^#include <\($INCL_ESCAPED\)>$/d" cat to_process.txt | xargs sed -i '/^$/N;/^\n$/D' No behavior change. Differential Revision: https://reviews.llvm.org/D101378 --- clang/include/clang/AST/DeclContextInternals.h | 1 - clang/include/clang/Driver/Options.h | 2 -- clang/include/clang/Index/CommentToXML.h | 1 - clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h | 1 - clang/include/clang/Tooling/Refactoring/RefactoringActionRule.h | 1 - clang/include/clang/Tooling/Transformer/Parsing.h | 1 - llvm/include/llvm/CodeGen/MachineInstrBuilder.h | 1 - llvm/include/llvm/CodeGen/TileShapeInfo.h | 1 - llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h | 1 - llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h | 1 - llvm/include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h | 1 - llvm/include/llvm/DebugInfo/GSYM/FileEntry.h | 1 - llvm/include/llvm/DebugInfo/GSYM/StringTable.h | 2 -- llvm/include/llvm/ExecutionEngine/Orc/OrcABISupport.h | 1 - llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h | 1 - llvm/include/llvm/Target/CGPassBuilderOption.h | 1 - llvm/include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h | 1 - 17 files changed, 19 deletions(-) diff --git a/clang/include/clang/AST/DeclContextInternals.h b/clang/include/clang/AST/DeclContextInternals.h index 3556044..2eef234 100644 --- a/clang/include/clang/AST/DeclContextInternals.h +++ b/clang/include/clang/AST/DeclContextInternals.h @@ -22,7 +22,6 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/PointerIntPair.h" #include "llvm/ADT/PointerUnion.h" -#include #include namespace clang { diff --git a/clang/include/clang/Driver/Options.h b/clang/include/clang/Driver/Options.h index b641f64..0566601 100644 --- a/clang/include/clang/Driver/Options.h +++ b/clang/include/clang/Driver/Options.h @@ -9,8 +9,6 @@ #ifndef LLVM_CLANG_DRIVER_OPTIONS_H #define LLVM_CLANG_DRIVER_OPTIONS_H -#include - namespace llvm { namespace opt { class OptTable; diff --git a/clang/include/clang/Index/CommentToXML.h b/clang/include/clang/Index/CommentToXML.h index 66b8650..29904f1 100644 --- a/clang/include/clang/Index/CommentToXML.h +++ b/clang/include/clang/Index/CommentToXML.h @@ -10,7 +10,6 @@ #define LLVM_CLANG_INDEX_COMMENTTOXML_H #include "clang/Basic/LLVM.h" -#include namespace clang { class ASTContext; diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h index 2679339..ffe1fe8 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h @@ -24,7 +24,6 @@ #include "clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h" #include "llvm/ADT/ImmutableMap.h" #include "llvm/ADT/Optional.h" -#include namespace clang { namespace ento { diff --git a/clang/include/clang/Tooling/Refactoring/RefactoringActionRule.h b/clang/include/clang/Tooling/Refactoring/RefactoringActionRule.h index 0c6e38a..57dffa9 100644 --- a/clang/include/clang/Tooling/Refactoring/RefactoringActionRule.h +++ b/clang/include/clang/Tooling/Refactoring/RefactoringActionRule.h @@ -12,7 +12,6 @@ #include "clang/Basic/LLVM.h" #include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" -#include namespace clang { namespace tooling { diff --git a/clang/include/clang/Tooling/Transformer/Parsing.h b/clang/include/clang/Tooling/Transformer/Parsing.h index 8e51f59..b143f63 100644 --- a/clang/include/clang/Tooling/Transformer/Parsing.h +++ b/clang/include/clang/Tooling/Transformer/Parsing.h @@ -21,7 +21,6 @@ #include "clang/Tooling/Transformer/RangeSelector.h" #include "llvm/Support/Error.h" #include -#include namespace clang { namespace transformer { diff --git a/llvm/include/llvm/CodeGen/MachineInstrBuilder.h b/llvm/include/llvm/CodeGen/MachineInstrBuilder.h index 5a6f688..80f3023 100644 --- a/llvm/include/llvm/CodeGen/MachineInstrBuilder.h +++ b/llvm/include/llvm/CodeGen/MachineInstrBuilder.h @@ -31,7 +31,6 @@ #include "llvm/Support/ErrorHandling.h" #include #include -#include namespace llvm { diff --git a/llvm/include/llvm/CodeGen/TileShapeInfo.h b/llvm/include/llvm/CodeGen/TileShapeInfo.h index 031d235..4e574bd 100644 --- a/llvm/include/llvm/CodeGen/TileShapeInfo.h +++ b/llvm/include/llvm/CodeGen/TileShapeInfo.h @@ -24,7 +24,6 @@ #include "llvm/CodeGen/MachineOperand.h" #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/CodeGen/Register.h" -#include namespace llvm { diff --git a/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h b/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h index 55b9535..5a91682 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h +++ b/llvm/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h @@ -17,7 +17,6 @@ #include "llvm/DebugInfo/CodeView/TypeIndex.h" #include "llvm/Support/Allocator.h" #include -#include namespace llvm { namespace codeview { diff --git a/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h b/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h index 9d79140..465c26e 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h +++ b/llvm/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h @@ -20,7 +20,6 @@ #include "llvm/Support/Allocator.h" #include #include -#include namespace llvm { namespace codeview { diff --git a/llvm/include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h b/llvm/include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h index 40ac25c..0f9d5e4 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h +++ b/llvm/include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h @@ -19,7 +19,6 @@ #include "llvm/DebugInfo/CodeView/TypeIndex.h" #include "llvm/Support/Allocator.h" #include -#include namespace llvm { namespace codeview { diff --git a/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h b/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h index 538f676..8e00c5f 100644 --- a/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h +++ b/llvm/include/llvm/DebugInfo/GSYM/FileEntry.h @@ -13,7 +13,6 @@ #include "llvm/ADT/Hashing.h" #include #include -#include namespace llvm { namespace gsym { diff --git a/llvm/include/llvm/DebugInfo/GSYM/StringTable.h b/llvm/include/llvm/DebugInfo/GSYM/StringTable.h index 3c0c654..f7f800d 100644 --- a/llvm/include/llvm/DebugInfo/GSYM/StringTable.h +++ b/llvm/include/llvm/DebugInfo/GSYM/StringTable.h @@ -13,8 +13,6 @@ #include "llvm/ADT/StringRef.h" #include "llvm/DebugInfo/GSYM/Range.h" #include -#include - namespace llvm { namespace gsym { diff --git a/llvm/include/llvm/ExecutionEngine/Orc/OrcABISupport.h b/llvm/include/llvm/ExecutionEngine/Orc/OrcABISupport.h index 5061c15..82dfdc2 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/OrcABISupport.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/OrcABISupport.h @@ -21,7 +21,6 @@ #include "llvm/Support/Error.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" -#include #include namespace llvm { diff --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h index 811c50e..14d30c4 100644 --- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h +++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h @@ -16,7 +16,6 @@ #include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h" #include "llvm/Support/Error.h" -#include namespace llvm { namespace orc { diff --git a/llvm/include/llvm/Target/CGPassBuilderOption.h b/llvm/include/llvm/Target/CGPassBuilderOption.h index 09001d7..11b904e 100644 --- a/llvm/include/llvm/Target/CGPassBuilderOption.h +++ b/llvm/include/llvm/Target/CGPassBuilderOption.h @@ -17,7 +17,6 @@ #include "llvm/ADT/Optional.h" #include "llvm/ADT/StringRef.h" #include "llvm/Target/TargetOptions.h" -#include namespace llvm { class TargetMachine; diff --git a/llvm/include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h b/llvm/include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h index 3c7dafe..2104daf 100644 --- a/llvm/include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h +++ b/llvm/include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h @@ -15,7 +15,6 @@ #include "llvm/IR/Function.h" #include "llvm/IR/PassManager.h" #include "llvm/Support/Compiler.h" -#include namespace llvm { -- 2.7.4