This is an archive of the discontinued LLVM Phabricator instance.

Differential D125762

[tsan] Fix the longjmp sp slot on FreeBSD AArch64
ClosedPublic

Authored by andrew on May 17 2022, 3:38 AM.

Details

Reviewers
dvyukov
melver
Group Reviewers
Restricted Project
Commits
rGad3faddaa67d: [compiler-rt] Fix the longjmp sp slot on FreeBSD AArch64
Summary

The stack pointer is stored in the second slot in the jump buffer on AArch64. Use the correct slot value to read this rather than the following register.

Diff Detail

Event Timeline

andrew created this revision.May 17 2022, 3:38 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 17 2022, 3:38 AM
Herald added a subscriber: kristof.beyls. · View Herald Transcript
andrew requested review of this revision.May 17 2022, 3:38 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 17 2022, 3:38 AM
andrew added a parent revision: D125756: [sanitizer] Add the common FreeBSD AArch64 support.May 17 2022, 3:42 AM
Harbormaster completed remote builds in B164840: Diff 429993.May 17 2022, 4:02 AM
melver added a reviewer: dvyukov.May 17 2022, 4:46 AM
melver added a subscriber: melver.

Please add a brief commit message.

dvyukov added a comment.May 17 2022, 4:52 AM

I don't have any objections.

andrew edited the summary of this revision. (Show Details)May 18 2022, 3:36 AM
melver accepted this revision as: melver.May 18 2022, 5:00 AM
This revision is now accepted and ready to land.May 18 2022, 5:00 AM
This revision was landed with ongoing or failed builds.Jun 8 2022, 2:23 PM
Closed by commit rGad3faddaa67d: [compiler-rt] Fix the longjmp sp slot on FreeBSD AArch64 (authored by andrew, committed by emaste). · Explain Why
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rGad3faddaa67d: [compiler-rt] Fix the longjmp sp slot on FreeBSD AArch64.
Herald added a subscriber: Enna1. · View Herald TranscriptJun 8 2022, 2:23 PM

Revision Contents

PathSize
compiler-rt/
lib/
tsan/
rtl/
6 lines

Diff 429993

compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp

//===-- tsan_platform_linux.cpp -------------------------------------------===// //===-- tsan_platform_linux.cpp -------------------------------------------===//
Lint: Lint
Inline Actions

clang-format not found in user’s local PATH; not linting file.

Lint: Lint: clang-format not found in user’s local PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
▲ Show 20 Lines • Show All 388 Lines • ▼ Show 20 Lines
# ifdef __x86_64__ # ifdef __x86_64__
# define LONG_JMP_SP_ENV_SLOT 6 # define LONG_JMP_SP_ENV_SLOT 6
# else # else
# error unsupported # error unsupported
# endif # endif
#elif defined(__powerpc__) #elif defined(__powerpc__)
# define LONG_JMP_SP_ENV_SLOT 0 # define LONG_JMP_SP_ENV_SLOT 0
#elif SANITIZER_FREEBSD #elif SANITIZER_FREEBSD
# ifdef __aarch64__
# define LONG_JMP_SP_ENV_SLOT 1
# else
# define LONG_JMP_SP_ENV_SLOT 2 # define LONG_JMP_SP_ENV_SLOT 2
# endif
#elif SANITIZER_LINUX #elif SANITIZER_LINUX
# ifdef __aarch64__ # ifdef __aarch64__
# define LONG_JMP_SP_ENV_SLOT 13 # define LONG_JMP_SP_ENV_SLOT 13
# elif defined(__mips64) # elif defined(__mips64)
# define LONG_JMP_SP_ENV_SLOT 1 # define LONG_JMP_SP_ENV_SLOT 1
# elif defined(__s390x__) # elif defined(__s390x__)
# define LONG_JMP_SP_ENV_SLOT 9 # define LONG_JMP_SP_ENV_SLOT 9
# else # else
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines