cerc-io/solidity
15
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 #7076 from ethereum/fixBuildFailureInABIv2ProtoConverter

Browse Source 
Adjust call to suffixedVariableNameList post refactoring in ABIv2 pro…
This commit is contained in:
Leonardo 2019-07-10 09:37:19 +02:00 committed by GitHub
commit ba922e7638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/tools/ossfuzz/CMakeLists.txt
View File

@ -38,7 +38,7 @@ if (OSSFUZZ)
add_executable(yul_proto_ossfuzz yulProtoFuzzer.cpp protoToYul.cpp yulProto.pb.cc) add_executable(yul_proto_ossfuzz yulProtoFuzzer.cpp protoToYul.cpp yulProto.pb.cc)
target_include_directories(yul_proto_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include) target_include_directories(yul_proto_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include)
target_link_libraries(yul_proto_ossfuzz PRIVATE yul evmasm solidity target_link_libraries(yul_proto_ossfuzz PRIVATE yul
protobuf-mutator-libfuzzer.a protobuf-mutator-libfuzzer.a
protobuf-mutator.a protobuf-mutator.a
protobuf.a protobuf.a
@ -46,7 +46,7 @@ if (OSSFUZZ)
add_executable(yul_proto_diff_ossfuzz yulProto_diff_ossfuzz.cpp yulFuzzerCommon.cpp protoToYul.cpp yulProto.pb.cc) add_executable(yul_proto_diff_ossfuzz yulProto_diff_ossfuzz.cpp yulFuzzerCommon.cpp protoToYul.cpp yulProto.pb.cc)
target_include_directories(yul_proto_diff_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include) target_include_directories(yul_proto_diff_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include)
target_link_libraries(yul_proto_diff_ossfuzz PRIVATE yul evmasm target_link_libraries(yul_proto_diff_ossfuzz PRIVATE yul
yulInterpreter yulInterpreter
protobuf-mutator-libfuzzer.a protobuf-mutator-libfuzzer.a
protobuf-mutator.a protobuf-mutator.a
@ -88,7 +88,7 @@ else()
# add_executable(yul_proto_ossfuzz yulProtoFuzzer.cpp protoToYul.cpp yulProto.pb.cc) # add_executable(yul_proto_ossfuzz yulProtoFuzzer.cpp protoToYul.cpp yulProto.pb.cc)
# target_include_directories(yul_proto_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include) # target_include_directories(yul_proto_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include)
# target_link_libraries(yul_proto_ossfuzz PRIVATE yul evmasm solidity # target_link_libraries(yul_proto_ossfuzz PRIVATE yul
# protobuf-mutator-libfuzzer.a # protobuf-mutator-libfuzzer.a
# protobuf-mutator.a # protobuf-mutator.a
# protobuf.a # protobuf.a
@ -96,10 +96,10 @@ else()
# #
# add_executable(yul_proto_diff_ossfuzz yulProto_diff_ossfuzz.cpp yulFuzzerCommon.cpp protoToYul.cpp yulProto.pb.cc) # add_executable(yul_proto_diff_ossfuzz yulProto_diff_ossfuzz.cpp yulFuzzerCommon.cpp protoToYul.cpp yulProto.pb.cc)
# target_include_directories(yul_proto_diff_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include) # target_include_directories(yul_proto_diff_ossfuzz PRIVATE /src/libprotobuf-mutator /src/LPM/external.protobuf/include)
# target_link_libraries(yul_proto_diff_ossfuzz PRIVATE yul evmasm # target_link_libraries(yul_proto_diff_ossfuzz PRIVATE yul
# yulInterpreter # yulInterpreter
# protobuf-mutator-libfuzzer.a # protobuf-mutator-libfuzzer.a
# protobuf-mutator.a # protobuf-mutator.a
# protobuf.a # protobuf.a
# FuzzingEngine.a) # FuzzingEngine.a)
endif() endif()

6
test/tools/ossfuzz/protoToAbiV2.cpp
View File

@ -2,12 +2,12 @@
#include <numeric> #include <numeric>
#include <boost/range/adaptor/reversed.hpp> #include <boost/range/adaptor/reversed.hpp>
#include <test/tools/ossfuzz/protoToAbiV2.h> #include <test/tools/ossfuzz/protoToAbiV2.h>
#include <libsolidity/codegen/YulUtilFunctions.h> #include <libdevcore/StringUtils.h>
#include <libdevcore/Whiskers.h> #include <libdevcore/Whiskers.h>
#include <liblangutil/Exceptions.h> #include <liblangutil/Exceptions.h>
using namespace std; using namespace std;
using namespace dev::solidity; using namespace dev;
using namespace dev::test::abiv2fuzzer; using namespace dev::test::abiv2fuzzer;
// Create a new variable declaration and append said variable to function parameter lists // Create a new variable declaration and append said variable to function parameter lists
@ -651,7 +651,7 @@ void ProtoConverter::visit(TestFunction const& _x)
return (uint(1000) + this.coder_external(<parameter_names>)); return (uint(1000) + this.coder_external(<parameter_names>));
} }
)") )")
("parameter_names", YulUtilFunctions::suffixedVariableNameList(s_varNamePrefix, 0, m_varCounter)) ("parameter_names", dev::suffixedVariableNameList(s_varNamePrefix, 0, m_varCounter))
.render(); .render();
} }