[WebAssembly] Fixed LLD generation of 64-bit __wasm_apply_data_relocs

[sbc100]

lld/wasm/SyntheticSections.cpp

185

Elsewhere in the code I see this pattern:

wasmGlobal.Type = {uint8_t(is64 ? WASM_TYPE_I64 : WASM_TYPE_I32), isMutable};

Can we declare a function-scope is64 and use it like this? (especially since config->is64.getValueOr(false) is also used above in this function)

[aardappel]

factored out repeating use of is64

lld/test/wasm/shared64.s

 .section .data.data,"",@
 data:
   .p2align 2
   .int32 2
   .size data, 4
 
 .section .data.indirect_func_external,"",@
 indirect_func_external:
-  .int32 func_external
-.size indirect_func_external, 4
+  .int64 func_external
+.size indirect_func_external, 8
 
 .section .data.indirect_func,"",@
 indirect_func:
-  .int32 foo
-  .size indirect_func, 4
+  .int64 foo
+  .size indirect_func, 8
 
 # Test data relocations
 
 .section .data.data_addr,"",@
 data_addr:
   .int32 data
   .size data_addr, 4
 
foo:
   local.tee 0
   global.set  __stack_pointer
   global.get  __memory_base
   i64.const data@MBREL
   i64.add
   i32.load  0
   local.set 1
   global.get  indirect_func@GOT
-  i32.load  0
+  i64.load  0
+  i32.wrap_i64
   call_indirect  () -> (i32)
   drop
   local.get 0
   i64.const 16
   i64.add
   global.set  __stack_pointer
   local.get 1
   end_function

 .int8 15
 .ascii "mutable-globals"
 
 # check for dylink section at start
 
 # CHECK:      Sections:
 # CHECK-NEXT:   - Type:            CUSTOM
 # CHECK-NEXT:     Name:            dylink
-# CHECK-NEXT:     MemorySize:      28
+# CHECK-NEXT:     MemorySize:      36
 # CHECK-NEXT:     MemoryAlignment: 2
 # CHECK-NEXT:     TableSize:       2
 # CHECK-NEXT:     TableAlignment:  0
 # CHECK-NEXT:     Needed:          []
 # CHECK-NEXT:   - Type:            TYPE
 
 # check for import of __table_base and __memory_base globals
 

 # CHECK-NEXT:         GlobalMutable:   false
 # CHECK-NEXT:       - Module:          env
 # CHECK-NEXT:         Field:           func_external
 # CHECK-NEXT:         Kind:            FUNCTION
 # CHECK-NEXT:         SigIndex:        1
 # CHECK-NEXT:       - Module:          GOT.mem
 # CHECK-NEXT:         Field:           indirect_func
 # CHECK-NEXT:         Kind:            GLOBAL
-# CHECK-NEXT:         GlobalType:      I32
+# CHECK-NEXT:         GlobalType:      I64
 # CHECK-NEXT:         GlobalMutable:   true
 # CHECK-NEXT:       - Module:          GOT.func
 # CHECK-NEXT:         Field:           func_external
 # CHECK-NEXT:         Kind:            GLOBAL
-# CHECK-NEXT:         GlobalType:      I32
+# CHECK-NEXT:         GlobalType:      I64
 # CHECK-NEXT:         GlobalMutable:   true
 # CHECK-NEXT:       - Module:          GOT.mem
 # CHECK-NEXT:         Field:           data_external
 # CHECK-NEXT:         Kind:            GLOBAL
-# CHECK-NEXT:         GlobalType:      I32
+# CHECK-NEXT:         GlobalType:      I64
 # CHECK-NEXT:         GlobalMutable:   true
 # CHECK-NEXT:       - Module:          GOT.mem
 # CHECK-NEXT:         Field:           extern_struct
 # CHECK-NEXT:         Kind:            GLOBAL
-# CHECK-NEXT:         GlobalType:      I32
+# CHECK-NEXT:         GlobalType:      I64
 # CHECK-NEXT:         GlobalMutable:   true
 # CHECK-NEXT:   - Type:            FUNCTION
 
 # CHECK:        - Type:            EXPORT
 # CHECK-NEXT:     Exports:
 # CHECK-NEXT:       - Name:            __wasm_call_ctors
 # CHECK-NEXT:         Kind:            FUNCTION
 # CHECK-NEXT:         Index:           1

 
 # CHECK:        - Type:            CODE
 # CHECK-NEXT:     Functions:
 # CHECK-NEXT:       - Index:           1
 # CHECK-NEXT:         Locals:          []
 # CHECK-NEXT:         Body:            10020B
 # CHECK-NEXT:       - Index:           2
 # CHECK-NEXT:         Locals:          []
-# CHECK-NEXT:         Body:            230142047C2305360200230142087C230241016A3602002301420C7C230141006A360200230142107C2306370200230142187C230741046A3602000B
+# CHECK-NEXT:         Body:            230142047C23053702002301420C7C230242017C370200230142147C230141006A360200230142187C2306370200230142207C230741046A3602000B
 
 # check the data segment initialized with __memory_base global as offset
 
 # CHECK:        - Type:            DATA
 # CHECK-NEXT:     Segments:
 # CHECK-NEXT:       - SectionOffset:   6
 # CHECK-NEXT:         InitFlags:       0
 # CHECK-NEXT:         Offset:
 # CHECK-NEXT:           Opcode:          GLOBAL_GET
 # CHECK-NEXT:           Index:           1
-# CHECK-NEXT:         Content:         '02000000000000000100000000000000000000000000000000000000'
+# CHECK-NEXT:         Content:         '020000000000000000000000010000000000000000000000000000000000000000000000'

lld/wasm/InputChunks.cpp

 }
 
 bool relocIs64(uint8_t relocType) {
   switch (relocType) {
   case R_WASM_MEMORY_ADDR_LEB64:
   case R_WASM_MEMORY_ADDR_SLEB64:
   case R_WASM_MEMORY_ADDR_REL_SLEB64:
   case R_WASM_MEMORY_ADDR_I64:
+  case R_WASM_TABLE_INDEX_SLEB64:
+  case R_WASM_TABLE_INDEX_I64:
+  case R_WASM_FUNCTION_OFFSET_I64:
+  case R_WASM_TABLE_INDEX_REL_SLEB64:
     return true;
   default:
     return false;
   }
 }
 
 std::string toString(const wasm::InputChunk *c) {
   return (toString(c->file) + ":(" + c->getName() + ")").str();

lld/wasm/SyntheticSections.cpp

if (auto *functionSym = dyn_cast<FunctionSymbol>(sym)) {
       import.Table = *tableSym->getTableType();
     }
     writeImport(os, import);
   }
 
   for (const Symbol *sym : gotSymbols) {
     WasmImport import;
     import.Kind = WASM_EXTERNAL_GLOBAL;
-    import.Global = {WASM_TYPE_I32, true};
+    auto ptrType =
+        config->is64.getValueOr(false) ? WASM_TYPE_I64 : WASM_TYPE_I32;
+    import.Global = { static_cast<uint8_t>(ptrType), true};
     if (isa<DataSymbol>(sym))
       import.Module = "GOT.mem";
     else
       import.Module = "GOT.func";
     import.Field = sym->getName();
     writeImport(os, import);
   }
 }