Skip to content

Commit f444475

Browse files
committed
Fix failing tests in pulldown by adding -opaque-pointers
1 parent 1024bab commit f444475

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

llvm/test/LTO/Resolution/X86/comdat-mixed-lto.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
; that testglobfunc was dropped to available_externally. Otherwise we would
1616
; have linker multiply defined errors as it is no longer in a comdat and
1717
; would clash with the copy from this module.
18-
; RUN: llvm-dis %t3.0.0.preopt.bc -o - | FileCheck %s
18+
; RUN: llvm-dis -opaque-pointers %t3.0.0.preopt.bc -o - | FileCheck %s
1919

2020
; CHECK: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @__cxx_global_var_init, ptr @C }]
2121
; CHECK: @C = available_externally dso_local global %"class.Test::ptr" zeroinitializer, align 4
@@ -25,7 +25,7 @@
2525

2626
; Check the behavior with the prevailing testglobfunc in %t2.o.
2727
; RUN: llvm-lto2 run -r=%t1.o,C,pl -r=%t2.o,C,l -r=%t1.o,testglobfunc,lx -r=%t2.o,testglobfunc,plx -o %t4 %t1.o %t2.o -save-temps
28-
; RUN: llvm-dis %t4.0.0.preopt.bc -o - | FileCheck %s --check-prefix=CHECK2
28+
; RUN: llvm-dis -opaque-pointers %t4.0.0.preopt.bc -o - | FileCheck %s --check-prefix=CHECK2
2929

3030
; CHECK2: @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @__cxx_global_var_init, ptr @C }]
3131
; CHECK2: @C = available_externally dso_local global %"class.Test::ptr" zeroinitializer, align 4

llvm/test/ThinLTO/X86/ctor-dtor-alias.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
;;
88
;; clang -c -fpic -O1 -flto=thin a.cc && cp a.o b.o && ld.lld -shared a.o b.so
99

10-
; RUN: opt -module-summary %s -o %t1.bc
10+
; RUN: opt -opaque-pointers -module-summary %s -o %t1.bc
1111
; RUN: cp %t1.bc %t2.bc
12-
; RUN: llvm-lto2 run %t1.bc %t2.bc -r=%t1.bc,_ZTV1A,pl -r=%t1.bc,_ZN1AD0Ev,pl -r=%t1.bc,_ZN1AD1Ev,pl -r=%t1.bc,_ZN1AD2Ev,pl -r=%t1.bc,D1_a,pl -r=%t1.bc,D1_a_a,pl \
12+
; RUN: llvm-lto2 run -opaque-pointers %t1.bc %t2.bc -r=%t1.bc,_ZTV1A,pl -r=%t1.bc,_ZN1AD0Ev,pl -r=%t1.bc,_ZN1AD1Ev,pl -r=%t1.bc,_ZN1AD2Ev,pl -r=%t1.bc,D1_a,pl -r=%t1.bc,D1_a_a,pl \
1313
; RUN: -r=%t2.bc,_ZTV1A,l -r=%t2.bc,_ZN1AD0Ev,l -r=%t2.bc,_ZN1AD1Ev,l -r=%t2.bc,_ZN1AD2Ev,l -r=%t2.bc,D1_a,l -r=%t2.bc,D1_a_a,l -o %t3 --save-temps
14-
; RUN: llvm-dis < %t3.2.1.promote.bc | FileCheck %s
14+
; RUN: llvm-dis -opaque-pointers < %t3.2.1.promote.bc | FileCheck %s
1515

1616
; CHECK: @_ZTV1A = available_externally dso_local unnamed_addr constant { [4 x ptr] } { [4 x ptr] [ptr null, ptr null, ptr @_ZN1AD1Ev, ptr @_ZN1AD0Ev] }
1717
; CHECK: @D1_a = weak_odr dso_local unnamed_addr alias void (ptr), ptr @_ZN1AD1Ev

llvm/test/ThinLTO/X86/ctor-dtor-alias2.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
; RUN: rm -rf %t && split-file %s %t && cd %t
1818

1919
;; a.bc defines D0 in comdat D0 and D2 in comdat D2. b.bc defines D0/D1/D2 in comdat D5.
20-
; RUN: opt -module-summary a.ll -o a.bc
21-
; RUN: opt -module-summary b.ll -o b.bc
22-
; RUN: llvm-lto2 run a.bc b.bc -r=a.bc,aa,px -r=a.bc,_ZN1AIiED0Ev,px -r=a.bc,_ZN1AIiED2Ev,px -r=a.bc,_ZdlPv, \
20+
; RUN: opt -opaque-pointers -module-summary a.ll -o a.bc
21+
; RUN: opt -opaque-pointers -module-summary b.ll -o b.bc
22+
; RUN: llvm-lto2 run -opaque-pointers a.bc b.bc -r=a.bc,aa,px -r=a.bc,_ZN1AIiED0Ev,px -r=a.bc,_ZN1AIiED2Ev,px -r=a.bc,_ZdlPv, \
2323
; RUN: -r=b.bc,bb,px -r=b.bc,_ZN1AIiED0Ev, -r=b.bc,_ZN1AIiED1Ev,px -r=b.bc,_ZN1AIiED2Ev, -r=b.bc,_ZdlPv, -o out --save-temps
24-
; RUN: llvm-dis < out.2.1.promote.bc | FileCheck %s
24+
; RUN: llvm-dis -opaque-pointers < out.2.1.promote.bc | FileCheck %s
2525

2626
;; Although D0/D2 in b.bc is non-prevailing, keep D1/D2 as definitions, otherwise
2727
;; the output may have an undefined and unsatisfied D1.

llvm/test/ThinLTO/X86/windows-vftable.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
;; Test an alias pointing to a GEP.
2-
; RUN: opt -module-summary %s -o %t1.bc
2+
; RUN: opt -opaque-pointers -module-summary %s -o %t1.bc
33
; RUN: cp %t1.bc %t2.bc
4-
; RUN: llvm-lto2 run %t1.bc %t2.bc -r=%t1.bc,"??_7bad_array_new_length@stdext@@6B@",pl -r=%t1.bc,"??_Gbad_array_new_length@stdext@@UEAAPEAXI@Z",pl \
4+
; RUN: llvm-lto2 run -opaque-pointers %t1.bc %t2.bc -r=%t1.bc,"??_7bad_array_new_length@stdext@@6B@",pl -r=%t1.bc,"??_Gbad_array_new_length@stdext@@UEAAPEAXI@Z",pl \
55
; RUN: -r=%t1.bc,"?_Throw_bad_array_new_length@std@@YAXXZ",pl \
66
; RUN: -r=%t2.bc,"??_7bad_array_new_length@stdext@@6B@", -r=%t2.bc,"??_Gbad_array_new_length@stdext@@UEAAPEAXI@Z", \
77
; RUN: -r=%t2.bc,"?_Throw_bad_array_new_length@std@@YAXXZ", -o %t3 --save-temps
8-
; RUN: llvm-dis < %t3.2.1.promote.bc | FileCheck %s
8+
; RUN: llvm-dis -opaque-pointers < %t3.2.1.promote.bc | FileCheck %s
99

1010
; CHECK: @anon = private unnamed_addr constant { [2 x ptr] } { [2 x ptr] [ptr null, ptr @"??_Gbad_array_new_length@stdext@@UEAAPEAXI@Z"] }, comdat($"??_7bad_array_new_length@stdext@@6B@")
1111
; CHECK: @"??_7bad_array_new_length@stdext@@6B@" = unnamed_addr alias ptr, getelementptr inbounds ({ [4 x ptr] }, ptr @anon, i32 0, i32 0, i32 1){{$}}

0 commit comments

Comments
 (0)