Commit f4261e11 authored by Roland McGrath's avatar Roland McGrath Committed by Petr Hosek
Browse files

[Clang] Enable -fsanitize=leak on Fuchsia targets 

This required some fixes to the generic code for two issues:

1. -fsanitize=safe-stack is default on x86_64-fuchsia and is *not* incompatible with -fsanitize=leak on Fuchisa
2. -fsanitize=leak and other static-only runtimes must not be omitted under -shared-libsan (which is the default on Fuchsia)

Patch By: mcgrathr

Differential Revision: https://reviews.llvm.org/D73397
parent d59e3429

clang/lib/Driver/SanitizerArgs.cpp

+8 −5
Original line number Diff line number Diff line
@@ -412,9 +412,11 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, 
                         SanitizerKind::Leak | SanitizerKind::Thread |

                         SanitizerKind::Memory | SanitizerKind::KernelAddress),

      std::make_pair(SanitizerKind::SafeStack,

                     (TC.getTriple().isOSFuchsia() ? SanitizerMask()

                                                   : SanitizerKind::Leak) |

                         SanitizerKind::Address | SanitizerKind::HWAddress |

                         SanitizerKind::Leak | SanitizerKind::Thread |

                         SanitizerKind::Memory | SanitizerKind::KernelAddress),

                         SanitizerKind::Thread | SanitizerKind::Memory |

                         SanitizerKind::KernelAddress),

      std::make_pair(SanitizerKind::KernelHWAddress,

                     SanitizerKind::Address | SanitizerKind::HWAddress |

                         SanitizerKind::Leak | SanitizerKind::Thread |
@@ -831,8 +833,9 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, 
  }



  if (AllAddedKinds & SanitizerKind::SafeStack) {

    // SafeStack runtime is built into the system on Fuchsia.

    SafeStackRuntime = !TC.getTriple().isOSFuchsia();

    // SafeStack runtime is built into the system on Android and Fuchsia.

    SafeStackRuntime =

        !TC.getTriple().isAndroid() && !TC.getTriple().isOSFuchsia();

  }



  LinkRuntimes =

clang/lib/Driver/ToolChains/CommonArgs.cpp

+18 −12
Original line number Diff line number Diff line
@@ -642,17 +642,21 @@ collectSanitizerRuntimes(const ToolChain &TC, const ArgList &Args, 
    StaticRuntimes.push_back("stats_client");



  // Collect static runtimes.

  if (Args.hasArg(options::OPT_shared) || SanArgs.needsSharedRt()) {

    // Don't link static runtimes into DSOs or if -shared-libasan.

  if (Args.hasArg(options::OPT_shared)) {

    // Don't link static runtimes into DSOs.

    return;

  }

  if (SanArgs.needsAsanRt() && SanArgs.linkRuntimes()) {



  // Each static runtime that has a DSO counterpart above is excluded below,

  // but runtimes that exist only as static are not affected by needsSharedRt.



  if (!SanArgs.needsSharedRt() && SanArgs.needsAsanRt() && SanArgs.linkRuntimes()) {

    StaticRuntimes.push_back("asan");

    if (SanArgs.linkCXXRuntimes())

      StaticRuntimes.push_back("asan_cxx");

  }



  if (SanArgs.needsHwasanRt() && SanArgs.linkRuntimes()) {

  if (!SanArgs.needsSharedRt() && SanArgs.needsHwasanRt() && SanArgs.linkRuntimes()) {

    StaticRuntimes.push_back("hwasan");

    if (SanArgs.linkCXXRuntimes())

      StaticRuntimes.push_back("hwasan_cxx");
@@ -671,7 +675,7 @@ collectSanitizerRuntimes(const ToolChain &TC, const ArgList &Args, 
    if (SanArgs.linkCXXRuntimes())

      StaticRuntimes.push_back("tsan_cxx");

  }

  if (SanArgs.needsUbsanRt() && SanArgs.linkRuntimes()) {

  if (!SanArgs.needsSharedRt() && SanArgs.needsUbsanRt() && SanArgs.linkRuntimes()) {

    if (SanArgs.requiresMinimalRuntime()) {

      StaticRuntimes.push_back("ubsan_minimal");

    } else {
@@ -684,6 +688,7 @@ collectSanitizerRuntimes(const ToolChain &TC, const ArgList &Args, 
    NonWholeStaticRuntimes.push_back("safestack");

    RequiredSymbols.push_back("__safestack_init");

  }

  if (!(SanArgs.needsSharedRt() && SanArgs.needsUbsanRt() && SanArgs.linkRuntimes())) {

    if (SanArgs.needsCfiRt() && SanArgs.linkRuntimes())

      StaticRuntimes.push_back("cfi");

    if (SanArgs.needsCfiDiagRt() && SanArgs.linkRuntimes()) {
@@ -691,11 +696,12 @@ collectSanitizerRuntimes(const ToolChain &TC, const ArgList &Args, 
      if (SanArgs.linkCXXRuntimes())

        StaticRuntimes.push_back("ubsan_standalone_cxx");

    }

  }

  if (SanArgs.needsStatsRt() && SanArgs.linkRuntimes()) {

    NonWholeStaticRuntimes.push_back("stats");

    RequiredSymbols.push_back("__sanitizer_stats_register");

  }

  if (SanArgs.needsScudoRt() && SanArgs.linkRuntimes()) {

  if (!SanArgs.needsSharedRt() && SanArgs.needsScudoRt() && SanArgs.linkRuntimes()) {

    if (SanArgs.requiresMinimalRuntime()) {

      StaticRuntimes.push_back("scudo_minimal");

      if (SanArgs.linkCXXRuntimes())

clang/lib/Driver/ToolChains/Fuchsia.cpp

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ SanitizerMask Fuchsia::getSupportedSanitizers() const { 
  Res |= SanitizerKind::PointerSubtract;

  Res |= SanitizerKind::Fuzzer;

  Res |= SanitizerKind::FuzzerNoLink;

  Res |= SanitizerKind::Leak;

  Res |= SanitizerKind::SafeStack;

  Res |= SanitizerKind::Scudo;

  return Res;