[PATCH] D70834: [llvm] llvm-ifs: Support for handling empty IFS and merging weak+strong symbols.

[Puyan Lotfi via Phabricator via llvm-commits]

plotfi marked an inline comment as done.
plotfi added inline comments.


================
Comment at: llvm/tools/llvm-ifs/llvm-ifs.cpp:501
       }
-      if (Symbol.Weak != SI->second.Weak) {
-        // TODO: Add conflict resolution for Weak vs non-Weak.
-        WithColor::error() << "Interface Stub: Weak Mismatch for "
-                           << Symbol.Name << ".\nFilename: " << InputFilePath
-                           << "\nWeak Values: " << SI->second.Weak << " "
-                           << Symbol.Weak << "\n";
-
-        return -1;
+       if (Symbol.Weak != SI->second.Weak) {
+        Symbol.Weak = false;
----------------
plotfi wrote:
> compnerd wrote:
> > Indentation seems off?   Does this ensure that the rest of the symbol is identical?  What happens if one of the size is different?
> Yeah I realized this and changed it locally. 
The Type and Size checks are above before the Weak/Strong check. So yes they will be identical. I should add a test case though that exercises this. 


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D70834