X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_codegen_llvm%2Fbuilder.rs;h=83cd0dbfcd47e3ac916ba000bbf35e6efcc56520;hb=b2490299fc2029f9b43be51f80003ebcf804f7ac;hp=a6b55fee8702673ec4bdc81fd82c31c9e4f40313;hpb=94cd4f15d6479756af6e03a31a204bd588805cbd;p=rust.git

diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs
index a6b55fee870..83cd0dbfcd4 100644
--- a/src/librustc_codegen_llvm/builder.rs
+++ b/src/librustc_codegen_llvm/builder.rs
@@ -18,6 +18,7 @@
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::layout::TyAndLayout;
 use rustc_middle::ty::{self, Ty, TyCtxt};
+use rustc_span::sym;
 use rustc_target::abi::{self, Align, Size};
 use rustc_target::spec::{HasTargetSpec, Target};
 use std::borrow::Cow;
@@ -478,7 +479,11 @@ fn scalar_load_metadata<'a, 'll, 'tcx>(
                 let llptr = self.struct_gep(place.llval, i as u64);
                 let load = self.load(llptr, align);
                 scalar_load_metadata(self, load, scalar);
-                if scalar.is_bool() { self.trunc(load, self.type_i1()) } else { load }
+                if scalar.is_bool() {
+                    self.trunc(load, self.type_i1())
+                } else {
+                    load
+                }
             };
 
             OperandValue::Pair(
@@ -654,10 +659,7 @@ fn sext(&mut self, val: &'ll Value, dest_ty: &'ll Type) -> &'ll Value {
 
     fn fptoui_sat(&mut self, val: &'ll Value, dest_ty: &'ll Type) -> Option<&'ll Value> {
         if self.sess().target.target.arch == "wasm32"
-            && self
-                .sess()
-                .target_features
-                .contains(&rustc_span::symbol::Symbol::intern("nontrapping-fptoint"))
+            && self.sess().target_features.contains(&sym::wasm_nontrapping_fptoint)
         {
             let src_ty = self.cx.val_ty(val);
             let float_width = self.cx.float_width(src_ty);
@@ -679,10 +681,7 @@ fn fptoui_sat(&mut self, val: &'ll Value, dest_ty: &'ll Type) -> Option<&'ll Val
 
     fn fptosi_sat(&mut self, val: &'ll Value, dest_ty: &'ll Type) -> Option<&'ll Value> {
         if self.sess().target.target.arch == "wasm32"
-            && self
-                .sess()
-                .target_features
-                .contains(&rustc_span::symbol::Symbol::intern("nontrapping-fptoint"))
+            && self.sess().target_features.contains(&sym::wasm_nontrapping_fptoint)
         {
             let src_ty = self.cx.val_ty(val);
             let float_width = self.cx.float_width(src_ty);