[PATCH] D71219: Fix conflict value for metadata "Objective-C Garbage Collection" in the mix of swift and Objective-C bitcode

[Jin Lin via Phabricator via llvm-commits]

jinlin updated this revision to Diff 249274.
jinlin marked 3 inline comments as done.

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D71219/new/

https://reviews.llvm.org/D71219

Files:
  clang/lib/CodeGen/CGObjCMac.cpp
  clang/test/CodeGenObjC/image-info.m
  llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
  llvm/lib/IR/AutoUpgrade.cpp
  llvm/test/Bitcode/upgrade-garbage-collection-for-objc.ll
  llvm/test/Bitcode/upgrade-garbage-collection-for-swift.ll
  llvm/test/Linker/Inputs/empty-objc.ll
  llvm/test/Linker/empty-swift.ll
  llvm/test/Object/objc-swift-mixed-imageinfo-macho.ll

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D71219.249274.patch
Type: text/x-patch
Size: 14523 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200310/7ae8c105/attachment.bin>