From 4697e701b8cb40429818609814c7422e49b2ee07 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Wed, 5 Feb 2020 15:30:11 -0800 Subject: [PATCH] Partially revert "[LLDB] Add DynamicLoaderWasmDYLD plugin for WebAssembly debugging" This temporarily and partially reverts 3ec28da6d643 because it's missing a directory. --- .../lldbsuite/test/functionalities/gdb_remote_client/TestWasm.py | 8 +++++--- lldb/source/API/SystemInitializerFull.cpp | 3 --- lldb/tools/lldb-test/SystemInitializerTest.cpp | 3 --- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestWasm.py b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestWasm.py index 38b34f6..eb136dc 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestWasm.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestWasm.py @@ -105,7 +105,6 @@ class MyResponder(MockGDBServerResponder): file.close() return result - class TestWasm(GDBRemoteTestBase): def setUp(self): @@ -116,6 +115,7 @@ class TestWasm(GDBRemoteTestBase): lldb.DBG.SetSelectedPlatform(self._initial_platform) super(TestWasm, self).tearDown() + @expectedFailureAll def test_load_module_with_embedded_symbols_from_remote(self): """Test connecting to a WebAssembly engine via GDB-remote and loading a Wasm module with embedded DWARF symbols""" @@ -158,6 +158,7 @@ class TestWasm(GDBRemoteTestBase): self.assertEquals(load_address | debug_line_section.GetFileOffset(), debug_line_section.GetLoadAddress(target)) + @expectedFailureAll def test_load_module_with_stripped_symbols_from_remote(self): """Test connecting to a WebAssembly engine via GDB-remote and loading a Wasm module with symbols stripped into a separate Wasm file""" @@ -184,7 +185,7 @@ class TestWasm(GDBRemoteTestBase): target = self.dbg.CreateTarget("") process = self.connect(target) lldbutil.expect_state_changes(self, self.dbg.GetListener(), process, [lldb.eStateStopped]) - + num_modules = target.GetNumModules() self.assertEquals(1, num_modules) @@ -213,6 +214,7 @@ class TestWasm(GDBRemoteTestBase): self.assertEquals(LLDB_INVALID_ADDRESS, debug_line_section.GetLoadAddress(target)) + @expectedFailureAll def test_load_module_from_file(self): """Test connecting to a WebAssembly engine via GDB-remote and loading a Wasm module from a file""" @@ -243,7 +245,7 @@ class TestWasm(GDBRemoteTestBase): target = self.dbg.CreateTarget("") process = self.connect(target) lldbutil.expect_state_changes(self, self.dbg.GetListener(), process, [lldb.eStateStopped]) - + num_modules = target.GetNumModules() self.assertEquals(1, num_modules) diff --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp index 4b7e333..d518c57 100644 --- a/lldb/source/API/SystemInitializerFull.cpp +++ b/lldb/source/API/SystemInitializerFull.cpp @@ -48,7 +48,6 @@ #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" #include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h" -#include "Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h" #include "Plugins/Instruction/ARM/EmulateInstructionARM.h" #include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h" #include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h" @@ -275,7 +274,6 @@ llvm::Error SystemInitializerFull::Initialize() { DynamicLoaderMacOSXDYLD::Initialize(); DynamicLoaderMacOS::Initialize(); DynamicLoaderPOSIXDYLD::Initialize(); - wasm::DynamicLoaderWasmDYLD::Initialize(); // before DynamicLoaderStatic. DynamicLoaderStatic::Initialize(); DynamicLoaderWindowsDYLD::Initialize(); @@ -364,7 +362,6 @@ void SystemInitializerFull::Terminate() { DynamicLoaderMacOSXDYLD::Terminate(); DynamicLoaderMacOS::Terminate(); DynamicLoaderPOSIXDYLD::Terminate(); - wasm::DynamicLoaderWasmDYLD::Terminate(); DynamicLoaderStatic::Terminate(); DynamicLoaderWindowsDYLD::Terminate(); diff --git a/lldb/tools/lldb-test/SystemInitializerTest.cpp b/lldb/tools/lldb-test/SystemInitializerTest.cpp index 6d50807..5cc998f 100644 --- a/lldb/tools/lldb-test/SystemInitializerTest.cpp +++ b/lldb/tools/lldb-test/SystemInitializerTest.cpp @@ -38,7 +38,6 @@ #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" #include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h" -#include "Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h" #include "Plugins/Instruction/ARM/EmulateInstructionARM.h" #include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h" #include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h" @@ -245,7 +244,6 @@ llvm::Error SystemInitializerTest::Initialize() { DynamicLoaderMacOSXDYLD::Initialize(); DynamicLoaderMacOS::Initialize(); DynamicLoaderPOSIXDYLD::Initialize(); - wasm::DynamicLoaderWasmDYLD::Initialize(); // before DynamicLoaderStatic. DynamicLoaderStatic::Initialize(); DynamicLoaderWindowsDYLD::Initialize(); @@ -334,7 +332,6 @@ void SystemInitializerTest::Terminate() { DynamicLoaderMacOSXDYLD::Terminate(); DynamicLoaderMacOS::Terminate(); DynamicLoaderPOSIXDYLD::Terminate(); - wasm::DynamicLoaderWasmDYLD::Terminate(); DynamicLoaderStatic::Terminate(); DynamicLoaderWindowsDYLD::Terminate(); -- 2.7.4