[lld] r325614 - feedback

[Sam Clegg via llvm-commits]

Author: sbc
Date: Tue Feb 20 10:55:07 2018
New Revision: 325614

URL: http://llvm.org/viewvc/llvm-project?rev=325614&view=rev
Log:
feedback

Modified:
    lld/trunk/wasm/SymbolTable.cpp

Modified: lld/trunk/wasm/SymbolTable.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/SymbolTable.cpp?rev=325614&r1=325613&r2=325614&view=diff
==============================================================================
--- lld/trunk/wasm/SymbolTable.cpp (original)
+++ lld/trunk/wasm/SymbolTable.cpp Tue Feb 20 10:55:07 2018
@@ -140,14 +140,9 @@ DefinedGlobal *SymbolTable::addSynthetic
   return replaceSymbol<DefinedGlobal>(S, Name, Flags);
 }
 
-struct NewSymbol {
-  InputFile *File;
-  uint32_t Flags;
-  InputChunk *Chunk;
-  bool IsFunction;
-};
-
-static bool shouldReplace(const Symbol &Existing, const NewSymbol &New) {
+static bool shouldReplace(const Symbol &Existing, InputFile *NewFile,
+                          uint32_t NewFlags, InputChunk *NewChunk,
+                          bool NewIsFunction) {
   bool Replace = false;
   bool CheckTypes = false;
 
@@ -163,7 +158,7 @@ static bool shouldReplace(const Symbol &
                  << Existing.getName() << "\n");
     Replace = true;
     CheckTypes = true;
-  } else if ((New.Flags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_WEAK) {
+  } else if ((NewFlags & WASM_SYMBOL_BINDING_MASK) == WASM_SYMBOL_BINDING_WEAK) {
     // the new symbol is weak we can ignore it
     DEBUG(dbgs() << "existing symbol takes precedence\n");
     CheckTypes = true;
@@ -176,11 +171,11 @@ static bool shouldReplace(const Symbol &
     // neither symbol is week. They conflict.
     error("duplicate symbol: " + toString(Existing) + "\n>>> defined in " +
           toString(Existing.getFile()) + "\n>>> defined in " +
-          toString(New.File));
+          toString(NewFile));
   }
 
   if (CheckTypes)
-    checkSymbolTypes(Existing, *New.File, New.IsFunction, New.Chunk);
+    checkSymbolTypes(Existing, *NewFile, NewIsFunction, NewChunk);
 
   return Replace;
 }
@@ -191,8 +186,7 @@ Symbol *SymbolTable::addDefinedFunction(
   Symbol *S;
   bool WasInserted;
   std::tie(S, WasInserted) = insert(Name);
-  NewSymbol New{F, Flags, Function, true};
-  if (WasInserted || shouldReplace(*S, New))
+  if (WasInserted || shouldReplace(*S, F, Flags, Function, true))
     replaceSymbol<DefinedFunction>(S, Name, Flags, F, Function);
   return S;
 }
@@ -204,8 +198,7 @@ Symbol *SymbolTable::addDefinedGlobal(St
   Symbol *S;
   bool WasInserted;
   std::tie(S, WasInserted) = insert(Name);
-  NewSymbol New{F, Flags, Segment, false};
-  if (WasInserted || shouldReplace(*S, New))
+  if (WasInserted || shouldReplace(*S, F, Flags, Segment, false))
     replaceSymbol<DefinedGlobal>(S, Name, Flags, F, Segment, Address);
   return S;
 }