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

fix unsafe use of os_unfair_lock #14548

Closed
wants to merge 3 commits into from
Closed

fix unsafe use of os_unfair_lock #14548

wants to merge 3 commits into from

Conversation

morganchen12
Copy link
Contributor

See the docs for OSAllocatedUnsafeLock for details.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Hello @morganchen12, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

Summary of Changes

This pull request addresses an unsafe use of os_unfair_lock by replacing it with OSAllocatedUnfairLock. This change is applied across multiple files in the Firebase codebase, specifically in AuthComponent.swift, Functions.swift, Storage.swift, and VertexAI.swift. The core of the change involves replacing the initialization and usage of os_unfair_lock with OSAllocatedUnfairLock to ensure proper memory management and avoid potential issues related to lock lifecycle.

Highlights

  • Locking Mechanism Update: The os_unfair_lock is replaced with OSAllocatedUnfairLock for safer lock management.
  • Concurrency Safety: This change enhances concurrency safety by ensuring proper allocation and deallocation of the lock.
  • Code Modernization: The code is updated to use a more modern and safer approach to managing unfair locks in Swift.

Changelog

Click here to see the changelog
  • FirebaseAuth/Sources/Swift/Auth/AuthComponent.swift
    • Replaced os_unfair_lock with OSAllocatedUnfairLock for the instancesLock property (line 36).
    • Updated the auth() function to use instancesLock.lock() and instancesLock.unlock() instead of os_unfair_lock_lock and os_unfair_lock_unlock (lines 61 and 64).
  • FirebaseFunctions/Sources/Functions.swift
    • Replaced os_unfair_lock with OSAllocatedUnfairLock for the instancesLock property (line 59).
    • Updated the function to use instancesLock.lock() and instancesLock.unlock() instead of os_unfair_lock_lock and os_unfair_lock_unlock (lines 307 and 310).
  • FirebaseStorage/Sources/Storage.swift
    • Replaced os_unfair_lock with OSAllocatedUnfairLock for the instancesLock property (line 252).
    • Updated the storage() function to use instancesLock.lock() and instancesLock.unlock() instead of os_unfair_lock_lock and os_unfair_lock_unlock (lines 257 and 258).
  • FirebaseVertexAI/Sources/VertexAI.swift
    • Moved the declaration of instancesLock above the #if compiler(>=6) block (line 128).
    • Replaced os_unfair_lock with OSAllocatedUnfairLock for the instancesLock property (line 128).
    • Removed the duplicate instancesLock declaration inside the #else block (line 140).
    • Updated the function to use instancesLock.lock() and instancesLock.unlock() instead of os_unfair_lock_lock and os_unfair_lock_unlock (lines 149 and 152).
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.


Trivia time!

In what year was the first version of Swift released?

Click here for the answer
Swift was first released by Apple in 2014.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request addresses an unsafe use of os_unfair_lock by replacing it with OSAllocatedUnfairLock. This is a good change as it aligns with Apple's recommendations for using unfair locks. The changes are straightforward and seem correct.

Summary of Findings

  • Potential typo in FirebaseStorage: There might be a typo in FirebaseStorage/Sources/Storage.swift where OSAllocatedUnfairLock is used without parentheses, potentially instantiating the type instead of creating an instance. This could lead to unexpected behavior.

Merge Readiness

The pull request is generally well-implemented and addresses an important issue. However, the potential typo in FirebaseStorage/Sources/Storage.swift should be investigated and corrected before merging. I am unable to approve this pull request, and recommend that others review and approve this code before merging. Given the potential for a critical issue, I recommend that the pull request not be merged until this is addressed.

morganchen12 and others added 2 commits March 7, 2025 16:21
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
@morganchen12
Copy link
Contributor Author

Commented on the internal gemini bug for the CLA check. Presumably we can manually add the cla: yes tag to work around it for now.

Copy link

Thanks for flagging this, @morganchen12. It's good to know there's a workaround for the CLA check while the internal bug is being addressed.

@morganchen12
Copy link
Contributor Author

Looks like we can't merge this until we raise our platform floor to iOS 16, since otherwise OSAllocatedUnfairLock is unavailable (see Auth quickstart test failure).

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.

2 participants