Skip to content

Roll LLVM b20d7d02..6811a83c815#6844

Open
danakj wants to merge 2 commits intocarbon-language:trunkfrom
danakj:roll-llvm
Open

Roll LLVM b20d7d02..6811a83c815#6844
danakj wants to merge 2 commits intocarbon-language:trunkfrom
danakj:roll-llvm

Conversation

@danakj
Copy link
Contributor

@danakj danakj commented Mar 6, 2026

Roll LLVM to 6811a83c81500ee373adfc0d9978ff9625a4cf1c.

This includes llvm/llvm-project#183831 which moved the functionality of finish() on DiagnosticConsumers into the destructors, and removed the finish() method. So, our callers to finish() are migrated to cause the destructor to run at that time instead.

@danakj danakj requested a review from a team as a code owner March 6, 2026 14:49
@danakj danakj requested review from zygoloid and removed request for a team March 6, 2026 14:49
@danakj danakj requested review from chandlerc and removed request for zygoloid March 6, 2026 14:52
@danakj
Copy link
Contributor Author

danakj commented Mar 6, 2026

There are some LLVM IR changes that are hard for me to judge but do not look trivial. For instance in toolchain/driver/testdata/compile/optimize/clang_no_optimize_twice.carbon:

-// CHECK:STDOUT: !llvm.module.flags = !{!0, !1, !2, !3, !4, !5}
+// CHECK:STDOUT: !llvm.module.flags = !{!0, !1, !2, !3, !4}

Copy link
Contributor

@jonmeow jonmeow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving to give the chance to see if this helps with the latest sha issue.

// CHECK:STDOUT:
// CHECK:STDOUT: !0 = !{i32 7, !"Dwarf Version", i32 5}
// CHECK:STDOUT: !1 = !{i32 2, !"Debug Info Version", i32 3}
// CHECK:STDOUT: !2 = !{i32 1, !"wchar_size", i32 4}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI things are churning because wchar_size is being removed. That's not too important, it's not something we're explicitly adding, just something llvm was dropping in.

@jonmeow jonmeow added this pull request to the merge queue Mar 6, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 7, 2026
@jonmeow
Copy link
Contributor

jonmeow commented Mar 7, 2026

FYI in #6854 I'm trying to switch to git_override to work around the sha256 issues.

github-merge-queue bot pushed a commit that referenced this pull request Mar 7, 2026
By using git_override, we get some validation from the sha, while
removing the sha256 on the .tar.gz which has been brittle lately. Note
the difference between downloading via sha is this still locally
validates content.

Versus something like #6844, this doesn't update the llvm version, just
how we get it.

Assisted-by: Google Antigravity with Gemini
@chandlerc
Copy link
Contributor

Gah, sorry i missed that this had passed checks before hitting merge on the git_overrides. Will need to update this now, apologies.

Copy link
Contributor

@chandlerc chandlerc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also LGTM fwiw!

Comment on lines +437 to +439
// Let diagnostics fall out of scope and be destroyed. This finishes
// diagnosing any failures before we verbosely log the source of those
// failures.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional (happy for it here, or in a follow-up, or I can send a follow-up):

Given that upstream is now baking more assumptions in about the scope here, I would be inclined to extract this block into a helper function? That would let it return the integer and failing commands, and also hold a comment about the fact that the compilation is fundamentally stateful. WDYT?

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants