Merge pull request #11491 from TerranCivilian/fix-10269

chriseth · web-flow · commit 7d8a4e63d84f · 2021-06-07T20:15:20.000+02:00
Remove unneeded include files
diff --git a/libevmasm/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
@@ -29,7 +29,6 @@
 
 #include <functional>
 #include <tuple>
-#include <utility>
 
 using namespace std;
 using namespace solidity;
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
@@ -24,7 +24,6 @@
 
 #include <libsolutil/Common.h>
 #include <libsolutil/CommonIO.h>
-#include <algorithm>
 #include <functional>
 
 using namespace std;
diff --git a/libevmasm/SimplificationRules.cpp b/libevmasm/SimplificationRules.cpp
@@ -26,7 +26,6 @@
 
 #include <libevmasm/ExpressionClasses.h>
 #include <libevmasm/Assembly.h>
-#include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/RuleList.h>
 #include <libsolutil/Assertions.h>
 
diff --git a/liblangutil/ErrorReporter.cpp b/liblangutil/ErrorReporter.cpp
@@ -23,7 +23,6 @@
 
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SourceLocation.h>
-#include <cstdlib>
 #include <memory>
 
 using namespace std;
diff --git a/liblangutil/SourceReferenceExtractor.cpp b/liblangutil/SourceReferenceExtractor.cpp
@@ -21,7 +21,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <iomanip>
 
 using namespace std;
 using namespace solidity;
diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <liblangutil/SourceReferenceFormatter.h>
-#include <liblangutil/Scanner.h>
 #include <liblangutil/Exceptions.h>
 #include <libsolutil/UTF8.h>
 #include <iomanip>
diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
@@ -25,8 +25,6 @@
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/Version.h>
 #include <libyul/YulString.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/JSON.h>
 
 #include <cstdlib>
 #include <list>
diff --git a/libsolidity/analysis/ControlFlowGraph.cpp b/libsolidity/analysis/ControlFlowGraph.cpp
@@ -19,7 +19,6 @@
 #include <libsolidity/analysis/ControlFlowGraph.h>
 
 #include <libsolidity/analysis/ControlFlowBuilder.h>
-#include <algorithm>
 
 using namespace std;
 using namespace solidity::langutil;
diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp
@@ -24,7 +24,6 @@
 #include <libsolidity/analysis/DeclarationContainer.h>
 
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/ast/Types.h>
 #include <libsolutil/StringUtils.h>
 
 using namespace std;
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
@@ -30,9 +30,6 @@
 
 #include <libsolutil/UTF8.h>
 
-#include <boost/algorithm/string.hpp>
-
-#include <memory>
 #include <string>
 
 using namespace std;
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
@@ -31,7 +31,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <algorithm>
 #include <functional>
 #include <utility>
 
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
@@ -48,10 +48,7 @@
 #include <liblangutil/Scanner.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <boost/algorithm/string/replace.hpp>
-
 #include <utility>
-#include <numeric>
 
 // Change to "define" to output all intermediate code
 #undef SOL_OUTPUT_ASM
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
@@ -18,7 +18,6 @@
 
 #include <libsolidity/formal/BMC.h>
 
-#include <libsolidity/formal/SymbolicState.h>
 #include <libsolidity/formal/SymbolicTypes.h>
 
 #include <libsmtutil/SMTPortfolio.h>
diff --git a/libsolidity/formal/SymbolicVariables.cpp b/libsolidity/formal/SymbolicVariables.cpp
@@ -20,7 +20,6 @@
 
 #include <libsolidity/formal/EncodingContext.h>
 #include <libsolidity/formal/SymbolicTypes.h>
-#include <libsolidity/ast/AST.h>
 
 #include <libsolutil/Algorithms.h>
 
diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
@@ -19,7 +19,6 @@
 
 #include <liblangutil/Exceptions.h>
 
-#include <libsolutil/CommonData.h>
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/Exceptions.h>
 
diff --git a/libsolutil/CommonIO.cpp b/libsolutil/CommonIO.cpp
@@ -26,7 +26,6 @@
 #include <boost/filesystem.hpp>
 
 #include <iostream>
-#include <cstdlib>
 #include <fstream>
 #if defined(_WIN32)
 #include <windows.h>
diff --git a/libsolutil/IpfsHash.cpp b/libsolutil/IpfsHash.cpp
@@ -18,7 +18,6 @@
 
 #include <libsolutil/IpfsHash.h>
 
-#include <libsolutil/Assertions.h>
 #include <libsolutil/Exceptions.h>
 #include <libsolutil/picosha2.h>
 #include <libsolutil/CommonData.h>
diff --git a/libsolutil/Keccak256.cpp b/libsolutil/Keccak256.cpp
@@ -23,8 +23,6 @@
 #include <libsolutil/Keccak256.h>
 
 #include <cstdint>
-#include <cstdio>
-#include <cstdlib>
 #include <cstring>
 
 using namespace std;
diff --git a/libsolutil/StringUtils.cpp b/libsolutil/StringUtils.cpp
@@ -23,7 +23,6 @@
  */
 
 #include <libsolutil/StringUtils.h>
-#include <algorithm>
 #include <string>
 #include <vector>
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
@@ -35,12 +35,10 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Visitor.h>
 
-#include <boost/range/adaptor/reversed.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <memory>
 #include <functional>
-#include <utility>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
@@ -31,7 +31,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <cctype>
 #include <algorithm>
 
 using namespace std;
diff --git a/libyul/AssemblyStack.cpp b/libyul/AssemblyStack.cpp
@@ -25,7 +25,6 @@
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmPrinter.h>
 #include <libyul/backends/evm/EthAssemblyAdapter.h>
 #include <libyul/backends/evm/EVMAssembly.h>
 #include <libyul/backends/evm/EVMCodeTransform.h>
@@ -35,7 +34,6 @@
 #include <libyul/backends/wasm/WasmDialect.h>
 #include <libyul/backends/wasm/WasmObjectCompiler.h>
 #include <libyul/backends/wasm/EVMToEwasmTranslator.h>
-#include <libyul/optimiser/Metrics.h>
 #include <libyul/ObjectParser.h>
 #include <libyul/optimiser/Suite.h>
 
diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
@@ -26,8 +26,6 @@
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/NoOutputAssembly.h>
 
-#include <liblangutil/EVMVersion.h>
-
 using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
diff --git a/libyul/Scope.cpp b/libyul/Scope.cpp
@@ -21,8 +21,6 @@
 
 #include <libyul/Scope.h>
 
-#include <libsolutil/Visitor.h>
-
 using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
@@ -30,7 +30,6 @@
 #include <boost/algorithm/string.hpp>
 
 #include <algorithm>
-#include <iterator>
 #include <sstream>
 #include <vector>
 
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
@@ -29,7 +29,6 @@
 #include <libevmasm/Instruction.h>
 #include <libevmasm/GasMeter.h>
 
-#include <libsolutil/Visitor.h>
 #include <libsolutil/CommonData.h>
 
 using namespace std;
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -26,7 +26,6 @@
 
 #include <libyul/Object.h>
 #include <libyul/Exceptions.h>
-#include <libevmasm/Assembly.h>
 
 using namespace solidity::yul;
 using namespace std;
diff --git a/libyul/backends/wasm/WasmCodeTransform.cpp b/libyul/backends/wasm/WasmCodeTransform.cpp
@@ -23,8 +23,6 @@
 
 #include <libyul/backends/wasm/WasmDialect.h>
 
-#include <libyul/optimiser/NameCollector.h>
-
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
@@ -21,8 +21,6 @@
 
 #include <libyul/optimiser/ASTCopier.h>
 
-#include <libyul/Exceptions.h>
-
 #include <libyul/AST.h>
 
 #include <libsolutil/Common.h>
diff --git a/libyul/optimiser/BlockFlattener.cpp b/libyul/optimiser/BlockFlattener.cpp
@@ -19,7 +19,6 @@
 #include <libyul/optimiser/BlockFlattener.h>
 #include <libyul/AST.h>
 
-#include <libsolutil/Visitor.h>
 #include <libsolutil/CommonData.h>
 
 #include <functional>
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
@@ -24,8 +24,6 @@
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
-#include <libsolutil/CommonData.h>
-
 using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -21,7 +21,6 @@
 
 #include <libyul/optimiser/CommonSubexpressionEliminator.h>
 
-#include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/Semantics.h>
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -18,10 +18,8 @@
 #include <libyul/optimiser/ConditionalSimplifier.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/AST.h>
-#include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -21,7 +21,6 @@
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/DeadCodeEliminator.cpp b/libyul/optimiser/DeadCodeEliminator.cpp
@@ -25,7 +25,6 @@
 #include <libyul/AST.h>
 
 #include <libevmasm/SemanticInformation.h>
-#include <libevmasm/AssemblyItem.h>
 
 #include <algorithm>
 
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
@@ -22,15 +22,13 @@
 
 #include <libyul/optimiser/ExpressionSplitter.h>
 
-#include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/TypeInfo.h>
 
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
 
 #include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
@@ -22,9 +22,7 @@
 #include <libyul/optimiser/FullInliner.h>
 
 #include <libyul/optimiser/ASTCopier.h>
-#include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/NameCollector.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/optimiser/Semantics.h>
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
@@ -25,7 +25,6 @@
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/optimiser/Semantics.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
@@ -30,7 +30,6 @@
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
-#include <libevmasm/Instruction.h>
 #include <libevmasm/GasMeter.h>
 #include <libsolutil/Keccak256.h>
 
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
@@ -26,9 +26,7 @@
 #include <libyul/Utilities.h>
 
 #include <libevmasm/Instruction.h>
-#include <libevmasm/GasMeter.h>
 
-#include <libsolutil/Visitor.h>
 #include <libsolutil/CommonData.h>
 
 using namespace std;
diff --git a/libyul/optimiser/ReasoningBasedSimplifier.cpp b/libyul/optimiser/ReasoningBasedSimplifier.cpp
@@ -21,13 +21,11 @@
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/AST.h>
-#include <libyul/Utilities.h>
 #include <libyul/Dialect.h>
 
 #include <libsmtutil/SMTPortfolio.h>
 #include <libsmtutil/Helpers.h>
 
-#include <libsolutil/Visitor.h>
 #include <libsolutil/CommonData.h>
 
 #include <utility>
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
@@ -21,7 +21,6 @@
 
 #include <libyul/optimiser/StackCompressor.h>
 
-#include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Rematerialiser.h>
 #include <libyul/optimiser/UnusedPruner.h>
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
@@ -22,7 +22,6 @@
 #include <libyul/optimiser/StackToMemoryMover.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/AST.h>
-#include <libyul/Dialect.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Object.h>
 #include <libyul/Utilities.h>
diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
@@ -16,7 +16,6 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/optimiser/Semantics.h>
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
diff --git a/libyul/optimiser/UnusedFunctionsCommon.cpp b/libyul/optimiser/UnusedFunctionsCommon.cpp
