diff options
| author | Kostya Serebryany <kcc@google.com> | 2012-06-26 08:56:33 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@google.com> | 2012-06-26 08:56:33 +0000 |
| commit | b9d2b3b8edf7a0dc56e55acb1cf87338d5648daa (patch) | |
| tree | f5ffedf387328d4b7203ad778649a226ccd11b7d | |
| parent | e92b1f4917bfb669a09d220dc979fc3676df4da8 (diff) | |
[asan] add missing asan instrumentation in generated global init functions
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@159191 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGDeclCXX.cpp | 3 | ||||
| -rw-r--r-- | test/CodeGen/address-safety-attr.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/CodeGen/CGDeclCXX.cpp b/lib/CodeGen/CGDeclCXX.cpp index a27516bb5b..893628e08a 100644 --- a/lib/CodeGen/CGDeclCXX.cpp +++ b/lib/CodeGen/CGDeclCXX.cpp @@ -228,6 +228,9 @@ CreateGlobalInitOrDestructFunction(CodeGenModule &CGM, if (!CGM.getLangOpts().Exceptions) Fn->setDoesNotThrow(); + if (CGM.getLangOpts().AddressSanitizer) + Fn->addFnAttr(llvm::Attribute::AddressSafety); + return Fn; } diff --git a/test/CodeGen/address-safety-attr.cpp b/test/CodeGen/address-safety-attr.cpp index 9d0fb95963..da68b1d703 100644 --- a/test/CodeGen/address-safety-attr.cpp +++ b/test/CodeGen/address-safety-attr.cpp @@ -33,3 +33,9 @@ int TemplateAddressSafetyOk() { return i; } int force_instance = TemplateAddressSafetyOk<42>() + TemplateNoAddressSafety<42>(); + +// Check that __cxx_global_var_init* get the address_safety attribute. +int global1 = 0; +int global2 = *(int*)((char*)&global1+1); +// CHECK-NOT: @__cxx_global_var_init{{.*}}address_safety +// ASAN: @__cxx_global_var_init{{.*}}address_safety |