From 999f74ad59d4f393014a051035b33383eb71c57a Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Fri, 12 May 2017 17:06:16 +0000 Subject: [PATCH] [ubsan] Enable debug info in test binaries This fixes tests that use debug info to check ubsan stack traces. One was XFAILd on Windows and the other was actively failing for weeks. llvm-svn: 302924 --- compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp | 6 +----- compiler-rt/test/ubsan/lit.common.cfg | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp index b3ff358..47133860 100644 --- a/compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp +++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp @@ -1,8 +1,4 @@ -// FIXME: This test currently fails on Windows because we use the MSVC linker, -// which throws away DWARF debug info. -// XFAIL: win32 -// -// RUN: %clangxx -fsanitize=alignment -g %s -O3 -o %t +// RUN: %clangxx -fsanitize=alignment %s -O3 -o %t // RUN: %run %t l0 && %run %t s0 && %run %t r0 && %run %t m0 && %run %t f0 && %run %t n0 && %run %t u0 // RUN: %run %t l1 2>&1 | FileCheck %s --check-prefix=CHECK-LOAD --strict-whitespace // RUN: %run %t s1 2>&1 | FileCheck %s --check-prefix=CHECK-STORE diff --git a/compiler-rt/test/ubsan/lit.common.cfg b/compiler-rt/test/ubsan/lit.common.cfg index cb6a8e4..0fa2e01 100644 --- a/compiler-rt/test/ubsan/lit.common.cfg +++ b/compiler-rt/test/ubsan/lit.common.cfg @@ -57,7 +57,7 @@ config.substitutions.append(('%env_ubsan_opts=', def build_invocation(compile_flags): return " " + " ".join([config.clang] + compile_flags) + " " -target_cflags = [get_required_attr(config, "target_cflags")] +target_cflags = [get_required_attr(config, "target_cflags")] + config.debug_info_flags clang_ubsan_cflags += target_cflags clang_ubsan_cxxflags = config.cxx_mode_flags + clang_ubsan_cflags -- 2.7.4