[libcxx-commits] [libcxx] cb82e8e - [libc++] Remove workaround for PR28391 (ODR violations with ASAN)

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2021-05-20T10:48:36-04:00
New Revision: cb82e8ea33e3546414b5ef15335c57611d1e04f2

URL: https://github.com/llvm/llvm-project/commit/cb82e8ea33e3546414b5ef15335c57611d1e04f2
DIFF: https://github.com/llvm/llvm-project/commit/cb82e8ea33e3546414b5ef15335c57611d1e04f2.diff

LOG: [libc++] Remove workaround for PR28391 (ODR violations with ASAN)

This is not an issue anymore since we don't build the libc++ dylib with
C++14 anymore (see https://llvm.org/PR28391) for details.

Differential Revision: https://reviews.llvm.org/D102106

Added: 
    

Modified: 
    libcxx/utils/libcxx/test/config.py

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 23d7d73b5bfba..106d228948bf0 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -490,9 +490,6 @@ def add_ubsan():
                 self.cxx.flags += ['-fsanitize=address']
                 if llvm_symbolizer is not None:
                     self.exec_env['ASAN_SYMBOLIZER_PATH'] = llvm_symbolizer
-                # FIXME: Turn ODR violation back on after PR28391 is resolved
-                # https://llvm.org/PR28391
-                self.exec_env['ASAN_OPTIONS'] = 'detect_odr_violation=0'
                 self.config.available_features.add('asan')
                 self.config.available_features.add('sanitizer-new-delete')
                 self.cxx.compile_flags += ['-O1']