Fix llvmpasses

Author: gbaraldi

test/llvmpasses/late-lower-gc.ll

@@ -134,10 +134,11 @@ top:
     %pgcstack = call {}*** @julia.get_pgcstack()
     %1 = bitcast {}*** %pgcstack to {}**
     %current_task = getelementptr inbounds {}*, {}** %1, i64 -12
-
-; CHECK: %current_task = getelementptr inbounds ptr, ptr %1, i64 -12
-    %2 = load float, ptr addrspace(1) %0, align 4, !invariant.load !1
-; CHECK-NEXT: %2 = load float, ptr addrspace(1) %0, align 4, !invariant.load
+; TYPED: %current_task = %current_task = getelementptr inbounds {}*, {}** %1, i64 -12
+; OPAQUE: %current_task = getelementptr inbounds ptr, ptr %1, i64 -12
+    %2 = load float, float addrspace(1)* %0, align 4, !invariant.load !1
+; TYPED-NEXT: %2 = load float, float addrspace(1)* %0, align 4, !invariant.load
+; OPAQUE-NEXT: %2 = load float, ptr addrspace(1) %0, align 4, !invariant.load
     ret void
 }
 
@@ -207,7 +208,7 @@ define void @decayar([2 x {} addrspace(10)* addrspace(11)*] %ar) {
   %l0 = load {} addrspace(10)*, {} addrspace(10)* addrspace(11)* %e0
   %e1 = extractvalue [2 x {} addrspace(10)* addrspace(11)*] %ar, 1
   %l1 = load {} addrspace(10)*, {} addrspace(10)* addrspace(11)* %e1
-  %r = call i32 @callee_root({} addrspace(10)* %l0, {} addrspace(10)* %l1) 
+  %r = call i32 @callee_root({} addrspace(10)* %l0, {} addrspace(10)* %l1)
   ret void
 }
 

test/llvmpasses/remove-addrspaces.ll

@@ -3,8 +3,6 @@
 ; RUN: opt -enable-new-pm=0 --opaque-pointers=0 -load libjulia-codegen%shlibext -RemoveJuliaAddrspaces -S %s | FileCheck %s --check-prefixes=CHECK,TYPED
 ; RUN: opt -enable-new-pm=1 --opaque-pointers=0 --load-pass-plugin=libjulia-codegen%shlibext -passes='RemoveJuliaAddrspaces' -S %s | FileCheck %s --check-prefixes=CHECK,TYPED
 
-; RUN: opt -enable-new-pm=0 --opaque-pointers=1 -load libjulia-codegen%shlibext -RemoveJuliaAddrspaces -S %s | FileCheck %s --check-prefixes=CHECK,OPAQUE
-; RUN: opt -enable-new-pm=1 --opaque-pointers=1 --load-pass-plugin=libjulia-codegen%shlibext -passes='RemoveJuliaAddrspaces' -S %s | FileCheck %s --check-prefixes=CHECK,OPAQUE
 
 ; COM: check that the addrspace of the global itself is removed
 ; OPAQUE: @ejl_enz_runtime_exc = external global {}
@@ -16,10 +14,6 @@
 ; TYPED-SAME: {}* ({}***, {}*, [1 x i64]*)* null
 ; OPAQUE-SAME: ptr null
 
-; COM: check that the addrspace of the global itself is removed
-; OPAQUE: @ejl_enz_runtime_exc = external global {}
-@ejl_enz_runtime_exc = external addrspace(10) global {}
-
 define i64 @getindex({} addrspace(10)* nonnull align 16 dereferenceable(40)) {
 ; CHECK-LABEL: @getindex
 top:
@@ -137,13 +131,6 @@ L6:
   unreachable
 }
 
-define private fastcc void @diffejulia__mapreduce_97() {
-L6:
-; OPAQUE: store atomic ptr @ejl_enz_runtime_exc, ptr null unordered
-  store atomic {} addrspace(10)* @ejl_enz_runtime_exc, {} addrspace(10)* addrspace(10)* null unordered, align 8
-  unreachable
-}
-
 ; COM: check that function attributes are preserved on declarations too
 declare void @convergent_function() #0
 attributes #0 = { convergent }