Skip to content

Commit 70d919c

Browse files
committed
[df] Avoid calling JIT again in RDataFrame destructor
This was done to workaround #15399, but now that the controlled leaks have been removed it is not necessary anymore.
1 parent 6829118 commit 70d919c

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

tree/dataframe/inc/ROOT/RDataFrame.hxx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ public:
5555
RDataFrame(ULong64_t numEntries);
5656
RDataFrame(std::unique_ptr<ROOT::RDF::RDataSource>, const ColumnNames_t &defaultColumns = {});
5757
RDataFrame(ROOT::RDF::Experimental::RDatasetSpec spec);
58-
59-
// Rule of five
60-
61-
RDataFrame(const RDataFrame &) = default;
62-
RDataFrame &operator=(const RDataFrame &) = default;
63-
RDataFrame(RDataFrame &&) = default;
64-
RDataFrame &operator=(RDataFrame &&) = default;
65-
~RDataFrame();
6658
};
6759

6860
namespace RDF {

tree/dataframe/src/RDataFrame.cxx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2226,17 +2226,6 @@ RDataFrame::RDataFrame(ROOT::RDF::Experimental::RDatasetSpec spec)
22262226
{
22272227
}
22282228

2229-
RDataFrame::~RDataFrame()
2230-
{
2231-
// If any node of the computation graph associated with this RDataFrame
2232-
// declared code to jit, we need to make sure the compilation actually
2233-
// happens. For example, a jitted Define could have been booked but
2234-
// if the computation graph is not actually run then the code of the
2235-
// Define node is not jitted. This in turn would cause memory leaks.
2236-
// See https://github.com/root-project/root/issues/15399
2237-
fLoopManager->Jit();
2238-
}
2239-
22402229
namespace RDF {
22412230
namespace Experimental {
22422231

0 commit comments

Comments
 (0)