[ntuple] Refactor TObject reading

... in preparation of RField<TObject>::ReadInCluster

Author: hahnjo

Diff for: tree/ntuple/v7/inc/ROOT/RField.hxx

@@ -473,6 +473,7 @@ protected:
    std::unique_ptr<RDeleter> GetDeleter() const final { return std::make_unique<RTypedDeleter<TObject>>(); }
 
    std::size_t AppendImpl(const void *from) final;
+   void ReadTObject(void *to, UInt_t uniqueID, UInt_t bits);
    void ReadGlobalImpl(ROOT::NTupleSize_t globalIndex, void *to) final;
 
    void AfterConnectPageSource() final;

Diff for: tree/ntuple/v7/src/RFieldMeta.cxx

@@ -971,7 +971,7 @@ std::size_t ROOT::RField<TObject>::AppendImpl(const void *from)
    return nbytes;
 }
 
-void ROOT::RField<TObject>::ReadGlobalImpl(ROOT::NTupleSize_t globalIndex, void *to)
+void ROOT::RField<TObject>::ReadTObject(void *to, UInt_t uniqueID, UInt_t bits)
 {
    // Cf. TObject::Streamer()
 
@@ -980,15 +980,21 @@ void ROOT::RField<TObject>::ReadGlobalImpl(ROOT::NTupleSize_t globalIndex, void
       throw RException(R__FAIL("RNTuple I/O on referenced TObject is unsupported"));
    }
 
-   CallReadOn(*fSubfields[0], globalIndex, static_cast<unsigned char *>(to) + GetOffsetUniqueID());
+   *reinterpret_cast<UInt_t *>(reinterpret_cast<unsigned char *>(to) + GetOffsetUniqueID()) = uniqueID;
 
    const UInt_t bitIsOnHeap = obj->TestBit(TObject::kIsOnHeap) ? TObject::kIsOnHeap : 0;
-   UInt_t bits;
-   CallReadOn(*fSubfields[1], globalIndex, &bits);
    bits |= bitIsOnHeap | TObject::kNotDeleted;
    *reinterpret_cast<UInt_t *>(reinterpret_cast<unsigned char *>(to) + GetOffsetBits()) = bits;
 }
 
+void ROOT::RField<TObject>::ReadGlobalImpl(ROOT::NTupleSize_t globalIndex, void *to)
+{
+   UInt_t uniqueID, bits;
+   CallReadOn(*fSubfields[0], globalIndex, &uniqueID);
+   CallReadOn(*fSubfields[1], globalIndex, &bits);
+   ReadTObject(to, uniqueID, bits);
+}
+
 void ROOT::RField<TObject>::AfterConnectPageSource()
 {
    if (GetOnDiskTypeVersion() != 1) {