Skip to content

Commit 3ad7cf4

Browse files
committed
fix tests after merge
1 parent 2ef6c88 commit 3ad7cf4

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

src/codegen/tests/debug_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ fn switch_case_debug_info() {
222222
; ModuleID = '<internal>'
223223
source_filename = "<internal>"
224224
225-
define i32 @main() section "fn-$RUSTY$main:i32" !dbg !4 {
225+
define i32 @main() !dbg !4 {
226226
entry:
227227
%main = alloca i32, align 4, !dbg !9
228228
%x1 = alloca i16, align 2, !dbg !9
@@ -320,7 +320,7 @@ fn switch_case_debug_info() {
320320
; ModuleID = '__init___testproject'
321321
source_filename = "__init___testproject"
322322
323-
define void @__init___testproject() section "fn-$RUSTY$__init___testproject:v" !dbg !4 {
323+
define void @__init___testproject() !dbg !4 {
324324
entry:
325325
ret void, !dbg !9
326326
}

src/codegen/tests/initialization_test/complex_initializers.rs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,18 +1202,18 @@ fn var_config_aliased_variables_initialized() {
12021202
%FB = type { i32* }
12031203
%prog = type { %FB, %FB }
12041204
1205-
@__PI_1_2_1 = global i32 0, section "var-$RUSTY$__PI_1_2_1:i32"
1206-
@__PI_1_2_2 = global i32 0, section "var-$RUSTY$__PI_1_2_2:i32"
1207-
@__FB__init = unnamed_addr constant %FB zeroinitializer, section "var-$RUSTY$__FB__init:r1pi32"
1208-
@prog_instance = global %prog zeroinitializer, section "var-$RUSTY$prog_instance:r2r1pi32r1pi32"
1205+
@__PI_1_2_1 = global i32 0
1206+
@__PI_1_2_2 = global i32 0
1207+
@__FB__init = unnamed_addr constant %FB zeroinitializer
1208+
@prog_instance = global %prog zeroinitializer
12091209
1210-
define void @FB(%FB* %0) section "fn-$RUSTY$FB:v" {
1210+
define void @FB(%FB* %0) {
12111211
entry:
12121212
%foo = getelementptr inbounds %FB, %FB* %0, i32 0, i32 0
12131213
ret void
12141214
}
12151215
1216-
define void @prog(%prog* %0) section "fn-$RUSTY$prog:v" {
1216+
define void @prog(%prog* %0) {
12171217
entry:
12181218
%instance1 = getelementptr inbounds %prog, %prog* %0, i32 0, i32 0
12191219
%instance2 = getelementptr inbounds %prog, %prog* %0, i32 0, i32 1
@@ -1225,19 +1225,19 @@ fn var_config_aliased_variables_initialized() {
12251225
%FB = type { i32* }
12261226
%prog = type { %FB, %FB }
12271227
1228-
@__FB__init = external global %FB, section "var-$RUSTY$__FB__init:r1pi32"
1229-
@prog_instance = external global %prog, section "var-$RUSTY$prog_instance:r2r1pi32r1pi32"
1228+
@__FB__init = external global %FB
1229+
@prog_instance = external global %prog
12301230
1231-
define void @__init_fb(%FB* %0) section "fn-$RUSTY$__init_fb:v[pr1pi32]" {
1231+
define void @__init_fb(%FB* %0) {
12321232
entry:
12331233
%self = alloca %FB*, align 8
12341234
store %FB* %0, %FB** %self, align 8
12351235
ret void
12361236
}
12371237
1238-
declare void @FB(%FB*) section "fn-$RUSTY$FB:v"
1238+
declare void @FB(%FB*)
12391239
1240-
define void @__init_prog(%prog* %0) section "fn-$RUSTY$__init_prog:v[pr2r1pi32r1pi32]" {
1240+
define void @__init_prog(%prog* %0) {
12411241
entry:
12421242
%self = alloca %prog*, align 8
12431243
store %prog* %0, %prog** %self, align 8
@@ -1250,36 +1250,36 @@ fn var_config_aliased_variables_initialized() {
12501250
ret void
12511251
}
12521252
1253-
declare void @prog(%prog*) section "fn-$RUSTY$prog:v"
1253+
declare void @prog(%prog*)
12541254
; ModuleID = '__init___testproject'
12551255
source_filename = "__init___testproject"
12561256
12571257
%prog = type { %FB, %FB }
12581258
%FB = type { i32* }
12591259
1260-
@prog_instance = external global %prog, section "var-$RUSTY$prog_instance:r2r1pi32r1pi32"
1261-
@__FB__init = external global %FB, section "var-$RUSTY$__FB__init:r1pi32"
1262-
@__PI_1_2_1 = external global i32, section "var-$RUSTY$__PI_1_2_1:i32"
1263-
@__PI_1_2_2 = external global i32, section "var-$RUSTY$__PI_1_2_2:i32"
1260+
@prog_instance = external global %prog
1261+
@__FB__init = external global %FB
1262+
@__PI_1_2_1 = external global i32
1263+
@__PI_1_2_2 = external global i32
12641264
1265-
define void @__init___testproject() section "fn-$RUSTY$__init___testproject:v" {
1265+
define void @__init___testproject() {
12661266
entry:
12671267
call void @__init_prog(%prog* @prog_instance)
12681268
call void @__init___var_config()
12691269
ret void
12701270
}
12711271
1272-
define void @__init___var_config() section "fn-$RUSTY$__init___var_config:v" {
1272+
define void @__init___var_config() {
12731273
entry:
12741274
store i32* @__PI_1_2_1, i32** getelementptr inbounds (%prog, %prog* @prog_instance, i32 0, i32 0, i32 0), align 8
12751275
store i32* @__PI_1_2_2, i32** getelementptr inbounds (%prog, %prog* @prog_instance, i32 0, i32 1, i32 0), align 8
12761276
ret void
12771277
}
12781278
1279-
declare void @__init_prog(%prog*) section "fn-$RUSTY$__init_prog:v[pr2r1pi32r1pi32]"
1279+
declare void @__init_prog(%prog*)
12801280
1281-
declare void @prog(%prog*) section "fn-$RUSTY$prog:v"
1281+
declare void @prog(%prog*)
12821282
1283-
declare void @FB(%FB*) section "fn-$RUSTY$FB:v"
1283+
declare void @FB(%FB*)
12841284
"###);
12851285
}

0 commit comments

Comments
 (0)