Assert presence of errors in case of FatalError instead of rethrowing

ethereum · Jun 12, 2024 · 1adb032 · 1adb032
1 parent 19b4370
commit 1adb032
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -62,8 +62,7 @@ bool NameAndTypeResolver::registerDeclarations(SourceUnit& _sourceUnit, ASTNode
 	}
 	catch (langutil::FatalError const&)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty());
 		return false;
 	}
 	return true;
@@ -137,8 +136,7 @@ bool NameAndTypeResolver::resolveNamesAndTypes(SourceUnit& _source)
 	}
 	catch (langutil::FatalError const&)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty());
 		return false;
 	}
 	return true;
@@ -153,8 +151,7 @@ bool NameAndTypeResolver::updateDeclaration(Declaration const& _declaration)
 	}
 	catch (langutil::FatalError const&)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty());
 		return false;
 	}
 	return true;

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
@@ -491,8 +491,7 @@ bool CompilerStack::analyze()
 	}
 	catch (FatalError const&)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty());
 		noErrors = false;
 	}
 

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
@@ -178,8 +178,7 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 	}
 	catch (FatalError const&)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty());
 		return nullptr;
 	}
 }

diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
@@ -64,8 +64,7 @@ std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _sca
 	}
 	catch (FatalError const&)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		yulAssert(!m_errorReporter.errors().empty());
 	}
 	return nullptr;
 }