Skip to content

Commit 0e8a69a

Browse files
committed
Address review comments and add UI test
1 parent 6aea814 commit 0e8a69a

File tree

6 files changed

+529
-505
lines changed

6 files changed

+529
-505
lines changed

src/ci/docker/test-various/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
wget \
1818
patch
1919

20-
RUN curl -sL https://nodejs.org/dist/v9.2.0/node-v9.2.0-linux-x64.tar.xz | \
20+
RUN curl -sL https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-x64.tar.xz | \
2121
tar -xJ
2222

2323
WORKDIR /build/
@@ -30,7 +30,7 @@ RUN sh /scripts/sccache.sh
3030

3131
ENV RUST_CONFIGURE_ARGS \
3232
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
33-
--set build.nodejs=/node-v9.2.0-linux-x64/bin/node \
33+
--set build.nodejs=/node-v14.4.0-linux-x64/bin/node \
3434
--set rust.lld
3535

3636
# Some run-make tests have assertions about code size, and enabling debug

src/librustc_codegen_llvm/builder.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
658658
// `nontrapping-fptoint` target feature is activated. We'll use those if
659659
// they are available.
660660
if self.sess().target.target.arch == "wasm32"
661-
&& self.sess().target_features.contains(&sym::wasm_nontrapping_fptoint)
661+
&& self.sess().target_features.contains(&sym::nontrapping_fptoint)
662662
{
663663
let src_ty = self.cx.val_ty(val);
664664
let float_width = self.cx.float_width(src_ty);
@@ -683,7 +683,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
683683
// `nontrapping-fptoint` target feature is activated. We'll use those if
684684
// they are available.
685685
if self.sess().target.target.arch == "wasm32"
686-
&& self.sess().target_features.contains(&sym::wasm_nontrapping_fptoint)
686+
&& self.sess().target_features.contains(&sym::nontrapping_fptoint)
687687
{
688688
let src_ty = self.cx.val_ty(val);
689689
let float_width = self.cx.float_width(src_ty);

src/librustc_span/symbol.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ symbols! {
511511
None,
512512
non_exhaustive,
513513
non_modrs_mods,
514+
nontrapping_fptoint: "nontrapping-fptoint",
514515
noreturn,
515516
no_niche,
516517
no_sanitize,
@@ -837,7 +838,6 @@ symbols! {
837838
warn,
838839
wasm_import_module,
839840
wasm_target_feature,
840-
wasm_nontrapping_fptoint: "nontrapping-fptoint",
841841
while_let,
842842
windows,
843843
windows_subsystem,

0 commit comments

Comments
 (0)