Skip to content
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

Upgrade llvm-project (rustc + avr = lovelove back again!) #96845

Merged
merged 1 commit into from
May 9, 2022

Conversation

Patryk27
Copy link
Contributor

@Patryk27 Patryk27 commented May 8, 2022

@rust-highfive
Copy link
Collaborator

r? @cuviper

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 8, 2022
@Patryk27
Copy link
Contributor Author

Patryk27 commented May 8, 2022

r? @nikic

@nikic
Copy link
Contributor

nikic commented May 8, 2022

@bors r+ rollup=never (because LLVM submodule update, though no impact is expected here)

@bors
Copy link
Contributor

bors commented May 8, 2022

📌 Commit b551f31acd2999e816a66437e899b8e3402af47f has been approved by nikic

@bors 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 May 8, 2022
@bors
Copy link
Contributor

bors commented May 8, 2022

⌛ Testing commit b551f31acd2999e816a66437e899b8e3402af47f with merge 7da6551048731d8395d2b363428d90161d886c97...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented May 9, 2022

💔 Test failed - checks-actions

@bors 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 May 9, 2022
@Patryk27
Copy link
Contributor Author

Patryk27 commented May 9, 2022

##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

This feels unrelated to the pull request 😅 let's try again:

@bors: retry

@bors
Copy link
Contributor

bors commented May 9, 2022

@Patryk27: 🔑 Insufficient privileges: not in try users

@cuviper
Copy link
Member

cuviper commented May 9, 2022

@bors retry

@bors 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 May 9, 2022
@bors
Copy link
Contributor

bors commented May 9, 2022

⌛ Testing commit b551f31acd2999e816a66437e899b8e3402af47f with merge 8d040b637646ef43d3dfaf717516ad96a4339be3...

@bors
Copy link
Contributor

bors commented May 9, 2022

💔 Test failed - checks-actions

@bors 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 May 9, 2022
@rust-log-analyzer

This comment has been minimized.

@Patryk27
Copy link
Contributor Author

Patryk27 commented May 9, 2022

2022-05-09T07:12:59.4444743Z FAILED: ELF/CMakeFiles/lldELF.dir/InputSection.cpp.o 
2022-05-09T07:12:59.4451003Z sccache /usr/bin/c++  -DGTEST_HAS_RTTI=0 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IELF -I/checkout/src/llvm-project/lld/ELF -I/checkout/src/llvm-project/lld/include -Iinclude -I/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/include -I/checkout/src/llvm-project/llvm/include -ffunction-sections -fdata-sections -fPIC -m64 -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -fdiagnostics-color -ffunction-sections -fdata-sections -O3 -DNDEBUG    -fno-exceptions -fno-rtti -std=gnu++14 -MD -MT ELF/CMakeFiles/lldELF.dir/InputSection.cpp.o -MF ELF/CMakeFiles/lldELF.dir/InputSection.cpp.o.d -o ELF/CMakeFiles/lldELF.dir/InputSection.cpp.o -c /checkout/src/llvm-project/lld/ELF/InputSection.cpp
2022-05-09T07:12:59.4460408Z /checkout/src/llvm-project/lld/ELF/InputSection.cpp: In member function ‘uint64_t lld::elf::SectionBase::getOffset(uint64_t) const’:
2022-05-09T07:12:59.4461212Z /checkout/src/llvm-project/lld/ELF/InputSection.cpp:176:14: error: ‘llvm::ArrayRef<unsigned char> lld::elf::InputSectionBase::rawData’ is protected within this context
2022-05-09T07:12:59.4461929Z   176 |     if (!es->rawData.empty())
2022-05-09T07:12:59.4462198Z       |              ^~~~~~~
2022-05-09T07:12:59.4462604Z In file included from /checkout/src/llvm-project/lld/ELF/InputSection.cpp:9:
2022-05-09T07:12:59.4463123Z /checkout/src/llvm-project/lld/ELF/InputSection.h:231:29: note: declared protected here
2022-05-09T07:12:59.4463497Z   231 |   mutable ArrayRef<uint8_t> rawData;
2022-05-09T07:12:59.4463769Z       |                             ^~~~~~~

🤔 not sure what might be going on - the code compiles fine locally; maybe CI has some stale artifacts?

@Patryk27
Copy link
Contributor Author

Patryk27 commented May 9, 2022

Ah! This pull request contains not only my two commits for AVR -- I've done git submodule update --remote src/llvm-project, which fetched some additional commits (that I assumed were already in here); rough guess: rust-lang/llvm-project#134?

@nikic
Copy link
Contributor

nikic commented May 9, 2022

Yes, it looks like these patches depend on at least llvm/llvm-project@ae1ba61. I'll revert them.

@nikic
Copy link
Contributor

nikic commented May 9, 2022

I've reverted the patches, can you please update the submodule to the latest version?

@Patryk27
Copy link
Contributor Author

Patryk27 commented May 9, 2022

Sure, on it

@Patryk27
Copy link
Contributor Author

Patryk27 commented May 9, 2022

🚀

@nikic
Copy link
Contributor

nikic commented May 9, 2022

@bors r+

@bors
Copy link
Contributor

bors commented May 9, 2022

📌 Commit 6949627 has been approved by nikic

@bors 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 May 9, 2022
@bors
Copy link
Contributor

bors commented May 9, 2022

⌛ Testing commit 6949627 with merge 0e345b7...

@bors
Copy link
Contributor

bors commented May 9, 2022

☀️ Test successful - checks-actions
Approved by: nikic
Pushing 0e345b7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 9, 2022
@bors bors merged commit 0e345b7 into rust-lang:master May 9, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 9, 2022
@Patryk27 Patryk27 deleted the upgrade-llvm branch May 9, 2022 18:36
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0e345b7): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
8 participants