From d9b6e32dd74c63a12fb2872ca1b36479e4946a81 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 19 Jul 2021 15:54:44 +0200 Subject: [PATCH] tsan: add pragma line to buildgo.sh Add pragma line so that errors messages point to the actual source files rather than to the concatenated gotsan.cpp. Reviewed By: vitalybuka, melver Differential Revision: https://reviews.llvm.org/D106275 --- compiler-rt/lib/tsan/go/buildgo.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler-rt/lib/tsan/go/buildgo.sh b/compiler-rt/lib/tsan/go/buildgo.sh index a16735d..3e4e226 100755 --- a/compiler-rt/lib/tsan/go/buildgo.sh +++ b/compiler-rt/lib/tsan/go/buildgo.sh @@ -170,11 +170,10 @@ else fi SRCS="$SRCS $ADD_SRCS" - -rm -f $DIR/gotsan.cpp for F in $SRCS; do - cat $F >> $DIR/gotsan.cpp -done + echo "#line 1 \"$F\"" + cat $F +done > $DIR/gotsan.cpp FLAGS=" -I../rtl -I../.. -I../../sanitizer_common -I../../../include -std=c++14 -Wall -fno-exceptions -fno-rtti -DSANITIZER_GO=1 -DSANITIZER_DEADLOCK_DETECTOR_VERSION=2 $OSCFLAGS $ARCHCFLAGS $EXTRA_CFLAGS" DEBUG_FLAGS="$FLAGS -DSANITIZER_DEBUG=1 -g" -- 2.7.4