Merge pull request #6067 from ethereum/asm-parser-fatal

Do not ignore fatal error in AsmParser for inline assembly

libsolidity/parsing/Parser.cpp

@@ -1043,6 +1043,8 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 
 	yul::Parser asmParser(m_errorReporter, yul::EVMDialect::looseAssemblyForEVM());
 	shared_ptr<yul::Block> block = asmParser.parse(m_scanner, true);
+	if (block == nullptr)
+		BOOST_THROW_EXCEPTION(FatalError());
 	nodeFactory.markEndPosition();
 	return nodeFactory.createNode<InlineAssembly>(_docString, block);
 }

libyul/AsmParser.cpp

@@ -48,8 +48,7 @@ shared_ptr<Block> Parser::parse(std::shared_ptr<Scanner> const& _scanner, bool _
 	}
 	catch (FatalError const&)
 	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
+		solAssert(!m_errorReporter.errors().empty(), "Fatal error detected, but no error is reported.");
 	}
 	return nullptr;
 }

test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol

@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // ParserError: (67-70): Cannot use instruction names for identifier names.
-// ParserError: (71-73): Expected ';' but got ':='

test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg.sol

@@ -10,4 +10,3 @@ contract C {
 }
 // ----
 // ParserError: (113-114): Literal, identifier or instruction expected.
-// ParserError: (113-114): Expected primary expression.

test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol

@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // ParserError: (72-73): Expected identifier but got '('
-// ParserError: (79-80): Expected ';' but got '{'

test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol

@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // ParserError: (72-73): Literal, identifier or instruction expected.
-// ParserError: (72-73): Octal numbers not allowed.

test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol

@@ -8,4 +8,3 @@ contract C {
 }
 // ----
 // ParserError: (87-89): Literal, identifier or instruction expected.
-// ParserError: (87-89): Expected primary expression.

test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol

@@ -8,4 +8,3 @@ contract C {
 }
 // ----
 // ParserError: (102-105): Cannot use instruction names for identifier names.
-// ParserError: (105-106): Expected ';' but got ','

test/libsolidity/syntaxTests/inlineAssembly/invalid/no_identifier_assignment.sol

@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // ParserError: (70-72): Variable name must precede ":=" in assignment.
-// ParserError: (70-72): Expected primary expression.

test/libsolidity/syntaxTests/inlineAssembly/invalid/no_identifier_label.sol

@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // ParserError: (70-71): Label name must precede ":".
-// ParserError: (70-71): Expected primary expression.

test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol

@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // ParserError: (69-70): Literal, identifier or instruction expected.
-// ParserError: (69-70): Expected primary expression.

test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol

@@ -8,4 +8,3 @@ contract C {
 }
 // ----
 // ParserError: (107-108): Literal, identifier or instruction expected.
-// ParserError: (107-108): Expected primary expression.