[llvm] 2a473db - [WebAssembly] Fix parsing of linking section for named global imports

[Sam Clegg via llvm-commits]

Author: Andy Wingo
Date: 2020-11-17T08:14:29-08:00
New Revision: 2a473db57391e87ac0207a92117a14b0313661f7

URL: https://github.com/llvm/llvm-project/commit/2a473db57391e87ac0207a92117a14b0313661f7
DIFF: https://github.com/llvm/llvm-project/commit/2a473db57391e87ac0207a92117a14b0313661f7.diff

LOG: [WebAssembly] Fix parsing of linking section for named global imports

Differential Revision: https://reviews.llvm.org/D91635

Added: 
    

Modified: 
    llvm/lib/Object/WasmObjectFile.cpp
    llvm/test/MC/WebAssembly/debug-info.ll
    llvm/test/MC/WebAssembly/debug-info64.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Object/WasmObjectFile.cpp b/llvm/lib/Object/WasmObjectFile.cpp
index 82aa1f527fb8..d6bb96f82cd6 100644
--- a/llvm/lib/Object/WasmObjectFile.cpp
+++ b/llvm/lib/Object/WasmObjectFile.cpp
@@ -562,7 +562,6 @@ Error WasmObjectFile::parseLinkingSectionSymtab(ReadContext &Ctx) {
           Info.Name = Import.Field;
         }
         GlobalType = &Import.Global;
-        Info.ImportName = Import.Field;
         if (!Import.Module.empty()) {
           Info.ImportModule = Import.Module;
         }

diff  --git a/llvm/test/MC/WebAssembly/debug-info.ll b/llvm/test/MC/WebAssembly/debug-info.ll
index 0277daf2bcc9..167d912c84a2 100644
--- a/llvm/test/MC/WebAssembly/debug-info.ll
+++ b/llvm/test/MC/WebAssembly/debug-info.ll
@@ -219,7 +219,6 @@
 ; CHECK-NEXT:    Flags [ (0x10)
 ; CHECK-NEXT:      UNDEFINED (0x10)
 ; CHECK-NEXT:    ]
-; CHECK-NEXT:    ImportName: __stack_pointer
 ; CHECK-NEXT:    ImportModule: env
 ; CHECK-NEXT:    ElementIndex: 0x0
 ; CHECK-NEXT:  }

diff  --git a/llvm/test/MC/WebAssembly/debug-info64.ll b/llvm/test/MC/WebAssembly/debug-info64.ll
index 48f46ee10694..acba8aa27360 100644
--- a/llvm/test/MC/WebAssembly/debug-info64.ll
+++ b/llvm/test/MC/WebAssembly/debug-info64.ll
@@ -219,7 +219,6 @@
 ; CHECK-NEXT:     Flags [ (0x10)
 ; CHECK-NEXT:       UNDEFINED (0x10)
 ; CHECK-NEXT:     ]
-; CHECK-NEXT:     ImportName: __stack_pointer
 ; CHECK-NEXT:     ImportModule: env
 ; CHECK-NEXT:     ElementIndex: 0x0
 ; CHECK-NEXT:   }