[all-commits] [llvm/llvm-project] e79d00: [MsgPack] MsgPackDocument::readFromBlob now merges

[Tim Renouf via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: e79d002309cb52b12f9bf4e205ffc9805e2223d7
      https://github.com/llvm/llvm-project/commit/e79d002309cb52b12f9bf4e205ffc9805e2223d7
  Author: Tim Renouf <tpr.ll at botech.co.uk>
  Date:   2020-05-21 (Thu, 21 May 2020)

  Changed paths:
    M llvm/include/llvm/BinaryFormat/MsgPackDocument.h
    M llvm/include/llvm/BinaryFormat/MsgPackReader.h
    M llvm/lib/BinaryFormat/MsgPackDocument.cpp
    M llvm/unittests/BinaryFormat/MsgPackDocumentTest.cpp

  Log Message:
  -----------
  [MsgPack] MsgPackDocument::readFromBlob now merges

The readFromBlob method can now be used to read MsgPack into a Document
that already contains something, merging the two. There is a new Merger
argument to readFromBlob, a callback function to resolve conflicts.

Differential Revision: https://reviews.llvm.org/D79671

Change-Id: Icf3e959217fe33cd907a41516c0386aef2847c0c