Reland changes accidentally reverted in 302786e #1249
Merged
+4
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These changes 1) 2cc36eb - "[jumbo] Add begin()/end() to Slice." 2) 578eeb7 - "Fix invalid pointer arithmetic in Hash (#1222)" were committed in the public repository but never got imported to the internal Google repository. Later, cl/713346733 landed in the internal repo. When tooling published the internal change as 302786e ("Fix C++23 compilation errors in leveldb"), it accidentally reverted commits (1) and (2). This change re-commits a bundled version of (1) and (2) in the public repo. This will then be imported to the private repo, leaving the 2 in sync.
This was referenced Jan 30, 2025
aarongable
pushed a commit
to chromium/chromium
that referenced
this pull request
Jan 30, 2025
The first roll attempt in crrev.com/c/6198500 failed. The issue was fixed upstream in [1] and this CL rolls again. https://chromium.googlesource.com/external/leveldb.git/+log/578eeb702ec0..4ee78d7ea983 $ git log 578eeb702..4ee78d7ea --date=short --no-merges --format='%ad %ae %s' 2025-01-29 victor.vianna10 Reland changes accidentally reverted in 302786e 2025-01-21 no-reply Fix speculatively some "placement new" issues in leveldb 2025-01-08 no-reply Fix C++23 compilation errors in leveldb Created with: roll-dep src/third_party/leveldatabase/src [1] google/leveldb#1249 Bug: 388068052 Change-Id: Idf57cac52ce01dd6133f2803f4650701aff05220 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6218486 Reviewed-by: Evan Stade <[email protected]> Auto-Submit: Victor Vianna <[email protected]> Commit-Queue: Evan Stade <[email protected]> Cr-Commit-Position: refs/heads/main@{#1413629}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These changes
were committed in the public repository but never got imported to the internal Google repository.
Later, cl/713346733 landed in the internal repo. When tooling published the internal change as 302786e ("Fix C++23 compilation errors in leveldb"), it accidentally reverted commits (1) and (2).
This change re-commits a bundled version of (1) and (2) in the public repo. This will then be imported to the private repo, leaving the 2 in sync.