From f0fa06bb7a0fae8743e0b5b25ccd24e03ec2ef74 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Fri, 6 Oct 2023 14:43:37 +0000 Subject: [PATCH] Swap the order of a piece of code to make follow up diffs simpler --- compiler/rustc_codegen_llvm/src/consts.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs index fbbc1ecbbca0..5d25e6cf03fb 100644 --- a/compiler/rustc_codegen_llvm/src/consts.rs +++ b/compiler/rustc_codegen_llvm/src/consts.rs @@ -354,8 +354,6 @@ impl<'ll> CodegenCx<'ll, '_> { }; let alloc = alloc.inner(); - let val_llty = self.val_ty(v); - let instance = Instance::mono(self.tcx, def_id); let ty = instance.ty(self.tcx, ty::ParamEnv::reveal_all()); if !is_mutable { @@ -366,6 +364,8 @@ impl<'ll> CodegenCx<'ll, '_> { let g = self.get_static_inner(def_id, llty); + let val_llty = self.val_ty(v); + let g = if val_llty == llty { g } else {