Merge pull request #1614 from evoskuil/master

Be consistent with INPLACE usage, use ceilinged_add, comments, style.

Author: evoskuil

include/bitcoin/system/allocator.hpp

@@ -136,8 +136,6 @@ class allocator
     /// -----------------------------------------------------------------------
     /// These neither allocate nor deallocate.
 
-    // Clang is not yet C++20 compliant in terms of aggregate initialization.
-    // See [reviews.llvm.org/D140327] for details, resolved in future releases.
     template <class Type, class ...Args>
     void construct(Type* ptr, Args&&... arguments) THROWS
     {

include/bitcoin/system/chain/witness.hpp

@@ -131,12 +131,11 @@ class BC_API witness
     BC_PUSH_WARNING(SMART_PTR_NOT_NEEDED)
     BC_PUSH_WARNING(NO_VALUE_OR_CONST_REF_SHARED_PTR)
     static size_t serialized_size(const chunk_cptrs& stack) NOEXCEPT;
-    static inline size_t element_size(size_t total,
-        const chunk_cptr& element) NOEXCEPT
+    static inline size_t element_size(const chunk_cptr& element) NOEXCEPT
     {
         // Each witness is prefixed with number of elements (bip144).
         const auto size = element->size();
-        return total + variable_size(size) + size;
+        return ceilinged_add(variable_size(size), size);
     };
     BC_POP_WARNING()
     BC_POP_WARNING()

src/chain/operation.cpp

@@ -236,7 +236,7 @@ void operation::assign_data(reader& source) NOEXCEPT
         source.set_position(start);
 
         // An invalid source.read_bytes_raw returns nullptr.
-        data_.reset(POINTER(data_chunk, allocator, source.read_bytes_raw()));
+        INPLACE(&data_, data_chunk, allocator, source.read_bytes_raw());
     }
 
     // All byte vectors are deserializable, stream indicates own failure.

src/chain/witness.cpp

@@ -183,7 +183,7 @@ void witness::assign_data(reader& source, bool prefix) NOEXCEPT
                 break;
 
             stack_.emplace_back(POINTER(data_chunk, allocator, bytes));
-            size_ = element_size(size_, stack_.back());
+            size_ = ceilinged_add(size_, element_size(stack_.back()));
         }
     }
     else
@@ -197,7 +197,7 @@ void witness::assign_data(reader& source, bool prefix) NOEXCEPT
                 break;
 
             stack_.emplace_back(POINTER(data_chunk, allocator, bytes));
-            size_ = element_size(size_, stack_.back());
+            size_ = ceilinged_add(size_, element_size(stack_.back()));
         }
     }
 
@@ -300,15 +300,19 @@ const chunk_cptrs& witness::stack() const NOEXCEPT
 // static/private
 size_t witness::serialized_size(const chunk_cptrs& stack) NOEXCEPT
 {
-    return std::accumulate(stack.begin(), stack.end(), zero, element_size);
+    return std::accumulate(stack.begin(), stack.end(), zero,
+        [](size_t total, const chunk_cptr& element) NOEXCEPT
+        {
+            return ceilinged_add(total, element_size(element));
+        });
 }
 
 size_t witness::serialized_size(bool prefix) const NOEXCEPT
 {
     // Witness prefix is an element count, not byte length (unlike script).
     // An empty stack is not a valid witnessed tx (no inputs) but a consistent
     // serialization is used independently by database so zero stack allowed.
-    return prefix ? ceilinged_add(size_, variable_size(stack_.size())) : size_;
+    return prefix ? ceilinged_add(variable_size(stack_.size()), size_) : size_;
 }
 
 // Utilities.