[all-commits] [llvm/llvm-project] a0cacb: Fix conflict value for metadata "Objective-C Garba...

[jinlin-bayarea via All-commits]

  Branch: refs/heads/master
  Home:   https://github.com/llvm/llvm-project
  Commit: a0cacb60549f2346f7addf9205cd32720afc8fb4
      https://github.com/llvm/llvm-project/commit/a0cacb60549f2346f7addf9205cd32720afc8fb4
  Author: Jin Lin <jinl at uber.com>
  Date:   2020-03-11 (Wed, 11 Mar 2020)

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

  Log Message:
  -----------
  Fix conflict value for metadata "Objective-C Garbage Collection" in the mix of swift and Objective-C bitcode

Summary:
The change is to fix conflict value for metadata "Objective-C Garbage Collection" in the mix of swift and Objective-C bitcode.
The purpose is to provide the support of LTO for swift and Objective-C mixed project.

Reviewers: rjmccall, ahatanak, steven_wu

Reviewed By: rjmccall, steven_wu

Subscribers: manmanren, mehdi_amini, hiraditya, dexonsmith, llvm-commits, jinlin

Tags: #llvm

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