279 bug in move assignment of matrices

include/graphblas/bsp1d/io.hpp

@@ -1494,7 +1494,7 @@ namespace grb {
 			for( fwd_iterator it = start; it != end; ++it ) {
 #ifdef _BSP1D_IO_DEBUG
 				std::cout << "\t\t\t process " << data.s << " caches nonzero at "
-					<< *it << "\n";
+					<< start.i() << ", " << start.j() << "\n";
 #endif
 				// sanity check on input
 				if( utils::check_input_coordinates( it, rows, cols ) != SUCCESS ) {

include/graphblas/bsp1d/matrix.hpp

@@ -353,6 +353,9 @@ namespace grb {
 
 			/** Implements move constructor and assign-from-temporary. */
 			void moveFromOther( self_type &&other ) {
+				// make sure we had no pointer and (thus) no ID
+				assert( _ptr == nullptr );
+
 				// copy fields
 				_id = other._id;
 				_ptr = other._ptr;
@@ -507,8 +510,8 @@ namespace grb {
 					<< "\t ID is " << _id << "\n";
 #endif
 				if( _m > 0 && _n > 0 ) {
-#ifdef _DEBUG
-					std::cerr << "\t removing ID...\n";
+#ifdef _DEBUG_BSP1D_MATRIX
+					std::cerr << "\t matrix destructor: removing ID...\n";
 #endif
 					assert( _ptr != nullptr );
 					auto &data = internal::grb_BSP1D.load();
@@ -521,6 +524,17 @@ namespace grb {
 
 			/** Assign-from-temporary. */
 			self_type& operator=( self_type &&other ) noexcept {
+				if( _m > 0 && _n > 0 ) {
+#ifdef _DEBUG_BSP1D_MATRIX
+					std::cerr << "\t move-assignment: removing ID...\n";
+#endif
+					assert( _ptr != nullptr );
+					auto &data = internal::grb_BSP1D.load();
+					assert( _id != std::numeric_limits< uintptr_t >::max() );
+					data.mapper.remove( _id );
+					delete [] _ptr;
+					_ptr = nullptr;
+				}
 				moveFromOther( std::forward< self_type >(other) );
 				return *this;
 			}

include/graphblas/bsp1d/vector.hpp

@@ -881,7 +881,7 @@ namespace grb {
 		RC dense_synchronize(
 			internal::Coordinates< _GRB_BSP1D_BACKEND > &global_coordinates
 		) const {
-#ifndef NDEBUG
+#if !defined NDEBUG || defined _DEBUG
 			const auto &data = internal::grb_BSP1D.cload();
 #endif
 			assert( data.P > 1 );
@@ -923,7 +923,7 @@ namespace grb {
 		RC array_synchronize(
 			internal::Coordinates< _GRB_BSP1D_BACKEND > &global_coordinates
 		) const {
-#ifndef NDEBUG
+#if !defined NDEBUG || defined _DEBUG
 			const auto &data = internal::grb_BSP1D.cload();
 #endif
 			assert( data.P > 1 );