[PATCH] D43715: [WebAssembly] Simplify createLikingSection.

[Rui Ueyama via Phabricator via llvm-commits]

ruiu created this revision.
ruiu added a reviewer: sbc100.
Herald added subscribers: sunfish, aheejin, jgravelle-google, dschuff, jfb.

[WebAssembly] Simplify createLikingSection.


https://reviews.llvm.org/D43715

Files:
  lld/wasm/Writer.cpp


Index: lld/wasm/Writer.cpp
===================================================================
--- lld/wasm/Writer.cpp
+++ lld/wasm/Writer.cpp
@@ -372,6 +372,19 @@
   }
 }
 
+static uint32_t getWasmFlags(const Symbol *Sym) {
+  uint32_t Flags = 0;
+  if (Sym->isLocal())
+    Flags |= WASM_SYMBOL_BINDING_LOCAL;
+  if (Sym->isWeak())
+    Flags |= WASM_SYMBOL_BINDING_WEAK;
+  if (Sym->isHidden())
+    Flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
+  if (Sym->isUndefined())
+    Flags |= WASM_SYMBOL_UNDEFINED;
+  return Flags;
+}
+
 // Create the custom "linking" section containing linker metadata.
 // This is only created when relocatable output is requested.
 void Writer::createLinkingSection() {
@@ -393,15 +406,11 @@
     for (const Symbol *Sym : SymtabEntries) {
       assert(Sym->isDefined() || Sym->isUndefined());
       WasmSymbolType Kind = Sym->getWasmType();
-      uint32_t Flags = Sym->isLocal() ? WASM_SYMBOL_BINDING_LOCAL : 0;
-      if (Sym->isWeak())
-        Flags |= WASM_SYMBOL_BINDING_WEAK;
-      if (Sym->isHidden())
-        Flags |= WASM_SYMBOL_VISIBILITY_HIDDEN;
-      if (Sym->isUndefined())
-        Flags |= WASM_SYMBOL_UNDEFINED;
+      uint32_t Flags = getWasmFlags(Sym);
+
       writeUleb128(SubSection.getStream(), Kind, "sym kind");
       writeUleb128(SubSection.getStream(), Flags, "sym flags");
+
       switch (Kind) {
       case llvm::wasm::WASM_SYMBOL_TYPE_FUNCTION:
       case llvm::wasm::WASM_SYMBOL_TYPE_GLOBAL:
@@ -421,6 +430,7 @@
         break;
       }
     }
+
     SubSection.finalizeContents();
     SubSection.writeToStream(OS);
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43715.135773.patch
Type: text/x-patch
Size: 1591 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180224/b6320a35/attachment.bin>