Prevent crash when translating yul->ewasm with @use-src annotations

Marenz · Marenz · commit 093919e54cc5 · 2021-11-09T10:59:29.000+01:00
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,9 @@
+### 0.8.11 (unreleased)
+
+Bugfixes:
+ * Code Generator: Fix a crash when using ``@use-src`` and compiling from Yul to ewasm
+
+
 ### 0.8.10 (2021-11-09)
 
 Language Features:
diff --git a/libyul/backends/wasm/EVMToEwasmTranslator.cpp b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
@@ -137,7 +137,7 @@ void EVMToEwasmTranslator::parsePolyfill()
 			string(solidity::yul::wasm::polyfill::Logical) +
 			string(solidity::yul::wasm::polyfill::Memory) +
 		"}", "");
-	m_polyfill = Parser(errorReporter, WasmDialect::instance()).parse(charStream);
+	m_polyfill = Parser(errorReporter, WasmDialect::instance(), langutil::SourceLocation()).parse(charStream);
 	if (!errors.empty())
 	{
 		string message;
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/args b/test/cmdlineTests/yul_to_wasm_source_location_crash/args
@@ -0,0 +1,2 @@
+--strict-assembly --yul-dialect evm --machine ewasm
+
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/err b/test/cmdlineTests/yul_to_wasm_source_location_crash/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul b/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul
@@ -0,0 +1,4 @@
+/// @use-src 0:"test.sol"
+object "C" {
+    code {}
+}
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/output b/test/cmdlineTests/yul_to_wasm_source_location_crash/output

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ void EVMToEwasmTranslator::parsePolyfill()`
`137`	`137`	`string(solidity::yul::wasm::polyfill::Logical) +`
`138`	`138`	`string(solidity::yul::wasm::polyfill::Memory) +`
`139`	`139`	`"}", "");`
`140`		`- m_polyfill = Parser(errorReporter, WasmDialect::instance()).parse(charStream);`
	`140`	`+ m_polyfill = Parser(errorReporter, WasmDialect::instance(), langutil::SourceLocation()).parse(charStream);`
`141`	`141`	`if (!errors.empty())`
`142`	`142`	`{`
`143`	`143`	`string message;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--strict-assembly --yul-dialect evm --machine ewasm`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Warning: Yul is still experimental. Please use the output with care.`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +/// @use-src 0:"test.sol"
 +object "C" {
 +    code {}
 +}