[asan] Unconditionally enable GC of globals on COFF.

This change restores pre-r301225 behavior, where linker GC compatible global
instrumentation was used on COFF targets disregarding -f(no-)data-sections and/or
/Gw flags.

This instrumentation puts each global in a COMDAT with an ASan descriptor for that global.
It effectively enables -fdata-sections, but limits it to ASan-instrumented globals.

llvm-svn: 301374
This commit is contained in:
Evgeniy Stepanov 2017-04-26 00:51:06 +00:00
parent 9547aabb26
commit c7b90947bd
2 changed files with 2 additions and 3 deletions

View File

@ -196,9 +196,8 @@ static void addSanitizerCoveragePass(const PassManagerBuilder &Builder,
static bool asanUseGlobalsGC(const Triple &T, const CodeGenOptions &CGOpts) { static bool asanUseGlobalsGC(const Triple &T, const CodeGenOptions &CGOpts) {
switch (T.getObjectFormat()) { switch (T.getObjectFormat()) {
case Triple::MachO: case Triple::MachO:
return true;
case Triple::COFF: case Triple::COFF:
return CGOpts.DataSections; return true;
case Triple::ELF: case Triple::ELF:
return CGOpts.DataSections && !CGOpts.DisableIntegratedAS; return CGOpts.DataSections && !CGOpts.DisableIntegratedAS;
default: default:

View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -fsanitize=address -emit-llvm -o - -triple x86_64-windows-msvc %s | FileCheck %s --check-prefix=WITHOUT-GC // RUN: %clang_cc1 -fsanitize=address -emit-llvm -o - -triple x86_64-windows-msvc %s | FileCheck %s --check-prefix=WITH-GC
// RUN: %clang_cc1 -fsanitize=address -emit-llvm -o - -triple x86_64-windows-msvc -fdata-sections %s | FileCheck %s --check-prefix=WITH-GC // RUN: %clang_cc1 -fsanitize=address -emit-llvm -o - -triple x86_64-windows-msvc -fdata-sections %s | FileCheck %s --check-prefix=WITH-GC
int global; int global;