Address review comments and add UI test

Manishearth · Jul 2, 2020 · 838c497 · 838c497
1 parent 8f8c90e
commit 838c497
Show file tree

Hide file tree

Showing 6 changed files with 528 additions and 505 deletions.
diff --git a/src/ci/docker/test-various/Dockerfile b/src/ci/docker/test-various/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   wget \
   patch
 
-RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \
+RUN curl -sL https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-x64.tar.xz | \
   tar -xJ
 
 WORKDIR /build/
@@ -30,7 +30,7 @@ RUN sh /scripts/sccache.sh
 
 ENV RUST_CONFIGURE_ARGS \
   --musl-root-x86_64=/usr/local/x86_64-linux-musl \
-  --set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
+  --set build.nodejs=/node-v14.4.0-linux-x64/bin/node \
   --set rust.lld
 
 # Some run-make tests have assertions about code size, and enabling debug

diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs
@@ -658,7 +658,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         // `nontrapping-fptoint` target feature is activated. We'll use those if
         // they are available.
         if self.sess().target.target.arch == "wasm32"
-            && self.sess().target_features.contains(&sym::wasm_nontrapping_fptoint)
+            && self.sess().target_features.contains(&sym::nontrapping_fptoint)
         {
             let src_ty = self.cx.val_ty(val);
             let float_width = self.cx.float_width(src_ty);
@@ -683,7 +683,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         // `nontrapping-fptoint` target feature is activated. We'll use those if
         // they are available.
         if self.sess().target.target.arch == "wasm32"
-            && self.sess().target_features.contains(&sym::wasm_nontrapping_fptoint)
+            && self.sess().target_features.contains(&sym::nontrapping_fptoint)
         {
             let src_ty = self.cx.val_ty(val);
             let float_width = self.cx.float_width(src_ty);

diff --git a/src/librustc_span/symbol.rs b/src/librustc_span/symbol.rs
@@ -513,6 +513,7 @@ symbols! {
         None,
         non_exhaustive,
         non_modrs_mods,
+        nontrapping_fptoint: "nontrapping-fptoint",
         noreturn,
         no_niche,
         no_sanitize,
@@ -844,7 +845,6 @@ symbols! {
         warn,
         wasm_import_module,
         wasm_target_feature,
-        wasm_nontrapping_fptoint: "nontrapping-fptoint",
         while_let,
         windows,
         windows_subsystem,