Make `saturating_add` and `saturating_sub` `const` functions #58246

pmccarter · 2019-02-06T21:24:53Z

rust-highfive · 2019-02-06T21:24:56Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aidanhs (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

src/test/run-pass/const-int-saturating-arith.rs

src/librustc_mir/interpret/intrinsics.rs

pmccarter · 2019-02-06T23:13:07Z

Thanks @nikic should be covered now.

nikic · 2019-02-07T08:09:19Z

The logic here looks fine to me now. I think it would be a bit nicer to combine the code for saturating_add and saturating_sub, as they're nearly the same (the two differences are the used BinOp, and the bounds in the unsigned case).

r? @oli-obk to make sure the const eval stuff is right/idiomatic.

matthewjasper · 2019-02-07T09:58:49Z

src/librustc_mir/transform/qualify_min_const_fn.rs

@@ -374,6 +374,8 @@ fn is_intrinsic_whitelisted(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> bool
        | "overflowing_add" // ~> .wrapping_add
        | "overflowing_sub" // ~> .wrapping_sub
        | "overflowing_mul" // ~> .wrapping_mul
+        | "saturating_add" // ~> .saturating_add
+        | "saturating_sub" // ~> .saturating_sub


cc @rust-lang/lang

src/libcore/num/mod.rs

src/librustc_mir/interpret/intrinsics.rs

…re attribute #58030

…intrinsics #58030

oli-obk

r=me with the missing flags added

src/libcore/num/mod.rs

nikic · 2019-02-07T19:07:54Z

@bors r=oli-obk

bors · 2019-02-07T19:07:54Z

📌 Commit da13fbd has been approved by oli-obk

RalfJung · 2019-02-08T13:21:08Z

src/librustc_mir/interpret/intrinsics.rs

+                    let first_term: u128 = l.to_scalar()?.to_bits(l.layout.size)?;
+                    let num_bits = l.layout.size.bits();
+                    if l.layout.abi.is_signed() {
+                        if first_term & (1 << (num_bits-1)) == 0 {  // first term is positive


So it cannot overflow on the negative side because the smallest possible things we could reach here (for u8, similar for other types) are "0 - 127" and "0 + -128", and both are fine. Correct?

src/librustc_mir/interpret/intrinsics.rs

RalfJung · 2019-02-08T19:43:05Z

Awesome, thanks!

@bors r=oli-obk

bors · 2019-02-08T19:43:05Z

📌 Commit 7854067 has been approved by oli-obk

RalfJung · 2019-02-11T08:27:09Z

Prioritizing because this blocks Miri from passing tests.

@bors p=1

bors · 2019-02-11T10:34:06Z

💔 Test failed - checks-travis

rust-highfive · 2019-02-11T10:34:07Z

The job asmjs of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[01:52:05] failures:
[01:52:05] 
[01:52:05] ---- [run-pass] run-pass/const-int-saturating-arith.rs stdout ----
[01:52:05] 
[01:52:05] error: test compilation failed although it shouldn't!
[01:52:05] status: exit code: 1
[01:52:05] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass/const-int-saturating-arith.rs" "-Zthreads=1" "--target=asmjs-unknown-emscripten" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.js" "-Crpath" "-Zunstable-options" "-Lnative=/checkout/obj/build/asmjs-unknown-emscripten/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/auxiliary"
[01:52:05] ------------------------------------------
[01:52:05] 
[01:52:05] ------------------------------------------
[01:52:05] stderr:
[01:52:05] stderr:
[01:52:05] ------------------------------------------
[01:52:05] {"message":"linking with `emcc` failed: exit code: 1","code":null,"level":"error","spans":[],"children":[{"message":"\"emcc\" \"-s\" \"DISABLE_EXCEPTION_CATCHING=0\" \"-L\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.0.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.1.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.2.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.3.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.4.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.5.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.6.rcgu.o\" \"-o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.js\" \"-s\" \"EXPORTED_FUNCTIONS=[\\\"_main\\\",\\\"_rust_eh_personality\\\"]\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.1g7rkt11q6xshkyv.rcgu.o\" \"-O0\" \"--memory-init-file\" \"0\" \"-g0\" \"-s\" \"DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[]\" \"-L\" \"/checkout/obj/build/asmjs-unknown-emscripten/native/rust-test-helpers\" \"-L\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/auxiliary\" \"-L\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libstd-a3b039e1022c4e23.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libpanic_unwind-cbe0b279e7e65e1d.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libbacktrace_sys-fbbb4b4310d4461e.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libunwind-0ad99a19fff449db.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/librustc_demangle-e12a14701e612489.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/liblibc-c485303e37c5b870.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/liballoc-5cb2d546769e8afa.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/librustc_std_workspace_core-0121858c90ea5f38.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libcore-734d5601cb962c5d.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libcompiler_builtins-f54f893f2b95b307.rlib\" \"-l\" \"c\" \"-s\" \"ERROR_ON_UNDEFINED_SYMBOLS=1\" \"-s\" \"ABORTING_MALLOC=0\" \"-s\" \"WASM=0\"","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"WARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/std-a3b039e1022c4e23.std.5qp5rq2h-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/std-a3b039e1022c4e23.std.5qp5rq2h-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/panic_unwind-cbe0b279e7e65e1d.panic_unwind.8k1sskjn-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/panic_unwind-cbe0b279e7e65e1d.panic_unwind.8k1sskjn-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_FD8XsO_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_FD8XsO_archive_contents/backtrace_sys-fbbb4b4310d4461e.backtrace_sys.em1muf4r-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/unwind-0ad99a19fff449db.unwind.esdizuvf-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/unwind-0ad99a19fff449db.unwind.esdizuvf-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rustc_demangle-e12a14701e612489.rustc_demangle.a3ffu37k-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rustc_demangle-e12a14701e612489.rustc_demangle.a3ffu37k-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_UKtqa4_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_UKtqa4_archive_contents/libc-c485303e37c5b870.libc.1pxk5tle-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/alloc-5cb2d546769e8afa.alloc.dqq0juu1-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/alloc-5cb2d546769e8afa.alloc.dqq0juu1-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_8SdcWC_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_8SdcWC_archive_contents/rustc_std_workspace_core-0121858c90ea5f38.rustc_std_workspace_core.1npyr7mf-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/core-734d5601cb962c5d.core.6pdr3aku-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/core-734d5601cb962c5d.core.6pdr3aku-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nWARNING:root:object /tmp/emscripten_temp_fLzonL_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\nWARNING:root:object /tmp/emscripten_temp_fLzonL_archive_contents/compiler_builtins-f54f893f2b95b307.compiler_builtins.853z8lo6-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\nUnsupported:   %5 = icmp sgt i128 %4, -1\nLLVM ERROR: Signed comparisons not yet supported for integer types larger than 64 bits\nTraceback (most recent call last):\n  File \"/emsdk-portable/emscripten/1.38.15/emcc.py\", line 3094, in <module>\n    sys.exit(run())\n  File \"/emsdk-portable/emscripten/1.38.15/emcc.py\", line 1807, in run\n    final = shared.Building.emscripten(final, append_ext=False, extra_args=extra_args)\n  File \"/emsdk-portable/emscripten/1.38.15/tools/shared.py\", line 2250, in emscripten\n    emscripten._main(cmdline)\n  File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 2366, in _main\n    return temp_files.run_and_clean(lambda: main(\n  File \"/emsdk-portable/emscripten/1.38.15/tools/tempfiles.py\", line 98, in run_and_clean\n    return func()\n  File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 2371, in <lambda>\n    DEBUG=DEBUG,\n  File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 2297, in main\n    temp_files=temp_files, DEBUG=DEBUG)\n  File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 92, in emscript\n    backend_output = compile_js(infile, temp_files, DEBUG)\n  File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 121, in compile_js\n    jsrun.timeout_run(subprocess.Popen(backend_args, stdout=subprocess.PIPE, universal_newlines=True), note_args=backend_args)\n  File \"/emsdk-portable/emscripten/1.38.15/tools/jsrun.py\", line 24, in timeout_run\n    raise Exception('Subprocess \"' + ' '.join(note_args) + '\" failed with exit code ' + str(proc.returncode) + '!')\nException: Subprocess \"/emsdk-portable/clang/e1.38.15_64bit/llc /tmp/tmpadHyRl/a.bc -march=js -filetype=asm -o /tmp/tmpwtyOIf.4.js -emscripten-stack-size=5242880 -O0 -emscripten-assertions=1 -emscripten-no-aliasing-function-pointers -emscripten-global-base=8 -enable-emscripten-cpp-exceptions -emscripten-no-exit-runtime\" failed with exit code 1!\n","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"error: linking with `emcc` failed: exit code: 1\n   |\n   = note: \"emcc\" \"-s\" \"DISABLE_EXCEPTION_CATCHING=0\" \"-L\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.0.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.1.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.2.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.3.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.4.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.5.rcgu.o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.const_int_saturating_arith.7rcbfp3g-cgu.6.rcgu.o\" \"-o\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.js\" \"-s\" \"EXPORTED_FUNCTIONS=[\\\"_main\\\",\\\"_rust_eh_personality\\\"]\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/a.1g7rkt11q6xshkyv.rcgu.o\" \"-O0\" \"--memory-init-file\" \"0\" \"-g0\" \"-s\" \"DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[]\" \"-L\" \"/checkout/obj/build/asmjs-unknown-emscripten/native/rust-test-helpers\" \"-L\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/const-int-saturating-arith/auxiliary\" \"-L\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libstd-a3b039e1022c4e23.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libpanic_unwind-cbe0b279e7e65e1d.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libbacktrace_sys-fbbb4b4310d4461e.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libunwind-0ad99a19fff449db.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/librustc_demangle-e12a14701e612489.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/liblibc-c485303e37c5b870.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/liballoc-5cb2d546769e8afa.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/librustc_std_workspace_core-0121858c90ea5f38.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libcore-734d5601cb962c5d.rlib\" \"/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib/libcompiler_builtins-f54f893f2b95b307.rlib\" \"-l\" \"c\" \"-s\" \"ERROR_ON_UNDEFINED_SYMBOLS=1\" \"-s\" \"ABORTING_MALLOC=0\" \"-s\" \"WASM=0\"\n   = note: WARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/std-a3b039e1022c4e23.std.5qp5rq2h-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_g5n1Up_archive_contents/std-a3b039e1022c4e23.std.5qp5rq2h-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/panic_unwind-cbe0b279e7e65e1d.panic_unwind.8k1sskjn-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_jjYfS3_archive_contents/panic_unwind-cbe0b279e7e65e1d.panic_unwind.8k1sskjn-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_FD8XsO_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_FD8XsO_archive_contents/backtrace_sys-fbbb4b4310d4461e.backtrace_sys.em1muf4r-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/unwind-0ad99a19fff449db.unwind.esdizuvf-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp__nqBrc_archive_contents/unwind-0ad99a19fff449db.unwind.esdizuvf-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rustc_demangle-e12a14701e612489.rustc_demangle.a3ffu37k-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_CFMGgx_archive_contents/rustc_demangle-e12a14701e612489.rustc_demangle.a3ffu37k-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_UKtqa4_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_UKtqa4_archive_contents/libc-c485303e37c5b870.libc.1pxk5tle-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/alloc-5cb2d546769e8afa.alloc.dqq0juu1-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_QLSltm_archive_contents/alloc-5cb2d546769e8afa.alloc.dqq0juu1-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_8SdcWC_archive_contents/rust.metadata.bin is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_8SdcWC_archive_contents/rustc_std_workspace_core-0121858c90ea5f38.rustc_std_workspace_core.1npyr7mf-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/core-734d5601cb962c5d.core.6pdr3aku-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_Mu2y9C_archive_contents/core-734d5601cb962c5d.core.6pdr3aku-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           WARNING:root:object /tmp/emscripten_temp_fLzonL_archive_contents/rust.metadata.bin is not LLVM bitcode, cannot link\n           WARNING:root:object /tmp/emscripten_temp_fLzonL_archive_contents/compiler_builtins-f54f893f2b95b307.compiler_builtins.853z8lo6-cgu.0.rcgu.bc.z is not valid according to llvm-nm, cannot link\n           Unsupported:   %5 = icmp sgt i128 %4, -1\n           LLVM ERROR: Signed comparisons not yet supported for integer types larger than 64 bits\n           Traceback (most recent call last):\n             File \"/emsdk-portable/emscripten/1.38.15/emcc.py\", line 3094, in <module>\n               sys.exit(run())\n             File \"/emsdk-portable/emscripten/1.38.15/emcc.py\", line 1807, in run\n               final = shared.Building.emscripten(final, append_ext=False, extra_args=extra_args)\n             File \"/emsdk-portable/emscripten/1.38.15/tools/shared.py\", line 2250, in emscripten\n               emscripten._main(cmdline)\n             File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 2366, in _main\n               return temp_files.run_and_clean(lambda: main(\n             File \"/emsdk-portable/emscripten/1.38.15/tools/tempfiles.py\", line 98, in run_and_clean\n               return func()\n             File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 2371, in <lambda>\n               DEBUG=DEBUG,\n             File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 2297, in main\n               temp_files=temp_files, DEBUG=DEBUG)\n             File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 92, in emscript\n               backend_output = compile_js(infile, temp_files, DEBUG)\n             File \"/emsdk-portable/emscripten/1.38.15/emscripten.py\", line 121, in compile_js\n               jsrun.timeout_run(subprocess.Popen(backend_args, stdout=subprocess.PIPE, universal_newlines=True), note_args=backend_args)\n             File \"/emsdk-portable/emscripten/1.38.15/tools/jsrun.py\", line 24, in timeout_run\n               raise Exception('Subprocess \"' + ' '.join(note_args) + '\" failed with exit code ' + str(proc.returncode) + '!')\n           Exception: Subprocess \"/emsdk-portable/clang/e1.38.15_64bit/llc /tmp/tmpadHyRl/a.bc -march=js -filetype=asm -o /tmp/tmpwtyOIf.4.js -emscripten-stack-size=5242880 -O0 -emscripten-assertions=1 -emscripten-no-aliasing-function-pointers -emscripten-global-base=8 -enable-emscripten-cpp-exceptions -emscripten-no-exit-runtime\" failed with exit code 1!\n           \n\n"}
[01:52:05] 
[01:52:05] ------------------------------------------
[01:52:05] 
[01:52:05] thread '[run-pass] run-pass/const-int-saturating-arith.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3295:9
---
[01:52:05] 
[01:52:05] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:496:22
[01:52:05] 
[01:52:05] 
[01:52:05] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/asmjs-unknown-emscripten/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-pass" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass" "--stage-id" "stage2-asmjs-unknown-emscripten" "--mode" "run-pass" "--target" "asmjs-unknown-emscripten" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--nodejs" "/emsdk-portable/node/8.9.1_64bit/bin/node" "--host-rustcflags" "-Crpath -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Zunstable-options  -Lnative=/checkout/obj/build/asmjs-unknown-emscripten/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "8.0.0\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:52:05] 
[01:52:05] 
[01:52:05] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target asmjs-unknown-emscripten src/test/run-pass src/test/run-fail src/libstd src/liballoc src/libcore
[01:52:05] Build completed unsuccessfully in 1:46:28
---
travis_time:end:0059d2f8:start=1549881222344444099,finish=1549881222366047486,duration=21603387
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:3597e162
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0f899757
travis_time:start:0f899757
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:255ab0c0
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

nikic · 2019-02-11T10:38:06Z

LLVM ERROR: Signed comparisons not yet supported for integer types larger than 64 bits

You'll have to skip the test on emscripten, as it uses 128 bit integers.

src/librustc_mir/interpret/intrinsics.rs

src/test/run-pass/const-int-saturating-arith.rs

nikic · 2019-02-11T16:24:40Z

@bors r=oli-obk

bors · 2019-02-11T16:24:41Z

📌 Commit b04d8aa has been approved by oli-obk

bors · 2019-02-11T19:10:09Z

⌛ Testing commit b04d8aa with merge ba61cdb...

Make `saturating_add` and `saturating_sub` `const` functions Fixes #58030

bors · 2019-02-11T22:15:26Z

💔 Test failed - status-appveyor

Centril · 2019-02-12T01:06:44Z

Seemingly spurious; build was actually successful... @bors retry

cc #58160

bors · 2019-02-12T03:20:23Z

⌛ Testing commit b04d8aa with merge ba2853b...

Make `saturating_add` and `saturating_sub` `const` functions Fixes #58030

bors · 2019-02-12T05:50:20Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing ba2853b to master...

pmccarter added 3 commits February 5, 2019 15:36

Allow const assignment for int saturating_add() calls for #58030

9204497

Allow const assignment for int saturating_sub() for #58030

0efb8e4

tidy line length split

c5586eb

rust-highfive assigned aidanhs Feb 6, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 6, 2019

nikic reviewed Feb 6, 2019

View reviewed changes

src/test/run-pass/const-int-saturating-arith.rs Show resolved Hide resolved

nikic reviewed Feb 6, 2019

View reviewed changes

src/librustc_mir/interpret/intrinsics.rs Outdated Show resolved Hide resolved

nikic reviewed Feb 6, 2019

View reviewed changes

src/librustc_mir/interpret/intrinsics.rs Outdated Show resolved Hide resolved

pmccarter added 2 commits February 6, 2019 18:10

fix saturating_sub() underflow for unsigned ints #58030

f857199

tidy line length

d7efc76

rust-highfive assigned oli-obk and unassigned aidanhs Feb 7, 2019

matthewjasper reviewed Feb 7, 2019

View reviewed changes

oli-obk reviewed Feb 7, 2019

View reviewed changes

src/libcore/num/mod.rs Show resolved Hide resolved

src/librustc_mir/interpret/intrinsics.rs Outdated Show resolved Hide resolved

pmccarter added 2 commits February 7, 2019 13:12

Refactor const saturating intrinsics emulation and add unstable featu…

1799896

…re attribute #58030

Add unstable feature attribute for unsigned const saturating add/sub …

da13fbd

…intrinsics #58030

oli-obk approved these changes Feb 7, 2019

View reviewed changes

src/libcore/num/mod.rs Show resolved Hide resolved

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2019

RalfJung reviewed Feb 8, 2019

View reviewed changes

src/librustc_mir/interpret/intrinsics.rs Show resolved Hide resolved

Saturating add/sub intrinsic emulation refactor/comments #58030

7854067

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 11, 2019

RalfJung reviewed Feb 11, 2019

View reviewed changes

src/librustc_mir/interpret/intrinsics.rs Outdated Show resolved Hide resolved

RalfJung reviewed Feb 11, 2019

View reviewed changes

src/test/run-pass/const-int-saturating-arith.rs Show resolved Hide resolved

kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 11, 2019

rename variable and add test directive for #58030

b04d8aa

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 11, 2019

bors added a commit that referenced this pull request Feb 11, 2019

Auto merge of #58246 - pmccarter:master, r=oli-obk

ba61cdb

Make `saturating_add` and `saturating_sub` `const` functions Fixes #58030

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 11, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 12, 2019

bors added a commit that referenced this pull request Feb 12, 2019

Auto merge of #58246 - pmccarter:master, r=oli-obk

ba2853b

Make `saturating_add` and `saturating_sub` `const` functions Fixes #58030

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 12, 2019

bors merged commit b04d8aa into rust-lang:master Feb 12, 2019

TimDiekmann mentioned this pull request Nov 4, 2019

Tracking Issue for more const int functions #53718

Closed

59 tasks

jamwaffles mentioned this pull request May 19, 2020

Use const fn for constructors embedded-graphics/embedded-graphics#205

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make `saturating_add` and `saturating_sub` `const` functions #58246

Make `saturating_add` and `saturating_sub` `const` functions #58246

pmccarter commented Feb 6, 2019 •

edited by RalfJung

Loading

rust-highfive commented Feb 6, 2019

pmccarter commented Feb 6, 2019

nikic commented Feb 7, 2019

matthewjasper Feb 7, 2019

cramertj Feb 7, 2019

Centril Feb 8, 2019

oli-obk left a comment

nikic commented Feb 7, 2019

bors commented Feb 7, 2019

RalfJung Feb 8, 2019

RalfJung commented Feb 8, 2019

bors commented Feb 8, 2019

RalfJung commented Feb 11, 2019

bors commented Feb 11, 2019

rust-highfive commented Feb 11, 2019

nikic commented Feb 11, 2019

nikic commented Feb 11, 2019

bors commented Feb 11, 2019

bors commented Feb 11, 2019

bors commented Feb 11, 2019

Centril commented Feb 12, 2019 •

edited

Loading

bors commented Feb 12, 2019

bors commented Feb 12, 2019

Make saturating_add and saturating_sub const functions #58246

Make saturating_add and saturating_sub const functions #58246

Conversation

pmccarter commented Feb 6, 2019 • edited by RalfJung Loading

rust-highfive commented Feb 6, 2019

pmccarter commented Feb 6, 2019

nikic commented Feb 7, 2019

matthewjasper Feb 7, 2019

Choose a reason for hiding this comment

cramertj Feb 7, 2019

Choose a reason for hiding this comment

Centril Feb 8, 2019

Choose a reason for hiding this comment

oli-obk left a comment

Choose a reason for hiding this comment

nikic commented Feb 7, 2019

bors commented Feb 7, 2019

RalfJung Feb 8, 2019

Choose a reason for hiding this comment

RalfJung commented Feb 8, 2019

bors commented Feb 8, 2019

RalfJung commented Feb 11, 2019

bors commented Feb 11, 2019

rust-highfive commented Feb 11, 2019

nikic commented Feb 11, 2019

nikic commented Feb 11, 2019

bors commented Feb 11, 2019

bors commented Feb 11, 2019

bors commented Feb 11, 2019

Centril commented Feb 12, 2019 • edited Loading

bors commented Feb 12, 2019

bors commented Feb 12, 2019

Make `saturating_add` and `saturating_sub` `const` functions #58246

Make `saturating_add` and `saturating_sub` `const` functions #58246

pmccarter commented Feb 6, 2019 •

edited by RalfJung

Loading

Centril commented Feb 12, 2019 •

edited

Loading