New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some AArch64 typos #57987

Open
wants to merge 2 commits into
base: master
from

Conversation

Projects
None yet
7 participants
@parched
Copy link
Contributor

parched commented Jan 30, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 30, 2019

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@dlrobertson

This comment has been minimized.

Copy link
Contributor

dlrobertson commented Jan 30, 2019

👍 Thanks! FWIW the typo was introduced in #56599

@michaelwoerister

This comment has been minimized.

Copy link
Contributor

michaelwoerister commented Jan 30, 2019

Thanks, @parched!

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 30, 2019

📌 Commit c1858f2 has been approved by michaelwoerister

Centril added a commit to Centril/rust that referenced this pull request Jan 30, 2019

Centril added a commit to Centril/rust that referenced this pull request Jan 30, 2019

bors added a commit that referenced this pull request Jan 30, 2019

Auto merge of #58014 - Centril:rollup, r=Centril
Rollup of 12 pull requests

Successful merges:

 - #57008 (suggest `|` when `,` founds in invalid match value)
 - #57106 (Mark str::trim.* functions as #[must_use].)
 - #57920 (use `SOURCE_DATE_EPOCH` for man page time if set)
 - #57934 (Introduce into_raw_non_null on Rc and Arc)
 - #57971 (SGX target: improve panic & exit handling)
 - #57980 (Add the edition guide to the bookshelf)
 - #57984 (Improve bug message in check_ty)
 - #57987 (Fix some AArch64 typos)
 - #57999 (Add MOVBE x86 CPU feature)
 - #58000 (Fixes and cleanups)
 - #58007 (Don't panic when accessing enum variant ctor using `Self` in match)
 - #58008 (Pass correct arguments to places_conflict)

Failed merges:

r? @ghost
@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Jan 31, 2019

Failed in rollup, #58014 (comment)

@bors r-

@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Jan 31, 2019

@bors rollup-

@dlrobertson
Copy link
Contributor

dlrobertson left a comment

Ah the issues aren't visible in the diff and really are due to a bad implementation in my original PR. I'll do my best to describe it, but it will be a bit difficult since it is outside the diff. Please feel free to ping me on discord or zulip if you have questions.

The implementation of Debug (line 63) should be run for aarch64 + target_os = "ios" devices.

Line 74 needs a not(target_os = "ios")

The cfgs for intrinsic implementation of va_copy needs corrected. The one returning a VaList should be used for aarch64-ios.

@michaelwoerister

This comment has been minimized.

Copy link
Contributor

michaelwoerister commented Feb 6, 2019

Let's try again.

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 6, 2019

📌 Commit c1858f2 has been approved by michaelwoerister

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 6, 2019

⌛️ Testing commit c1858f2 with merge 348d3f9...

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

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 6, 2019

💔 Test failed - checks-travis

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 6, 2019

The job dist-x86_64-apple 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.
[00:02:49]       Memory: 8 GB
[00:02:49]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:02:49]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:02:49]       SMC Version (system): 2.8f0
[00:02:49]       Serial Number (system): VMwtjts8S2li
[00:02:49] 
[00:02:49] hw.ncpu: 4
[00:02:49] hw.byteorder: 1234
[00:02:49] hw.memsize: 8589934592
---
[01:05:56]    Compiling cc v1.0.28
[01:05:56]    Compiling core v0.0.0 (/Users/travis/build/rust-lang/rust/src/libcore)
[01:05:56]    Compiling libc v0.2.46
[01:05:56]    Compiling unwind v0.0.0 (/Users/travis/build/rust-lang/rust/src/libunwind)
[01:05:58] error[E0428]: the name `VaListImpl` is defined multiple times
[01:05:58]   --> src/libcore/ffi.rs:81:1
[01:05:58] 57 |     type VaListImpl;
[01:05:58] 57 |     type VaListImpl;
[01:05:58]    |     ---------------- previous definition of the type `VaListImpl` here
[01:05:58] 81 | struct VaListImpl {
[01:05:58] 81 | struct VaListImpl {
[01:05:58]    | ^^^^^^^^^^^^^^^^^ `VaListImpl` redefined here
[01:05:58]    |
[01:05:58]    = note: `VaListImpl` must be defined only once in the type namespace of this module
[01:05:58] 
[01:05:59] error[E0574]: expected struct, variant or union type, found foreign type `VaListImpl`
[01:06:03]    Compiling compiler_builtins v0.1.5
[01:06:03]    Compiling backtrace-sys v0.1.27
[01:06:03]    Compiling profiler_builtins v0.0.0 (/Users/travis/build/rust-lang/rust/src/libprofiler_builtins)
[01:06:04]    Compiling std v0.0.0 (/Users/travis/build/rust-lang/rust/src/libstd)
[01:06:04]    Compiling std v0.0.0 (/Users/travis/build/rust-lang/rust/src/libstd)
[01:06:09] error[E0308]: intrinsic has wrong type
[01:06:09]    --> src/libcore/ffi.rs:223:5
[01:06:09]     |
[01:06:09] 223 |     fn va_copy(src: &VaList) -> VaListImpl;
[01:06:09]     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected extern type `ffi::::VaListImpl`, found struct `ffi::VaList`
[01:06:09]     |
[01:06:09]     = note: expected type `for<'r, 's> unsafe extern "rust-intrinsic" fn(&'r ffi::VaList<'s>) -> ffi::::VaListImpl`
[01:06:09]                found type `for<'r, 's> unsafe extern "rust-intrinsic" fn(&'r ffi::VaList<'s>) -> ffi::VaList<'s>`
[01:06:16] thread 'rustc' panicked at 'called `Option::unwrap()` on a `None` value', src/libcore/option.rs:345:21
[01:06:16] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:06:19] error: aborting due to 3 previous errors
[01:06:19] 
---
[01:06:19] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[01:06:19] 
[01:06:19] note: rustc 1.34.0-nightly (348d3f927 2019-02-06) running on x86_64-apple-darwin
[01:06:19] 
[01:06:19] note: compiler flags: -Z save-analysis -Z osx-rpath-install-name -Z force-unstable-if-unmarked -C opt-level=2 -C prefer-dynamic -C linker=/Users/travis/build/rust-lang/rust/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang -C debuginfo=1 -C debug-assertions=n -C codegen-units=1 -C link-args=-Wl,-rpath,@loader_path/../lib --crate-type lib
[01:06:19] note: some of the compiler flags provided by cargo are hidden
[01:06:19] 
[01:06:19] [RUSTC-TIMING] core test:false 23.014
[01:06:19] error: Could not compile `core`.
[01:06:19] error: Could not compile `core`.
[01:06:19] warning: build failed, waiting for other jobs to finish...
[01:07:17] error: build failed
[01:07:17] command did not execute successfully: "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage0/bin/cargo" "build" "--target" "aarch64-apple-ios" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace profiler" "--manifest-path" "/Users/travis/build/rust-lang/rust/src/libstd/Cargo.toml" "--message-format" "json"
[01:07:17] expected success, got: exit code: 101
[01:07:17] failed to run: /Users/travis/build/rust-lang/rust/build/bootstrap/debug/bootstrap build
[01:07:17] Build completed unsuccessfully in 1:03:21
[01:07:17] make: *** [all] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:128b722f
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Feb  6 12:54:36 GMT 2019
---
travis_fold:start:after_failure.2
travis_time:start:0c1b3c0c
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
total 0
drwx------+ 15 travis  staff  510 Jan 25  2018 ..
drwx------   2 travis  staff   68 Dec  6  2017 .
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:01400dd4
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
$ find $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
travis_time:end:01400dd4:start=1549457683992447000,finish=1549457684027873000,duration=35426000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:282d1a42
$ 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:0ce090b4
travis_time:start:0ce090b4
$ 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:13a62f28
$ dmesg | grep -i kill
$ dmesg | grep -i kill
Unable to obtain kernel buffer: Operation not permitted
usage: sudo dmesg
travis_fold:end:after_failure.6

Done. Your build exited with 1.

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)

@dlrobertson

This comment has been minimized.

Copy link
Contributor

dlrobertson commented Feb 6, 2019

@parched If you do not have the time to make the final fixes needed to get this to work, I can submit a PR to your branch

@parched

This comment has been minimized.

Copy link
Contributor Author

parched commented Feb 6, 2019

Thanks, I see what you mean by your comment, I just haven't had the chance to do them yet. I don't think I will for at least a week, so by all means submit them yourself.

@dlrobertson

This comment has been minimized.

Copy link
Contributor

dlrobertson commented Feb 6, 2019

I just haven't had the chance to do them yet. I don't think I will for at least a week

👍 totally understand. I think that's fine. I just didn't want this to not get merged for outside issues.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment