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.

Sign up for GitHub

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

Jump to bottom

Protoc alpha 3.1 #1338

Closed
wants to merge 3 commits into from
Closed

Protoc alpha 3.1 #1338

wants to merge 3 commits into from

Conversation

AsianDoctor
Copy link

No description provided.

@liujisi
Add static MyMessage.parser().
927ef3f 
In preparation of deprecating the PARSER public instance.

Change-Id: I3e332d83bc4b4f8467769f8e45c758978ace8f21
@liujisi
bump the protoc artifact version number
6fcc2a9 
Change-Id: If45007aa4ef381307fc0ee602e9a7000b7f622e8
@liujisi
bump the runtime version to 3.1.
5d4a856 
This matches the protoc artifacts.

Change-Id: Iad8ffed6d0c61b79893a36ccafb420e79aca8d14
@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.

  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@xfxyjwf xfxyjwf closed this Mar 21, 2016
@xfxyjwf xfxyjwf deleted the protoc-alpha-3.1 branch June 30, 2016 23:30
acozzette pushed a commit to acozzette/protobuf that referenced this pull request Sep 7, 2023
@messense @acozzette
Fix PyUpb_Message_MergeInternal segfault (protocolbuffers#1338)
ccadaf3 
when `PyUpb_Message_MergeFromString` returns `NULL`, currently
`PyUpb_Message_MergeInternal` will call `Py_DECREF` on `NULL`
which results in a segmentation fault.

This patch switches to `Py_XDECREF` to fix the segfault.
copybara-service bot pushed a commit that referenced this pull request Sep 8, 2023
@acozzette
Cherry-pick recent changes from the upb repo (#13908)
b2e39c1 
I merged a handful of PRs on the upb repo after upb moved into the protobuf repo. This PR cherry-picks them here so that they will not be lost.

```
commit 7afb426
Author: Keith Smiley <keithbsmiley@gmail.com>
Date:   Thu Sep 7 11:36:01 2023 -0700

    [bazel] Fix disallowing dylibs on darwin (#1180)

    Since this bazel commit
    bazelbuild/bazel@ec55533
    building dylibs like the ones in this rule on darwin platforms has been
    unsupported. This feature is a default C++ toolchain feature to indicate
    this. In bazel 7.x these dylibs will fail to link if they are still
    built. As far as I can tell in the tests even if they are built they are
    never used on macOS.

    Co-authored-by: Adam Cozzette <acozzette@google.com>

commit 72decab
Author: Keith Smiley <keithbsmiley@gmail.com>
Date:   Thu Sep 7 09:42:20 2023 -0700

    Add missing darwin_x86_64 CPU (#1181)

    This CPU is often used when cross compiling from M1 machines. I'm also
    hoping we can remove the legacy 'darwin' CPU.

commit ccadaf3
Author: messense <messense@icloud.com>
Date:   Fri Sep 8 00:28:54 2023 +0800

    Fix `PyUpb_Message_MergeInternal` segfault (#1338)

    when `PyUpb_Message_MergeFromString` returns `NULL`, currently
    `PyUpb_Message_MergeInternal` will call `Py_DECREF` on `NULL`
    which results in a segmentation fault.

    This patch switches to `Py_XDECREF` to fix the segfault.

commit 2a5724d
Author: Kevin Greene <kgreenek@gmail.com>
Date:   Wed Sep 6 16:46:35 2023 -0700

    Fix lambda capture compiler error with c++20 (#1502)

    When compiling with C++20, the following error is produced:

    ```
    upb/mini_table.hpp:63:22: note: add explicit 'this' or '*this' capture
    upb/mini_table.hpp: In lambda function:
    upb/mini_table.hpp:71:22: error: implicit capture of 'this' via '[=]' is deprecated in C++20 [-Werror=deprecated]
       71 |     return appender_([=](char* buf) {
    ```

    In C++20, it is no longer allowed to implicitly capture 'this' in a
    lambda using [=].

    This commit explicitly captures required values in the appropriate
    lambdas and removes all uses of [=] with lambdas.
```

Closes #13908

COPYBARA_INTEGRATE_REVIEW=#13908 from acozzette:upb 7afb426
PiperOrigin-RevId: 563784513
dawidcha pushed a commit to dawidcha/protobuf that referenced this pull request Sep 27, 2023
@acozzette @dawidcha
Cherry-pick recent changes from the upb repo (protocolbuffers#13908)
785c13f 
I merged a handful of PRs on the upb repo after upb moved into the protobuf repo. This PR cherry-picks them here so that they will not be lost.

```
commit 7afb426
Author: Keith Smiley <keithbsmiley@gmail.com>
Date:   Thu Sep 7 11:36:01 2023 -0700

    [bazel] Fix disallowing dylibs on darwin (protocolbuffers#1180)

    Since this bazel commit
    bazelbuild/bazel@ec55533
    building dylibs like the ones in this rule on darwin platforms has been
    unsupported. This feature is a default C++ toolchain feature to indicate
    this. In bazel 7.x these dylibs will fail to link if they are still
    built. As far as I can tell in the tests even if they are built they are
    never used on macOS.

    Co-authored-by: Adam Cozzette <acozzette@google.com>

commit 72decab
Author: Keith Smiley <keithbsmiley@gmail.com>
Date:   Thu Sep 7 09:42:20 2023 -0700

    Add missing darwin_x86_64 CPU (protocolbuffers#1181)

    This CPU is often used when cross compiling from M1 machines. I'm also
    hoping we can remove the legacy 'darwin' CPU.

commit ccadaf3
Author: messense <messense@icloud.com>
Date:   Fri Sep 8 00:28:54 2023 +0800

    Fix `PyUpb_Message_MergeInternal` segfault (protocolbuffers#1338)

    when `PyUpb_Message_MergeFromString` returns `NULL`, currently
    `PyUpb_Message_MergeInternal` will call `Py_DECREF` on `NULL`
    which results in a segmentation fault.

    This patch switches to `Py_XDECREF` to fix the segfault.

commit 2a5724d
Author: Kevin Greene <kgreenek@gmail.com>
Date:   Wed Sep 6 16:46:35 2023 -0700

    Fix lambda capture compiler error with c++20 (protocolbuffers#1502)

    When compiling with C++20, the following error is produced:

    ```
    upb/mini_table.hpp:63:22: note: add explicit 'this' or '*this' capture
    upb/mini_table.hpp: In lambda function:
    upb/mini_table.hpp:71:22: error: implicit capture of 'this' via '[=]' is deprecated in C++20 [-Werror=deprecated]
       71 |     return appender_([=](char* buf) {
    ```

    In C++20, it is no longer allowed to implicitly capture 'this' in a
    lambda using [=].

    This commit explicitly captures required values in the appropriate
    lambdas and removes all uses of [=] with lambdas.
```

Closes protocolbuffers#13908

COPYBARA_INTEGRATE_REVIEW=protocolbuffers#13908 from acozzette:upb 7afb426
PiperOrigin-RevId: 563784513
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cla: no
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@AsianDoctor @googlebot @xfxyjwf @liujisi