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

[John McCall via Phabricator via llvm-commits]

rjmccall added a comment.

Tests look good, thanks.  A couple little things remaining, but feel free to commit after you fix them.



================
Comment at: clang/lib/CodeGen/CGObjCMac.cpp:5166
+    // the value should be i8 instead of i32. The type of the module
+    // flag should be Error.
+    Mod.addModuleFlag(llvm::Module::Error,
----------------
I also meant this comment.


================
Comment at: llvm/lib/IR/AutoUpgrade.cpp:4067
+      if (Md) {
+
+        assert(Md->getValue() && "Expected non-empty metadata");
----------------
Spurious newline


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

https://reviews.llvm.org/D71219