From a392b977f8377b1c780bbe76c843994ae02d2b21 Mon Sep 17 00:00:00 2001
From: Alastair Donaldson <afdx@google.com>
Date: Fri, 17 Sep 2021 13:22:09 +0100
Subject: [PATCH] Use uninstrumented spirv-as for corpus prep (#6467)

To avoid sanitizer errors during corpus prepraration (and also to speed
it up) this change build an uninstrumented version of spirv-as.
---
 projects/tint/build.sh | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/projects/tint/build.sh b/projects/tint/build.sh
index c64f96e69..cb97842c3 100755
--- a/projects/tint/build.sh
+++ b/projects/tint/build.sh
@@ -36,16 +36,37 @@ SPIRV_FUZZERS="tint_spv_reader_fuzzer\
 # TODO(afd): add tint_spirv_tools_fuzzer
 
 # The spirv-as tool is used to build seed corpora
-ninja ${SPIRV_FUZZERS} spirv-as
+ninja ${SPIRV_FUZZERS}
 
 cp ${SPIRV_FUZZERS} $OUT
 
 popd
 
+# An un-instrumented build of spirv-as is used to generate a corpus of SPIR-V binaries.
+mkdir -p out/Standard
+pushd out/Standard
+
+# Back-up instrumentation options
+CFLAGS_SAVE="$CFLAGS"
+CXXFLAGS_SAVE="$CXXFLAGS"
+unset CFLAGS
+unset CXXFLAGS
+export AFL_NOOPT=1
+
+cmake -GNinja ../..
+ninja spirv-as
+
+# Restore instrumentation options
+export CFLAGS="${CFLAGS_SAVE}"
+export CXXFLAGS="${CXXFLAGS_SAVE}"
+unset AFL_NOOPT
+
+popd
+
 # Generate a corpus of SPIR-V binaries from the SPIR-V assembly files in the
 # tint repository.
 mkdir $WORK/spirv-corpus
-python3 fuzzers/generate_spirv_corpus.py test $WORK/spirv-corpus out/Debug/spirv-as
+python3 fuzzers/generate_spirv_corpus.py test $WORK/spirv-corpus out/Standard/spirv-as
 
 mkdir $WORK/spirv-corpus-hashed-names
 for f in `ls $WORK/spirv-corpus/*.spv`