Merge pull request #13087 from ethereum/gcc-12-control-reaches-end-of-function-warning-workaround

cameel · web-flow · commit 1f8b8c98d2a9 · 2022-06-02T14:59:01.000+02:00
Workaround for the spurious `control reaches end of non-void function` warning in GCC 12.1
diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
@@ -19,6 +19,7 @@
 #include <libsmtutil/CVC4Interface.h>
 
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/Exceptions.h>
 
 #include <cvc4/util/bitvector.h>
 
@@ -277,7 +278,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 			return m_context.mkExpr(CVC4::kind::APPLY_CONSTRUCTOR, c, arguments);
 		}
 
-		smtAssert(false, "");
+		smtAssert(false);
 	}
 	catch (CVC4::TypeCheckingException const& _e)
 	{
@@ -288,7 +289,10 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 		smtAssert(false, _e.what());
 	}
 
-	smtAssert(false, "");
+	smtAssert(false);
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 CVC4::Type CVC4Interface::cvc4Sort(Sort const& _sort)
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
@@ -20,6 +20,7 @@
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/Exceptions.h>
 
 #ifdef HAVE_Z3_DLOPEN
 #include <libsmtutil/Z3Loader.h>
@@ -263,14 +264,17 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 			return constructor(args);
 		}
 
-		smtAssert(false, "");
+		smtAssert(false);
 	}
 	catch (z3::exception const& _e)
 	{
 		smtAssert(false, _e.msg());
 	}
 
-	smtAssert(false, "");
+	smtAssert(false);
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
@@ -378,7 +382,10 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 	)
 		return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));
 
-	smtAssert(false, "");
+	smtAssert(false);
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 z3::sort Z3Interface::z3Sort(Sort const& _sort)
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
@@ -229,6 +229,9 @@ ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _js
 		return createDocumentation(_json);
 	else
 		astAssert(false, "Unknown type of ASTNode: " + nodeType);
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 // ============ functions to instantiate the AST-Nodes from Json-Nodes ==============
@@ -1073,6 +1076,9 @@ Visibility ASTJsonImporter::visibility(Json::Value const& _node)
 		return Visibility::External;
 	else
 		astAssert(false, "Unknown visibility declaration");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node)
@@ -1092,6 +1098,9 @@ VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node
 		return VariableDeclaration::Location::CallData;
 	else
 		astAssert(false, "Unknown location declaration");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _node)
@@ -1125,6 +1134,9 @@ Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _no
 		return Literal::SubDenomination::Year;
 	else
 		astAssert(false, "Unknown subdenomination");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
@@ -1142,6 +1154,9 @@ StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
 		return StateMutability::Payable;
 	else
 		astAssert(false, "Unknown stateMutability");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
@@ -1637,7 +1637,7 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 			return parseExpressionStatement(_docString, nodeFactory.createNode<TupleExpression>(components, false));
 		}
 		default:
-			solAssert(false, "");
+			solAssert(false);
 		}
 	}
 	else
@@ -1650,17 +1650,19 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 		case LookAheadInfo::Expression:
 			return parseExpressionStatement(_docString, expressionFromIndexAccessStructure(iap));
 		default:
-			solAssert(false, "");
+			solAssert(false);
 		}
 	}
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 bool Parser::IndexAccessedPath::empty() const
 {
 	if (!indices.empty())
-	{
-		solAssert(!path.empty(), "");
-	}
+		solAssert(!path.empty());
+
 	return path.empty() && indices.empty();
 }
 
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
@@ -110,6 +110,9 @@ Statement AsmJsonImporter::createStatement(Json::Value const& _node)
 		return createBlock(_node);
 	else
 		yulAssert(false, "Invalid nodeType as statement");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 Expression AsmJsonImporter::createExpression(Json::Value const& _node)
@@ -129,6 +132,9 @@ Expression AsmJsonImporter::createExpression(Json::Value const& _node)
 		return createLiteral(_node);
 	else
 		yulAssert(false, "Invalid nodeType as expression");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value const& _array)
diff --git a/libyul/backends/evm/StackHelpers.h b/libyul/backends/evm/StackHelpers.h
@@ -371,6 +371,9 @@ class Shuffler
 				return true;
 			}
 		yulAssert(false, "");
+
+		// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+		throw std::exception();
 	}
 };
 
diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
@@ -276,6 +276,9 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 		default:
 			assertThrow(false, solidity::util::Exception, "Invalid MetricAggregatorChoice value.");
 	}
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::variables_map const& _arguments)

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include <libsmtutil/CVC4Interface.h>`
`20`	`20`
`21`	`21`	`#include <libsolutil/CommonIO.h>`
	`22`	`+#include <libsolutil/Exceptions.h>`
`22`	`23`
`23`	`24`	`#include <cvc4/util/bitvector.h>`
`24`	`25`
`@@ -277,7 +278,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)`
`277`	`278`	`return m_context.mkExpr(CVC4::kind::APPLY_CONSTRUCTOR, c, arguments);`
`278`	`279`	`}`
`279`	`280`
`280`		`- smtAssert(false, "");`
	`281`	`+ smtAssert(false);`
`281`	`282`	`}`
`282`	`283`	`catch (CVC4::TypeCheckingException const& _e)`
`283`	`284`	`{`
`@@ -288,7 +289,10 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)`
`288`	`289`	`smtAssert(false, _e.what());`
`289`	`290`	`}`
`290`	`291`
`291`		`- smtAssert(false, "");`
	`292`	`+ smtAssert(false);`
	`293`	`+`
	`294`	`+ // FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)`
	`295`	`+ throw exception();`
`292`	`296`	`}`
`293`	`297`
`294`	`298`	`CVC4::Type CVC4Interface::cvc4Sort(Sort const& _sort)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`#include <libsolutil/CommonData.h>`
`22`	`22`	`#include <libsolutil/CommonIO.h>`
	`23`	`+#include <libsolutil/Exceptions.h>`
`23`	`24`
`24`	`25`	`#ifdef HAVE_Z3_DLOPEN`
`25`	`26`	`#include <libsmtutil/Z3Loader.h>`
`@@ -263,14 +264,17 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)`
`263`	`264`	`return constructor(args);`
`264`	`265`	`}`
`265`	`266`
`266`		`- smtAssert(false, "");`
	`267`	`+ smtAssert(false);`
`267`	`268`	`}`
`268`	`269`	`catch (z3::exception const& _e)`
`269`	`270`	`{`
`270`	`271`	`smtAssert(false, _e.msg());`
`271`	`272`	`}`
`272`	`273`
`273`		`- smtAssert(false, "");`
	`274`	`+ smtAssert(false);`
	`275`	`+`
	`276`	`+ // FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)`
	`277`	`+ throw exception();`
`274`	`278`	`}`
`275`	`279`
`276`	`280`	`Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)`
`@@ -378,7 +382,10 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)`
`378`	`382`	`)`
`379`	`383`	`return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));`
`380`	`384`
`381`		`- smtAssert(false, "");`
	`385`	`+ smtAssert(false);`
	`386`	`+`
	`387`	`+ // FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)`
	`388`	`+ throw exception();`
`382`	`389`	`}`
`383`	`390`
`384`	`391`	`z3::sort Z3Interface::z3Sort(Sort const& _sort)`
Original file line number	Diff line number	Diff line change
`@@ -1637,7 +1637,7 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&`
`1637`	`1637`	`return parseExpressionStatement(_docString, nodeFactory.createNode<TupleExpression>(components, false));`
`1638`	`1638`	`}`
`1639`	`1639`	`default:`
`1640`		`- solAssert(false, "");`
	`1640`	`+ solAssert(false);`
`1641`	`1641`	`}`
`1642`	`1642`	`}`
`1643`	`1643`	`else`
`@@ -1650,17 +1650,19 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&`
`1650`	`1650`	`case LookAheadInfo::Expression:`
`1651`	`1651`	`return parseExpressionStatement(_docString, expressionFromIndexAccessStructure(iap));`
`1652`	`1652`	`default:`
`1653`		`- solAssert(false, "");`
	`1653`	`+ solAssert(false);`
`1654`	`1654`	`}`
`1655`	`1655`	`}`
	`1656`	`+`
	`1657`	`+ // FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)`
	`1658`	`+ throw exception();`
`1656`	`1659`	`}`
`1657`	`1660`
`1658`	`1661`	`bool Parser::IndexAccessedPath::empty() const`
`1659`	`1662`	`{`
`1660`	`1663`	`if (!indices.empty())`
`1661`		`- {`
`1662`		`- solAssert(!path.empty(), "");`
`1663`		`- }`
	`1664`	`+ solAssert(!path.empty());`
	`1665`	`+`
`1664`	`1666`	`return path.empty() && indices.empty();`
`1665`	`1667`	`}`
`1666`	`1668`
Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,9 @@ class Shuffler`
`371`	`371`	`return true;`
`372`	`372`	`}`
`373`	`373`	`yulAssert(false, "");`
	`374`	`+`
	`375`	`+ // FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)`
	`376`	`+ throw std::exception();`
`374`	`377`	`}`
`375`	`378`	`};`
`376`	`379`
Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,9 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(`
`276`	`276`	`default:`
`277`	`277`	`assertThrow(false, solidity::util::Exception, "Invalid MetricAggregatorChoice value.");`
`278`	`278`	`}`
	`279`	`+`
	`280`	`+ // FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)`
	`281`	`+ throw exception();`
`279`	`282`	`}`
`280`	`283`
`281`	`284`	`PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::variables_map const& _arguments)`