Destroy the interpreters when they are owned. #610
Merged
+54
−25
Conversation
This file contains hidden or 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #610 +/- ##
==========================================
+ Coverage 77.48% 77.58% +0.09%
==========================================
Files 9 9
Lines 3713 3734 +21
==========================================
+ Hits 2877 2897 +20
- Misses 836 837 +1
🚀 New features to boost your workflow:
|
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| static llvm::SmallVector<InterpreterInfo, 8> sInterpreters; | ||
|
|
||
| // std::deque avoids relocations and calling the dtor of InterpreterInfo. | ||
| static llvm::ManagedStatic<std::deque<InterpreterInfo>> sInterpreters; |
There was a problem hiding this comment.
warning: variable 'sInterpreters' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]
static llvm::ManagedStatic<std::deque<InterpreterInfo>> sInterpreters;
^
lib/CppInterOp/CppInterOp.cpp
Outdated
| assert(sInterpreters.empty() && "sInterpreter already in use!"); | ||
| sInterpreters.push_back( | ||
| assert(sInterpreters->empty() && "sInterpreter already in use!"); | ||
| sInterpreters->push_back( | ||
| {static_cast<compat::Interpreter*>(I), /*isOwned=*/false}); |
There was a problem hiding this comment.
warning: argument name 'isOwned' in comment does not match parameter name 'O' [bugprone-argument-comment]
{static_cast<compat::Interpreter*>(I), /*isOwned=*/false});
^Additional context
lib/CppInterOp/CppInterOp.cpp:88: 'O' declared here
InterpreterInfo(compat::Interpreter* I, bool O)
^
lib/CppInterOp/CppInterOp.cpp
Outdated
| assert(sInterpreters.empty() && "sInterpreter already in use!"); | ||
| sInterpreters.push_back( | ||
| assert(sInterpreters->empty() && "sInterpreter already in use!"); | ||
| sInterpreters->push_back( | ||
| {static_cast<compat::Interpreter*>(I), /*isOwned=*/false}); |
There was a problem hiding this comment.
warning: use emplace_back instead of push_back [modernize-use-emplace]
Suggested change
| {static_cast<compat::Interpreter*>(I), /*isOwned=*/false}); | |
| sInterpreters->emplace_back(static_cast<compat::Interpreter*>(I), /*isOwned=*/false); |
There was a problem hiding this comment.
Maybe worth looking at this.
Vipul-Cariappa
approved these changes
Jun 2, 2025
lib/CppInterOp/CppInterOp.cpp
Outdated
| assert(sInterpreters.empty() && "sInterpreter already in use!"); | ||
| sInterpreters.push_back( | ||
| assert(sInterpreters->empty() && "sInterpreter already in use!"); | ||
| sInterpreters->push_back( | ||
| {static_cast<compat::Interpreter*>(I), /*isOwned=*/false}); |
There was a problem hiding this comment.
Maybe worth looking at this.
This should fix a longstanding issue with resource deallocation in CppInterOp.
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.
This should fix a longstanding issue with resource deallocation in CppInterOp.