Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,6 @@ commands:
# --------------------------------------------------------------------------
# Artifact Commands

remove_signature_from_universal_binary:
description: Remove signature from universal binary
steps:
- run:
name: Remove signature from universal binary
command: codesign --remove-signature build/solc/solc

store_artifacts_solc:
description: Store compiled solc executable as artifact
steps:
Expand Down Expand Up @@ -1205,7 +1198,6 @@ jobs:
- checkout
- install_dependencies_osx
- run_build
- remove_signature_from_universal_binary
- store_artifacts_solc
- store_artifacts_yul_phaser
- persist_executables_to_workspace_osx
Expand Down
21 changes: 10 additions & 11 deletions libsolidity/codegen/ExpressionCompiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3256,18 +3256,17 @@ void ExpressionCompiler::appendExternalFunctionCall(
//in this kind of precompiled contracts , return type is dynamicType
if (haveReturndatacopy)
{
m_context << u256(0) << Instruction::RETURNDATASIZE;
m_context << Instruction::RETURNDATASIZE;
m_context.appendInlineAssembly(R"({
start := mload(0x40)
size := add(returndatasize(), 0x40)
mstore(0x40, add(start, size))

returndatacopy(add(start, 0x40), 0, returndatasize())
mstore(start, 0x20)
mstore(add(start, 0x20), div(returndatasize(), 0x20))
})", {"start", "size"});

utils().abiDecode(returnTypes, true);
switch v case 0 {
v := 0x60
} default {
v := mload(0x40)
mstore(0x40, add(v, and(add(returndatasize(), 0x3f), not(0x1f))))
mstore(v, div(returndatasize(), 0x20))
returndatacopy(add(v, 0x20), 0, returndatasize())
}
})", {"v"});
}

}
Expand Down
2 changes: 1 addition & 1 deletion libsolutil/StackTooDeepString.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ namespace solidity::util
{
static std::string stackTooDeepString =
"Stack too deep. "
"Try compiling with `--via-ir` (cli) or the equivalent `viaIR: true` (standard JSON) "
"Try compiling with `--experimental-via-ir` (cli) or the equivalent `viaIR: true` (standard JSON) "
"while enabling the optimizer. Otherwise, try removing local variables.";
}
2 changes: 1 addition & 1 deletion solc/CommandLineParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@ void CommandLineParser::processArgs()
if (m_args.count(g_strViaIR) > 0) {
solThrow(
CommandLineValidationError,
"Compilation mode via the IR is experimental now. Use --" + g_strExperimentalViaIR + "."
"The --" + g_strViaIR + " is currently experimental for TRON solidity compiler. Use --" + g_strExperimentalViaIR + " instead."
);
}
m_options.output.viaIR = (m_args.count(g_strExperimentalViaIR) > 0 || m_args.count(g_strViaIR) > 0);
Expand Down