This is an archive of the discontinued LLVM Phabricator instance.

Differential D106275

tsan: add pragma line to buildgo.sh
ClosedPublic

Authored by dvyukov on Jul 19 2021, 6:55 AM.

Details

Reviewers
vitalybuka
melver
Commits
rGd9b6e32dd74c: tsan: add pragma line to buildgo.sh
Summary

Add pragma line so that errors messages point to the actual
source files rather than to the concatenated gotsan.cpp.

Diff Detail

Event Timeline

dvyukov requested review of this revision.Jul 19 2021, 6:55 AM
dvyukov created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2021, 6:55 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B114852: Diff 359777.Jul 19 2021, 7:52 AM
melver accepted this revision.Jul 19 2021, 8:27 AM
melver added inline comments.
compiler-rt/lib/tsan/go/buildgo.sh
174

If this ever grows, it'd be cleaner as:

for F in $SRCS; do
  (
    echo "#line 1 \"$F\""
    ... other stuff ...
    cat $F
  ) >> $DIR/gotsan.cpp
done

As-is, this would just save you typing $DIR/gotsan.cpp twice.

This revision is now accepted and ready to land.Jul 19 2021, 8:27 AM
vitalybuka accepted this revision.Jul 19 2021, 11:49 AM
vitalybuka added inline comments.
compiler-rt/lib/tsan/go/buildgo.sh
174
# not needed rm -f $DIR/gotsan.cpp
for F in $SRCS; do
	echo "#line 1 \"$F\""
	cat $F
done > $DIR/gotsan.cpp
dvyukov updated this revision to Diff 360010.Jul 19 2021, 10:16 PM

change code to not repeat $DIR/gotsan.cpp

dvyukov marked an inline comment as done.Jul 19 2021, 10:17 PM
dvyukov added inline comments.
compiler-rt/lib/tsan/go/buildgo.sh
174

Even better! Done.

This revision was landed with ongoing or failed builds.Jul 19 2021, 10:22 PM
Closed by commit rGd9b6e32dd74c: tsan: add pragma line to buildgo.sh (authored by dvyukov). · Explain Why
This revision was automatically updated to reflect the committed changes.
dvyukov marked an inline comment as done.
dvyukov added a commit: rGd9b6e32dd74c: tsan: add pragma line to buildgo.sh.
Harbormaster completed remote builds in B115019: Diff 360010.Jul 19 2021, 10:45 PM

Revision Contents

PathSize
compiler-rt/
lib/
tsan/
go/
7 lines

Diff 360011

compiler-rt/lib/tsan/go/buildgo.sh

Show First 20 Lines • Show All 164 Lines • ▼ Show 20 Lines cleanup() {
rm -rf $DIR rm -rf $DIR
} }
trap cleanup EXIT trap cleanup EXIT
else else
DIR=. DIR=.
fi fi
SRCS="$SRCS $ADD_SRCS" SRCS="$SRCS $ADD_SRCS"
rm -f $DIR/gotsan.cpp
for F in $SRCS; do for F in $SRCS; do
cat $F >> $DIR/gotsan.cpp echo "#line 1 \"$F\""
melverUnsubmitted
Done
ReplyInline Actions

If this ever grows, it'd be cleaner as:

for F in $SRCS; do
  (
    echo "#line 1 \"$F\""
    ... other stuff ...
    cat $F
  ) >> $DIR/gotsan.cpp
done

As-is, this would just save you typing $DIR/gotsan.cpp twice.

melver: If this ever grows, it'd be cleaner as: ``` for F in $SRCS; do ( echo "#line 1 \"$F\""…
vitalybukaUnsubmitted
Done
ReplyInline Actions
# not needed rm -f $DIR/gotsan.cpp
for F in $SRCS; do
	echo "#line 1 \"$F\""
	cat $F
done > $DIR/gotsan.cpp
vitalybuka: ``` # not needed rm -f $DIR/gotsan.cpp for F in $SRCS; do echo "#line 1 \"$F\"" cat $F done >…
dvyukovAuthorUnsubmitted
Done
ReplyInline Actions

Even better! Done.

dvyukov: Even better! Done.
done 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" 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" DEBUG_FLAGS="$FLAGS -DSANITIZER_DEBUG=1 -g"
FLAGS="$FLAGS -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer" FLAGS="$FLAGS -DSANITIZER_DEBUG=0 -O3 -fomit-frame-pointer"
if [ "$DEBUG" = "" ]; then if [ "$DEBUG" = "" ]; then
# Do a build test with debug flags. # Do a build test with debug flags.
$CC $DIR/gotsan.cpp -c -o $DIR/race_debug_$SUFFIX.syso $DEBUG_FLAGS $CFLAGS $CC $DIR/gotsan.cpp -c -o $DIR/race_debug_$SUFFIX.syso $DEBUG_FLAGS $CFLAGS
Show All 29 Lines