Index: test/wasm/alias.ll =================================================================== --- test/wasm/alias.ll +++ test/wasm/alias.ll @@ -55,7 +55,7 @@ ; CHECK-NEXT: Value: 1024 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: _start Index: test/wasm/call-indirect.ll =================================================================== --- test/wasm/call-indirect.ll +++ test/wasm/call-indirect.ll @@ -90,7 +90,7 @@ ; CHECK-NEXT: Value: 1036 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: bar Index: test/wasm/comdats.ll =================================================================== --- test/wasm/comdats.ll +++ test/wasm/comdats.ll @@ -36,7 +36,7 @@ ; CHECK-NEXT: Value: 1027 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: _start Index: test/wasm/entry.ll =================================================================== --- test/wasm/entry.ll +++ test/wasm/entry.ll @@ -14,7 +14,7 @@ ; CHECK: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: entry @@ -28,7 +28,7 @@ ; CHECK-CTOR: - Type: EXPORT ; CHECK-CTOR-NEXT: Exports: -; CHECK-CTOR-NEXT: - Name: memory +; CHECK-CTOR-NEXT: - Name: __linear_memory ; CHECK-CTOR-NEXT: Kind: MEMORY ; CHECK-CTOR-NEXT: Index: 0 ; CHECK-CTOR-NEXT: - Name: __wasm_call_ctors Index: test/wasm/export.ll =================================================================== --- test/wasm/export.ll +++ test/wasm/export.ll @@ -19,7 +19,7 @@ ; CHECK: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: hidden_function Index: test/wasm/import-memory.test =================================================================== --- test/wasm/import-memory.test +++ test/wasm/import-memory.test @@ -7,7 +7,7 @@ # CHECK: - Type: IMPORT # CHECK-NEXT: Imports: # CHECK-NEXT: - Module: env -# CHECK-NEXT: Field: memory +# CHECK-NEXT: Field: __linear_memory # CHECK-NEXT: Kind: MEMORY # CHECK-NEXT: Memory: # CHECK-NEXT: Initial: 0x00000002 Index: test/wasm/load-undefined.test =================================================================== --- test/wasm/load-undefined.test +++ test/wasm/load-undefined.test @@ -10,7 +10,7 @@ ; CHECK: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: _start Index: test/wasm/local-symbols.ll =================================================================== --- test/wasm/local-symbols.ll +++ test/wasm/local-symbols.ll @@ -65,7 +65,7 @@ ; CHECK-NEXT: Value: 1032 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: _start Index: test/wasm/locals-duplicate.test =================================================================== --- test/wasm/locals-duplicate.test +++ test/wasm/locals-duplicate.test @@ -50,7 +50,7 @@ ; CHECK-NEXT: Value: 1048 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: colliding_func2 Index: test/wasm/visibility-hidden.ll =================================================================== --- test/wasm/visibility-hidden.ll +++ test/wasm/visibility-hidden.ll @@ -33,7 +33,7 @@ ; CHECK: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: objectDefault Index: test/wasm/weak-alias-overide.ll =================================================================== --- test/wasm/weak-alias-overide.ll +++ test/wasm/weak-alias-overide.ll @@ -65,7 +65,7 @@ ; CHECK-NEXT: Value: 1024 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: alias_fn Index: test/wasm/weak-alias.ll =================================================================== --- test/wasm/weak-alias.ll +++ test/wasm/weak-alias.ll @@ -62,7 +62,7 @@ ; CHECK-NEXT: Value: 1024 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: _start Index: test/wasm/weak-symbols.ll =================================================================== --- test/wasm/weak-symbols.ll +++ test/wasm/weak-symbols.ll @@ -62,7 +62,7 @@ ; CHECK-NEXT: Value: 1032 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: _start Index: test/wasm/weak-undefined.ll =================================================================== --- test/wasm/weak-undefined.ll +++ test/wasm/weak-undefined.ll @@ -72,7 +72,7 @@ ; CHECK-NEXT: Value: 1024 ; CHECK-NEXT: - Type: EXPORT ; CHECK-NEXT: Exports: -; CHECK-NEXT: - Name: memory +; CHECK-NEXT: - Name: __linear_memory ; CHECK-NEXT: Kind: MEMORY ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: - Name: get_address_of_foo Index: wasm/Writer.cpp =================================================================== --- wasm/Writer.cpp +++ wasm/Writer.cpp @@ -37,6 +37,7 @@ static constexpr int kStackAlignment = 16; static constexpr int kInitialTableOffset = 1; +static const char* kLinearMemoryName = "__linear_memory"; namespace { @@ -173,7 +174,7 @@ if (Config->ImportMemory) { WasmImport Import; Import.Module = "env"; - Import.Field = "memory"; + Import.Field = kLinearMemoryName; Import.Kind = WASM_EXTERNAL_MEMORY; Import.Memory.Flags = 0; Import.Memory.Initial = NumMemoryPages; @@ -283,7 +284,7 @@ if (ExportMemory) { WasmExport MemoryExport; - MemoryExport.Name = "memory"; + MemoryExport.Name = kLinearMemoryName; MemoryExport.Kind = WASM_EXTERNAL_MEMORY; MemoryExport.Index = 0; writeExport(OS, MemoryExport);