From 1921ecc4a18b8639f5a37566c7f56b6e35f80e68 Mon Sep 17 00:00:00 2001
From: khyperia <github@khyperia.com>
Date: Wed, 23 Sep 2020 10:16:18 +0200
Subject: [PATCH] Fix up constants accidentally being emitted inside functions

---
 rustc_codegen_spirv/src/builder_spirv.rs | 37 ++++++++----------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/rustc_codegen_spirv/src/builder_spirv.rs b/rustc_codegen_spirv/src/builder_spirv.rs
index 4870450c14..368206a810 100644
--- a/rustc_codegen_spirv/src/builder_spirv.rs
+++ b/rustc_codegen_spirv/src/builder_spirv.rs
@@ -145,44 +145,31 @@ impl BuilderSpirv {
     }
 
     pub fn def_constant(&self, val: SpirvConst) -> SpirvValue {
+        let mut builder = self.builder(BuilderCursor::default());
         match self.constants.borrow_mut().entry(val) {
             Entry::Occupied(entry) => *entry.get(),
             Entry::Vacant(entry) => {
                 let id = match *entry.key() {
-                    SpirvConst::U32(ty, v) => {
-                        self.builder.borrow_mut().constant_u32(ty, v).with_type(ty)
+                    SpirvConst::U32(ty, v) => builder.constant_u32(ty, v).with_type(ty),
+                    SpirvConst::U64(ty, v) => builder.constant_u64(ty, v).with_type(ty),
+                    SpirvConst::F32(ty, v) => {
+                        builder.constant_f32(ty, f32::from_bits(v)).with_type(ty)
                     }
-                    SpirvConst::U64(ty, v) => {
-                        self.builder.borrow_mut().constant_u64(ty, v).with_type(ty)
+                    SpirvConst::F64(ty, v) => {
+                        builder.constant_f64(ty, f64::from_bits(v)).with_type(ty)
                     }
-                    SpirvConst::F32(ty, v) => self
-                        .builder
-                        .borrow_mut()
-                        .constant_f32(ty, f32::from_bits(v))
-                        .with_type(ty),
-                    SpirvConst::F64(ty, v) => self
-                        .builder
-                        .borrow_mut()
-                        .constant_f64(ty, f64::from_bits(v))
-                        .with_type(ty),
                     SpirvConst::Bool(ty, v) => {
                         if v {
-                            self.builder.borrow_mut().constant_true(ty).with_type(ty)
+                            builder.constant_true(ty).with_type(ty)
                         } else {
-                            self.builder.borrow_mut().constant_false(ty).with_type(ty)
+                            builder.constant_false(ty).with_type(ty)
                         }
                     }
-                    SpirvConst::Composite(ty, ref v) => self
-                        .builder
-                        .borrow_mut()
+                    SpirvConst::Composite(ty, ref v) => builder
                         .constant_composite(ty, v.iter().copied())
                         .with_type(ty),
-                    SpirvConst::Null(ty) => {
-                        self.builder.borrow_mut().constant_null(ty).with_type(ty)
-                    }
-                    SpirvConst::Undef(ty) => {
-                        self.builder.borrow_mut().undef(ty, None).with_type(ty)
-                    }
+                    SpirvConst::Null(ty) => builder.constant_null(ty).with_type(ty),
+                    SpirvConst::Undef(ty) => builder.undef(ty, None).with_type(ty),
                 };
                 self.constants_inverse
                     .borrow_mut()