[PATCH] D75324: missed this part

Sam Clegg via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 27 18:26:50 PST 2020


sbc100 created this revision.
Herald added subscribers: llvm-commits, aheejin.
Herald added a project: LLVM.

Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D75324

Files:
  lld/wasm/SymbolTable.cpp


Index: lld/wasm/SymbolTable.cpp
===================================================================
--- lld/wasm/SymbolTable.cpp
+++ lld/wasm/SymbolTable.cpp
@@ -406,7 +406,7 @@
 template <typename T>
 static void setImportAttributes(T *existing, Optional<StringRef> importName,
                                 Optional<StringRef> importModule,
-                                InputFile *file) {
+                                uint32_t flags, InputFile *file) {
   if (importName) {
     if (!existing->importName)
       existing->importName = importName;
@@ -428,7 +428,7 @@
   }
 
   // Update symbol binding, if the existing symbols is weak
-  uint32_t binding = existing->flags & WASM_SYMBOL_BINDING_MASK;
+  uint32_t binding = flags & WASM_SYMBOL_BINDING_MASK;
   if (existing->isWeak() && binding != WASM_SYMBOL_BINDING_WEAK) {
     existing->flags = (existing->flags & ~WASM_SYMBOL_BINDING_MASK) | binding;
   }
@@ -480,7 +480,8 @@
         replaceSym();
     }
     if (existingUndefined)
-      setImportAttributes(existingUndefined, importName, importModule, file);
+      setImportAttributes(existingUndefined, importName, importModule, flags,
+                          file);
   }
 
   return s;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75324.247154.patch
Type: text/x-patch
Size: 1214 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200228/0fa8c3d2/attachment.bin>


More information about the llvm-commits mailing list