Index: compiler-rt/test/asan/TestCases/Linux/odr-vtable.cc =================================================================== --- /dev/null +++ compiler-rt/test/asan/TestCases/Linux/odr-vtable.cc @@ -0,0 +1,28 @@ +// RUN: %clangxx_asan -fno-rtti -DBUILD_SO1 -fPIC -shared %s -o %t1.so +// RUN: %clangxx_asan -fno-rtti -DBUILD_SO2 -fPIC -shared %s -o %t2.so +// RUN: %clangxx_asan -fno-rtti %t1.so %t2.so %s -Wl,-R. -o %t +// RUN: %env_asan_opts=fast_unwind_on_malloc=0:detect_odr_violation=2 not %run %t 2>&1 | FileCheck %s + +struct XWZ { + virtual void g(); +}; + +#if defined(BUILD_SO1) + +void XWZ::g() {} + +#elif defined(BUILD_SO2) + +void XWZ::g() {} + +#else + +int main() { + XWZ a; +} + +#endif + +// CHECK: AddressSanitizer: odr-violation +// CHECK-NEXT: 'vtable for XWZ' +// CHECK-NEXT: 'vtable for XWZ' Index: llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp =================================================================== --- llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp +++ llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp @@ -2196,8 +2196,8 @@ // ODR check is not useful for the following, but we see false reports // caused by linker optimizations. - if (NewGlobal->hasLocalLinkage() || NewGlobal->hasGlobalUnnamedAddr() || - NewGlobal->hasLinkOnceODRLinkage() || NewGlobal->hasWeakODRLinkage()) { + if (NewGlobal->hasLocalLinkage() || NewGlobal->hasLinkOnceODRLinkage() || + NewGlobal->hasWeakODRLinkage()) { ODRIndicator = ConstantExpr::getIntToPtr(ConstantInt::get(IntptrTy, -1), IRB.getInt8PtrTy()); } else if (UseOdrIndicator) { Index: llvm/test/Instrumentation/AddressSanitizer/odr-check-ignore.ll =================================================================== --- llvm/test/Instrumentation/AddressSanitizer/odr-check-ignore.ll +++ llvm/test/Instrumentation/AddressSanitizer/odr-check-ignore.ll @@ -14,4 +14,4 @@ ; CHECK: @__asan_global_c = private global { i64, i64, i64, i64, i64, i64, i64, i64 } { i64 ptrtoint ({ [2 x i32], [56 x i8] }* @c to i64), i64 8, i64 64, i64 ptrtoint ([2 x i8]* @___asan_gen_.3 to i64), i64 ptrtoint ([8 x i8]* @___asan_gen_ to i64), i64 0, i64 0, i64 -1 } -; CHECK: @__asan_global_d = private global { i64, i64, i64, i64, i64, i64, i64, i64 } { i64 ptrtoint ({ [2 x i32], [56 x i8] }* @d to i64), i64 8, i64 64, i64 ptrtoint ([2 x i8]* @___asan_gen_.4 to i64), i64 ptrtoint ([8 x i8]* @___asan_gen_ to i64), i64 0, i64 0, i64 -1 } +; CHECK: @__asan_global_d = private global { i64, i64, i64, i64, i64, i64, i64, i64 } { i64 ptrtoint ({ [2 x i32], [56 x i8] }* @d to i64), i64 8, i64 64, i64 ptrtoint ([2 x i8]* @___asan_gen_.4 to i64), i64 ptrtoint ([8 x i8]* @___asan_gen_ to i64), i64 0, i64 0, i64 0 }