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

ossfuzz: Remove antlr4 build deps

Browse Source
This commit is contained in:
Bhargava Shastry 2020-10-15 12:59:18 +02:00
parent 3c63be519b
commit 5023d3decb
2 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/ci/build_ossfuzz.sh
View File

@ -5,17 +5,6 @@ ROOTDIR="/root/project"
BUILDDIR="${ROOTDIR}/build" BUILDDIR="${ROOTDIR}/build"
mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps" mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps"
ANTLRJAR="${ROOTDIR}/build/deps/antlr4.8.jar"
ANTLRJAR_URI="https://www.antlr.org/download/antlr-4.8-complete.jar"
download_antlr4()
{
if [[ ! -e "${ANTLRJAR}" ]]
then
wget -O "${ANTLRJAR}" "${ANTLRJAR_URI}"
fi
}
generate_protobuf_bindings() generate_protobuf_bindings()
{ {
cd "${ROOTDIR}"/test/tools/ossfuzz cd "${ROOTDIR}"/test/tools/ossfuzz
@ -26,21 +15,6 @@ generate_protobuf_bindings()
done done
} }
generate_antlr4_bindings()
{
cd "${ROOTDIR}"
# Replace boolean with bool to suit c++ syntax
sed -i 's/boolean /bool /g' docs/grammar/Solidity.g4
# Generate antlr4 visitor/parser/lexer c++ bindings
java -jar "${ANTLRJAR}" -Dlanguage=Cpp \
-Xexact-output-dir -package solidity::test::fuzzer -o test/tools/ossfuzz \
-no-listener -visitor docs/grammar/SolidityLexer.g4 docs/grammar/Solidity.g4
# Delete unnecessary autogen files
rm -f "${ROOTDIR}"/test/tools/ossfuzz/Solidity*Visitor.cpp \
"${ROOTDIR}"/test/tools/ossfuzz/Solidity*.interp \
"${ROOTDIR}"/test/tools/ossfuzz/Solidity*.tokens
}
build_fuzzers() build_fuzzers()
{ {
cd "${BUILDDIR}" cd "${BUILDDIR}"
@ -49,7 +23,5 @@ build_fuzzers()
make ossfuzz ossfuzz_proto ossfuzz_abiv2 -j 4 make ossfuzz ossfuzz_proto ossfuzz_abiv2 -j 4
} }
download_antlr4
generate_protobuf_bindings generate_protobuf_bindings
generate_antlr4_bindings
build_fuzzers build_fuzzers

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

@ -27,30 +27,16 @@ if (OSSFUZZ)
solc_opt_ossfuzz.cpp solc_opt_ossfuzz.cpp
../fuzzer_common.cpp ../fuzzer_common.cpp
../../TestCaseReader.cpp ../../TestCaseReader.cpp
SolidityLexer.cpp
SolidityParser.cpp
) )
target_compile_options(solc_opt_ossfuzz target_link_libraries(solc_opt_ossfuzz PRIVATE libsolc evmasm)
PUBLIC
${COMPILE_OPTIONS} -Wno-extra-semi -Wno-unused-parameter
)
target_include_directories(solc_opt_ossfuzz PRIVATE /usr/include/antlr4-runtime)
target_link_libraries(solc_opt_ossfuzz PRIVATE libsolc evmasm antlr4-runtime)
set_target_properties(solc_opt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE}) set_target_properties(solc_opt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
add_executable(solc_noopt_ossfuzz add_executable(solc_noopt_ossfuzz
solc_noopt_ossfuzz.cpp solc_noopt_ossfuzz.cpp
../fuzzer_common.cpp ../fuzzer_common.cpp
../../TestCaseReader.cpp ../../TestCaseReader.cpp
SolidityLexer.cpp
SolidityParser.cpp
) )
target_compile_options(solc_noopt_ossfuzz target_link_libraries(solc_noopt_ossfuzz PRIVATE libsolc evmasm)
PUBLIC
${COMPILE_OPTIONS} -Wno-extra-semi -Wno-unused-parameter
)
target_include_directories(solc_noopt_ossfuzz PRIVATE /usr/include/antlr4-runtime)
target_link_libraries(solc_noopt_ossfuzz PRIVATE libsolc evmasm antlr4-runtime)
set_target_properties(solc_noopt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE}) set_target_properties(solc_noopt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
add_executable(const_opt_ossfuzz const_opt_ossfuzz.cpp ../fuzzer_common.cpp) add_executable(const_opt_ossfuzz const_opt_ossfuzz.cpp ../fuzzer_common.cpp)