From db3a9bcd37f9c941938e0599a830d39fc7f2ffcd Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Wed, 15 May 2019 03:08:21 +0000 Subject: [PATCH] Fix 2-field llvm.global_ctors `REQUIRES: asserts` tests after rL360742 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360743 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/ExecutionEngine/MCJIT/test-global-ctors.ll | 4 ++-- test/ThinLTO/X86/deadstrip.ll | 2 +- test/Transforms/MergeFunc/vector.ll | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/ExecutionEngine/MCJIT/test-global-ctors.ll b/test/ExecutionEngine/MCJIT/test-global-ctors.ll index 6d132716d7d..4d03b3759e4 100644 --- a/test/ExecutionEngine/MCJIT/test-global-ctors.ll +++ b/test/ExecutionEngine/MCJIT/test-global-ctors.ll @@ -1,8 +1,8 @@ ; RUN: %lli %s > /dev/null ; XFAIL: darwin @var = global i32 1, align 4 -@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @ctor_func }] -@llvm.global_dtors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @dtor_func }] +@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @ctor_func, i8* null }] +@llvm.global_dtors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @dtor_func, i8* null }] define i32 @main() nounwind { entry: diff --git a/test/ThinLTO/X86/deadstrip.ll b/test/ThinLTO/X86/deadstrip.ll index bcce9376849..2f389c52c5c 100644 --- a/test/ThinLTO/X86/deadstrip.ll +++ b/test/ThinLTO/X86/deadstrip.ll @@ -136,7 +136,7 @@ target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0" -@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @_GLOBAL__I_a }] +@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__I_a, i8* null }] declare void @baz() diff --git a/test/Transforms/MergeFunc/vector.ll b/test/Transforms/MergeFunc/vector.ll index db95ec742ba..59b3d25ea7e 100644 --- a/test/Transforms/MergeFunc/vector.ll +++ b/test/Transforms/MergeFunc/vector.ll @@ -10,14 +10,14 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-unknown-linux-gnu" -%0 = type { i32, void ()* } +%0 = type { i32, void ()*, i8* } %1 = type { i64, i1 } %"class.std::vector" = type { [24 x i8] } @vi = global %"class.std::vector" zeroinitializer, align 8 @__dso_handle = external unnamed_addr global i8* @vp = global %"class.std::vector" zeroinitializer, align 8 -@llvm.global_ctors = appending global [1 x %0] [%0 { i32 65535, void ()* @_GLOBAL__I_a }] +@llvm.global_ctors = appending global [1 x %0] [%0 { i32 65535, void ()* @_GLOBAL__I_a, i8* null }] define linkonce_odr void @_ZNSt6vectorIlSaIlEED1Ev(%"class.std::vector"* nocapture %this) unnamed_addr align 2 { entry: -- 2.50.1