diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-06 16:18:25 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-12-06 16:18:25 +0000 |
| commit | b6d56a76556cffb523bba9fe570daad1250e6ca2 (patch) | |
| tree | 8b224c816ac7e49f9c94bb48289e0ea6d268dd03 | |
| parent | 1d1aa0b0a859c8c20b12cae18830751cbb3d22bd (diff) | |
| download | bcm5719-llvm-b6d56a76556cffb523bba9fe570daad1250e6ca2.tar.gz bcm5719-llvm-b6d56a76556cffb523bba9fe570daad1250e6ca2.zip | |
Create llvm.global_ctors in the new format.
llvm-svn: 254878
| -rw-r--r-- | llvm/lib/Transforms/Utils/ModuleUtils.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/Instrumentation/SanitizerCoverage/coverage.ll | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Transforms/Utils/ModuleUtils.cpp b/llvm/lib/Transforms/Utils/ModuleUtils.cpp index c5abf76d93f..9ec28a3f3d4 100644 --- a/llvm/lib/Transforms/Utils/ModuleUtils.cpp +++ b/llvm/lib/Transforms/Utils/ModuleUtils.cpp @@ -43,9 +43,9 @@ static void appendToGlobalArray(const char *Array, } GVCtor->eraseFromParent(); } else { - // Use a simple two-field struct if there isn't one already. + // Use the new three-field struct if there isn't one already. EltTy = StructType::get(IRB.getInt32Ty(), PointerType::getUnqual(FnTy), - nullptr); + IRB.getInt8PtrTy(), nullptr); } // Build a 2 or 3 field global_ctor entry. We don't take a comdat key. diff --git a/llvm/test/Instrumentation/SanitizerCoverage/coverage.ll b/llvm/test/Instrumentation/SanitizerCoverage/coverage.ll index 659c03040f2..71fdbbb5ada 100644 --- a/llvm/test/Instrumentation/SanitizerCoverage/coverage.ll +++ b/llvm/test/Instrumentation/SanitizerCoverage/coverage.ll @@ -29,8 +29,8 @@ entry: } ; CHECK0-NOT: @llvm.global_ctors = {{.*}}{ i32 2, void ()* @sancov.module_ctor } -; CHECK1: @llvm.global_ctors = {{.*}}{ i32 2, void ()* @sancov.module_ctor } -; CHECK2: @llvm.global_ctors = {{.*}}{ i32 2, void ()* @sancov.module_ctor } +; CHECK1: @llvm.global_ctors = {{.*}}{ i32 2, void ()* @sancov.module_ctor, i8* null } +; CHECK2: @llvm.global_ctors = {{.*}}{ i32 2, void ()* @sancov.module_ctor, i8* null } ; CHECK0-NOT: call void @__sanitizer_cov( ; CHECK0-NOT: call void @__sanitizer_cov_module_init( |
