cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10350 from ethereum/fixStringLiteralAssignmentToStorage

Browse Source 
[Sol->Yul] Fix string literal assignment to storage.
This commit is contained in:
chriseth 2020-11-19 16:06:06 +01:00 committed by GitHub
commit 8d315ee130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/codegen/ir/IRGeneratorForStatements.cpp
View File

@ -241,6 +241,10 @@ void IRGeneratorForStatements::initializeStateVar(VariableDeclaration const& _va
return;
_varDecl.value()->accept(*this);
Type const* rightIntermediateType = _varDecl.value()->annotation().type->closestTemporaryType(_varDecl.type());
solAssert(rightIntermediateType, "");
IRVariable value = convert(*_varDecl.value(), *rightIntermediateType);
writeToLValue(
_varDecl.immutable() ?
IRLValue{*_varDecl.annotation().type, IRLValue::Immutable{&_varDecl}} :
@ -248,7 +252,7 @@ void IRGeneratorForStatements::initializeStateVar(VariableDeclaration const& _va
util::toCompactHexWithPrefix(m_context.storageLocationOfStateVariable(_varDecl).first),
m_context.storageLocationOfStateVariable(_varDecl).second
}},
*_varDecl.value()
value
);
}
catch (langutil::UnimplementedFeatureError const& _error)

2
test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
View File

@ -5,5 +5,7 @@ contract C {
return data[0];
}
}
// ====
// compileViaYul: also
// ----
// f() -> "a"

2
test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
View File

@ -8,5 +8,7 @@ contract C {
}
}
// ====
// compileViaYul: also
// ----
// f() -> 0x40, 0x80, 0x3, "ray", 0x2, "mi"