567c567
< AtomicOpFunctor *amo_op)
---
> AtomicOpFunctorPtr amo_op)
582c582,583
< dataMasterId(), pc, thread->contextId(), amo_op);
---
> dataMasterId(), pc, thread->contextId(),
> std::move(amo_op));