Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit e601e5f

Browse files
pccpcc
committed
Rename __asan_gen_* symbols to ___asan_gen_*.
This prevents gold from printing a warning when trying to export these symbols via the asan dynamic list after ThinLTO promotes them from private symbols to external symbols with hidden visibility. Differential Revision: https://reviews.llvm.org/D49498 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@337428 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 9dc116b commit e601e5f

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

‎lib/Transforms/Instrumentation/AddressSanitizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static const char *const kAsanHandleNoReturnName = "__asan_handle_no_return";
153153
static const int kMaxAsanStackMallocSizeClass = 10;
154154
static const char *const kAsanStackMallocNameTemplate = "__asan_stack_malloc_";
155155
static const char *const kAsanStackFreeNameTemplate = "__asan_stack_free_";
156-
static const char *const kAsanGenPrefix = "__asan_gen_";
156+
static const char *const kAsanGenPrefix = "___asan_gen_";
157157
static const char *const kODRGenPrefix = "__odr_asan_gen_";
158158
static const char *const kSanCovGenPrefix = "__sancov_gen_";
159159
static const char *const kAsanSetShadowPrefix = "__asan_set_shadow_";

‎test/DebugInfo/AArch64/asan-stack-vars.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ target triple = "arm64-apple-ios"
7373
@llvm.compiler.used = appending global [12 x i8*] [i8* bitcast (%struct._class_t** @"OBJC_CLASSLIST_REFERENCES_$_" to i8*), i8* getelementptr inbounds ([6 x i8], [6 x i8]* @OBJC_METH_VAR_NAME_, i32 0, i32 0), i8* bitcast (i8** @OBJC_SELECTOR_REFERENCES_ to i8*), i8* getelementptr inbounds ([14 x i8], [14 x i8]* @OBJC_METH_VAR_NAME_.1, i32 0, i32 0), i8* bitcast (i8** @OBJC_SELECTOR_REFERENCES_.2 to i8*), i8* getelementptr inbounds ([9 x i8], [9 x i8]* @OBJC_METH_VAR_NAME_.3, i32 0, i32 0), i8* bitcast (i8** @OBJC_SELECTOR_REFERENCES_.4 to i8*), i8* getelementptr inbounds ([9 x i8], [9 x i8]* @OBJC_CLASS_NAME_, i32 0, i32 0), i8* getelementptr inbounds ([12 x i8], [12 x i8]* @OBJC_METH_VAR_NAME_.5, i32 0, i32 0), i8* getelementptr inbounds ([21 x i8], [21 x i8]* @OBJC_METH_VAR_TYPE_, i32 0, i32 0), i8* bitcast ({ i32, i32, [1 x %struct._objc_method] }* @"\01l_OBJC_$_CLASS_METHODS_MyObject" to i8*), i8* bitcast ([1 x i8*]* @"OBJC_LABEL_CLASS_$" to i8*)], section "llvm.metadata"
7474
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 1, void ()* @asan.module_ctor, i8* null }]
7575
@__asan_shadow_memory_dynamic_address = external global i64
76-
@__asan_gen_ = private unnamed_addr constant [34 x i8] c"2 32 16 9 imageSize 64 8 6 object\00", align 1
76+
@___asan_gen_ = private unnamed_addr constant [34 x i8] c"2 32 16 9 imageSize 64 8 6 object\00", align 1
7777

7878
; Function Attrs: noinline sanitize_address ssp uwtable
7979
define internal i8* @"\01+[MyObject doWithSize:]"(i8* %self, i8* %_cmd, [2 x double] %imageSize.coerce) #0 !dbg !14 {
@@ -91,7 +91,7 @@ entry:
9191
store i64 1102416563, i64* %6, !dbg !35
9292
%7 = add i64 %1, 8, !dbg !35
9393
%8 = inttoptr i64 %7 to i64*, !dbg !35
94-
store i64 ptrtoint ([34 x i8]* @__asan_gen_ to i64), i64* %8, !dbg !35
94+
store i64 ptrtoint ([34 x i8]* @___asan_gen_ to i64), i64* %8, !dbg !35
9595
%9 = add i64 %1, 16, !dbg !35
9696
%10 = inttoptr i64 %9 to i64*, !dbg !35
9797
store i64 ptrtoint (i8* (i8*, i8*, [2 x double])* @"\01+[MyObject doWithSize:]" to i64), i64* %10, !dbg !35

‎test/DebugInfo/COFF/asan-module-without-functions.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ target triple = "i686-pc-win32"
1515

1616
@c = global { i8, [63 x i8] } { i8 42, [63 x i8] zeroinitializer }, align 32
1717
@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 1, void ()* @asan.module_ctor }]
18-
@__asan_gen_ = private constant [7 x i8] c"asan.c\00", align 1
19-
@__asan_gen_1 = private unnamed_addr constant [2 x i8] c"c\00", align 1
20-
@0 = internal global [1 x { i32, i32, i32, i32, i32, i32 }] [{ i32, i32, i32, i32, i32, i32 } { i32 ptrtoint ({ i8, [63 x i8] }* @c to i32), i32 1, i32 64, i32 ptrtoint ([2 x i8]* @__asan_gen_1 to i32), i32 ptrtoint ([7 x i8]* @__asan_gen_ to i32), i32 0 }]
18+
@___asan_gen_ = private constant [7 x i8] c"asan.c\00", align 1
19+
@___asan_gen_1 = private unnamed_addr constant [2 x i8] c"c\00", align 1
20+
@0 = internal global [1 x { i32, i32, i32, i32, i32, i32 }] [{ i32, i32, i32, i32, i32, i32 } { i32 ptrtoint ({ i8, [63 x i8] }* @c to i32), i32 1, i32 64, i32 ptrtoint ([2 x i8]* @___asan_gen_1 to i32), i32 ptrtoint ([7 x i8]* @___asan_gen_ to i32), i32 0 }]
2121
@llvm.global_dtors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 1, void ()* @asan.module_dtor }]
2222

2323
define internal void @asan.module_ctor() {

‎test/DebugInfo/Generic/incorrect-variable-debugloc.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454

5555
@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 1, void ()* @asan.module_ctor }]
5656
@__asan_option_detect_stack_use_after_return = external global i32
57-
@__asan_gen_ = private unnamed_addr constant [11 x i8] c"1 32 8 1 A\00", align 1
58-
@__asan_gen_1 = private unnamed_addr constant [13 x i8] c"1 32 1 3 tmp\00", align 1
57+
@___asan_gen_ = private unnamed_addr constant [11 x i8] c"1 32 8 1 A\00", align 1
58+
@___asan_gen_1 = private unnamed_addr constant [13 x i8] c"1 32 1 3 tmp\00", align 1
5959

6060
; Function Attrs: noreturn sanitize_address
6161
define i32 @_Z3fn1v() #0 !dbg !22 {
@@ -78,7 +78,7 @@ entry:
7878
store i64 1102416563, i64* %9, !dbg !39
7979
%10 = add i64 %6, 8, !dbg !39
8080
%11 = inttoptr i64 %10 to i64*, !dbg !39
81-
store i64 ptrtoint ([11 x i8]* @__asan_gen_ to i64), i64* %11, !dbg !39
81+
store i64 ptrtoint ([11 x i8]* @___asan_gen_ to i64), i64* %11, !dbg !39
8282
%12 = add i64 %6, 16, !dbg !39
8383
%13 = inttoptr i64 %12 to i64*, !dbg !39
8484
store i64 ptrtoint (i32 ()* @_Z3fn1v to i64), i64* %13, !dbg !39
@@ -136,7 +136,7 @@ entry:
136136
store i64 1102416563, i64* %9, !dbg !48
137137
%10 = add i64 %6, 8, !dbg !48
138138
%11 = inttoptr i64 %10 to i64*, !dbg !48
139-
store i64 ptrtoint ([13 x i8]* @__asan_gen_1 to i64), i64* %11, !dbg !48
139+
store i64 ptrtoint ([13 x i8]* @___asan_gen_1 to i64), i64* %11, !dbg !48
140140
%12 = add i64 %6, 16, !dbg !48
141141
%13 = inttoptr i64 %12 to i64*, !dbg !48
142142
store i64 ptrtoint (void (%struct.C*)* @_ZN1C5m_fn3Ev to i64), i64* %13, !dbg !48

‎test/DebugInfo/X86/dbg_value_direct.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ target triple = "x86_64-unknown-linux-gnu"
2020
@__asan_mapping_offset = linkonce_odr constant i64 2147450880
2121
@__asan_mapping_scale = linkonce_odr constant i64 3
2222
@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 1, void ()* @asan.module_ctor }]
23-
@__asan_gen_ = private unnamed_addr constant [16 x i8] c"1 32 4 5 .addr \00", align 1
23+
@___asan_gen_ = private unnamed_addr constant [16 x i8] c"1 32 4 5 .addr \00", align 1
2424

2525
; Function Attrs: sanitize_address uwtable
2626
define void @_Z4funci(%struct.A* noalias sret %agg.result, i32) #0 "stack-protector-buffer-size"="1" !dbg !4 {
@@ -33,7 +33,7 @@ entry:
3333
store i64 1102416563, i64* %4
3434
%5 = add i64 %1, 8
3535
%6 = inttoptr i64 %5 to i64*
36-
store i64 ptrtoint ([16 x i8]* @__asan_gen_ to i64), i64* %6
36+
store i64 ptrtoint ([16 x i8]* @___asan_gen_ to i64), i64* %6
3737
%7 = add i64 %1, 16
3838
%8 = inttoptr i64 %7 to i64*
3939
store i64 ptrtoint (void (%struct.A*, i32)* @_Z4funci to i64), i64* %8

‎test/DebugInfo/X86/debug-loc-asan.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ target triple = "x86_64-unknown-linux-gnu"
4848

4949
@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 1, void ()* @asan.module_ctor }]
5050
@__asan_option_detect_stack_use_after_return = external global i32
51-
@__asan_gen_ = private unnamed_addr constant [16 x i8] c"1 32 4 6 y.addr\00", align 1
51+
@___asan_gen_ = private unnamed_addr constant [16 x i8] c"1 32 4 6 y.addr\00", align 1
5252

5353
; Function Attrs: nounwind sanitize_address uwtable
5454
define i32 @_Z3bari(i32 %y) #0 !dbg !4 {
@@ -71,7 +71,7 @@ entry:
7171
store i64 1102416563, i64* %9
7272
%10 = add i64 %6, 8
7373
%11 = inttoptr i64 %10 to i64*
74-
store i64 ptrtoint ([16 x i8]* @__asan_gen_ to i64), i64* %11
74+
store i64 ptrtoint ([16 x i8]* @___asan_gen_ to i64), i64* %11
7575
%12 = add i64 %6, 16
7676
%13 = inttoptr i64 %12 to i64*
7777
store i64 ptrtoint (i32 (i32)* @_Z3bari to i64), i64* %13

‎test/Instrumentation/AddressSanitizer/do-not-instrument-profiling-globals.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
@__llvm_gcov_ctr = internal global [1 x i64] zeroinitializer
66

77
; CHECK-DAG: @asan.module_ctor
8-
; CHECK-NOT: @__asan_gen{{.*}}__llvm_gcov_ctr
9-
; CHECK-NOT: @__asan_gen{{.*}}__profc_test
8+
; CHECK-NOT: @___asan_gen{{.*}}__llvm_gcov_ctr
9+
; CHECK-NOT: @___asan_gen{{.*}}__profc_test

‎test/Instrumentation/AddressSanitizer/global_metadata.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ target triple = "x86_64-unknown-linux-gnu"
1818
; CHECK: @.str = internal unnamed_addr constant { [14 x i8], [50 x i8] } { [14 x i8] c"Hello, world!\00", [50 x i8] zeroinitializer }, comdat($".str${{[01-9a-f]+}}"), align 32
1919

2020
; Check emitted location descriptions:
21-
; CHECK: [[VARNAME:@__asan_gen_.[0-9]+]] = private unnamed_addr constant [7 x i8] c"global\00", align 1
22-
; CHECK: [[FILENAME:@__asan_gen_.[0-9]+]] = private unnamed_addr constant [22 x i8] c"/tmp/asan-globals.cpp\00", align 1
23-
; CHECK: [[LOCDESCR:@__asan_gen_.[0-9]+]] = private unnamed_addr constant { [22 x i8]*, i32, i32 } { [22 x i8]* [[FILENAME]], i32 5, i32 5 }
21+
; CHECK: [[VARNAME:@___asan_gen_.[0-9]+]] = private unnamed_addr constant [7 x i8] c"global\00", align 1
22+
; CHECK: [[FILENAME:@___asan_gen_.[0-9]+]] = private unnamed_addr constant [22 x i8] c"/tmp/asan-globals.cpp\00", align 1
23+
; CHECK: [[LOCDESCR:@___asan_gen_.[0-9]+]] = private unnamed_addr constant { [22 x i8]*, i32, i32 } { [22 x i8]* [[FILENAME]], i32 5, i32 5 }
2424
; CHECK: @__asan_global_global = {{.*}}i64 ptrtoint ({ i32, [60 x i8] }* @global to i64){{.*}} section "asan_globals"{{.*}}, !associated
2525
; CHECK: @__asan_global_.str = {{.*}}i64 ptrtoint ({ [14 x i8], [50 x i8] }* @.str to i64){{.*}} section "asan_globals"{{.*}}, !associated
2626

‎test/Instrumentation/AddressSanitizer/global_metadata_array.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
1818
; CHECK: @.str = internal unnamed_addr constant { [14 x i8], [50 x i8] } { [14 x i8] c"Hello, world!\00", [50 x i8] zeroinitializer }{{.*}}, align 32
1919

2020
; Check emitted location descriptions:
21-
; CHECK: [[VARNAME:@__asan_gen_.[0-9]+]] = private unnamed_addr constant [7 x i8] c"global\00", align 1
22-
; CHECK: [[FILENAME:@__asan_gen_.[0-9]+]] = private unnamed_addr constant [22 x i8] c"/tmp/asan-globals.cpp\00", align 1
23-
; CHECK: [[LOCDESCR:@__asan_gen_.[0-9]+]] = private unnamed_addr constant { [22 x i8]*, i32, i32 } { [22 x i8]* [[FILENAME]], i32 5, i32 5 }
21+
; CHECK: [[VARNAME:@___asan_gen_.[0-9]+]] = private unnamed_addr constant [7 x i8] c"global\00", align 1
22+
; CHECK: [[FILENAME:@___asan_gen_.[0-9]+]] = private unnamed_addr constant [22 x i8] c"/tmp/asan-globals.cpp\00", align 1
23+
; CHECK: [[LOCDESCR:@___asan_gen_.[0-9]+]] = private unnamed_addr constant { [22 x i8]*, i32, i32 } { [22 x i8]* [[FILENAME]], i32 5, i32 5 }
2424

2525
; Check that location descriptors and global names were passed into __asan_register_globals:
2626
; CHECK: i64 ptrtoint ([7 x i8]* [[VARNAME]] to i64)

‎test/Instrumentation/AddressSanitizer/instrument_global.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ target triple = "x86_64-unknown-linux-gnu"
77
; If a global is present, __asan_[un]register_globals should be called from
88
; module ctor/dtor
99

10-
; CHECK: @__asan_gen_ = private constant [8 x i8] c"<stdin>\00", align 1
10+
; CHECK: @___asan_gen_ = private constant [8 x i8] c"<stdin>\00", align 1
1111
; CHECK: llvm.global_ctors
1212
; CHECK: llvm.global_dtors
1313

0 commit comments

Comments
 (0)