Merge pull request #15203 from ethereum/replaceErrorsEmptyWithHasErrors

Replace empty check of error, warning and info list with check for errors only
ethereum · Sep 9, 2024 · ac81d42 · ac81d42
2 parents 40758c3 + 13fe5ba
commit ac81d42
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 21 deletions.
diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
@@ -130,6 +130,12 @@ class ErrorReporter
 		return m_errorCount > 0;
 	}
 
+	/// @returns true if there is any error, warning or info.
+	bool hasErrorsWarningsOrInfos() const
+	{
+		return m_errorCount + m_warningCount + m_infoCount > 0;
+	}
+
 	/// @returns the number of errors (ignores warnings and infos).
 	unsigned errorCount() const
 	{

diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
@@ -256,6 +256,11 @@ class Error: virtual public util::Exception
 		return false;
 	}
 
+	static bool hasErrorsWarningsOrInfos(ErrorList const& _list)
+	{
+		return !_list.empty();
+	}
+
 	static std::string formatErrorSeverity(Severity _severity)
 	{
 		switch (_severity)

diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -329,7 +329,7 @@ void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
 	Type const* baseType = _typeName.baseType().annotation().type;
 	if (!baseType)
 	{
-		solAssert(!m_errorReporter.errors().empty(), "");
+		solAssert(m_errorReporter.hasErrors(), "");
 		return;
 	}
 

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
@@ -473,7 +473,7 @@ void CompilerContext::appendInlineAssembly(
 			dialect,
 			identifierAccess.resolve
 		).analyze(parserResult->root());
-	if (!parserResult || !errorReporter.errors().empty() || !analyzerResult)
+	if (!parserResult || errorReporter.hasErrorsWarningsOrInfos() || !analyzerResult)
 		reportError("Invalid assembly generated by code generator.");
 	std::shared_ptr<yul::AST const> toBeAssembledAST = parserResult;
 
@@ -513,10 +513,10 @@ void CompilerContext::appendInlineAssembly(
 		m_generatedYulUtilityCode = _assembly;
 	}
 
-	if (!errorReporter.errors().empty())
+	if (errorReporter.hasErrorsWarningsOrInfos())
 		reportError("Failed to analyze inline assembly block.");
 
-	solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block.");
+	solAssert(!errorReporter.hasErrorsWarningsOrInfos(), "Failed to analyze inline assembly block.");
 	yul::CodeGenerator::assemble(
 		toBeAssembledAST->root(),
 		analysisInfo,

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
@@ -1621,14 +1621,7 @@ Json StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 
 	// Inconsistent state - stop here to receive error reports from users
 	if (!stack.parseAndAnalyze(sourceName, sourceContents) && !stack.hasErrors())
-	{
-		output["errors"].emplace_back(formatError(
-			Error::Type::InternalCompilerError,
-			"general",
-			"No error reported, but compilation failed."
-		));
-		return output;
-	}
+		solAssert(false, "No error reported, but parsing/analysis failed.");
 
 	for (auto const& error: stack.errors())
 	{

diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
@@ -64,7 +64,7 @@ bool YulStack::parse(std::string const& _sourceName, std::string const& _source)
 		reportUnimplementedFeatureError(_error);
 	}
 
-	if (m_errorReporter.errors().empty())
+	if (!m_errorReporter.hasErrors())
 		m_stackState = Parsed;
 
 	return m_stackState == Parsed;

diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
@@ -131,7 +131,7 @@ void parsePrintCompare(std::string const& _source, bool _canWarn = false)
 	if (_canWarn)
 		BOOST_REQUIRE(!Error::containsErrors(stack.errors()));
 	else
-		BOOST_REQUIRE(stack.errors().empty());
+		BOOST_REQUIRE(!Error::hasErrorsWarningsOrInfos(stack.errors()));
 	std::string expectation = "object \"object\" {\n    code " + boost::replace_all_copy(_source, "\n", "\n    ") + "\n}\n";
 	BOOST_CHECK_EQUAL(stack.print(), expectation);
 }
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
 		DebugInfoSelection::None()
 	);
 	BOOST_REQUIRE(stack.parseAndAnalyze("", source));
-	BOOST_REQUIRE(stack.errors().empty());
+	BOOST_REQUIRE(!Error::hasErrorsWarningsOrInfos(stack.errors()));
 	BOOST_CHECK_EQUAL(stack.print(), parsed);
 
 	std::string parsedInner = "{ let x := \"\\xe1\\xae\\xac\" }";

diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
@@ -61,7 +61,7 @@ std::pair<std::shared_ptr<AST const>, std::shared_ptr<yul::AsmAnalysisInfo>> yul
 			solidity::frontend::OptimiserSettings::minimal(),
 		DebugInfoSelection::All()
 	);
-	if (!stack.parseAndAnalyze("", _source) || !stack.errors().empty())
+	if (!stack.parseAndAnalyze("", _source) || Error::hasErrorsWarningsOrInfos(stack.errors()))
 		BOOST_FAIL("Invalid source.");
 	return std::make_pair(stack.parserResult()->code(), stack.parserResult()->analysisInfo);
 }

diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
@@ -91,7 +91,7 @@ class YulOpti
 		try
 		{
 			auto ast = yul::Parser(errorReporter, m_dialect).parse(_charStream);
-			if (!m_astRoot || !errorReporter.errors().empty())
+			if (!m_astRoot || errorReporter.hasErrors())
 			{
 				std::cerr << "Error parsing source." << std::endl;
 				printErrors(_charStream, errors);
@@ -104,7 +104,7 @@ class YulOpti
 				errorReporter,
 				m_dialect
 			);
-			if (!analyzer.analyze(*m_astRoot) || !errorReporter.errors().empty())
+			if (!analyzer.analyze(*m_astRoot) || errorReporter.hasErrors())
 			{
 				std::cerr << "Error analyzing source." << std::endl;
 				printErrors(_charStream, errors);

diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
@@ -65,7 +65,7 @@ std::pair<std::shared_ptr<AST const>, std::shared_ptr<AsmAnalysisInfo>> parse(st
 	);
 	if (stack.parseAndAnalyze("--INPUT--", _source))
 	{
-		yulAssert(stack.errors().empty(), "Parsed successfully but had errors.");
+		yulAssert(!Error::hasErrorsWarningsOrInfos(stack.errors()), "Parsed successfully but had errors.");
 		return make_pair(stack.parserResult()->code(), stack.parserResult()->analysisInfo);
 	}
 	else

diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
@@ -122,7 +122,7 @@ std::variant<std::unique_ptr<AST>, ErrorList> Program::parseObject(Dialect const
 
 	ObjectParser parser(errorReporter, _dialect);
 	std::shared_ptr<Object> object = parser.parse(scanner, false);
-	if (object == nullptr || !errorReporter.errors().empty())
+	if (object == nullptr || errorReporter.hasErrors())
 		// NOTE: It's possible to get errors even if the returned object is non-null.
 		// For example when there are errors in a nested object.
 		return errors;
@@ -165,7 +165,7 @@ std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Di
 	if (!analysisSuccessful)
 		return errors;
 
-	assert(errorReporter.errors().empty());
+	assert(!errorReporter.hasErrors());
 	return std::variant<std::unique_ptr<AsmAnalysisInfo>, ErrorList>(std::move(analysisInfo));
 }