[Lldb-commits] [lldb] c65627a - Revert "[lldb] Don't send invalid region addresses to lldb server"

[David Spickett via lldb-commits]

Author: David Spickett
Date: 2020-09-17T13:07:44+01:00
New Revision: c65627a1fe3be7521fc232d633bb6df577f55269

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

LOG: Revert "[lldb] Don't send invalid region addresses to lldb server"

This reverts commit c687af0c30b4dbdc9f614d5e061c888238e0f9c5
due to a test failure on Windows.

Added: 
    

Modified: 
    lldb/source/Commands/CommandObjectMemory.cpp
    lldb/test/API/functionalities/memory-region/TestMemoryRegion.py

Removed: 
    


################################################################################
diff  --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp
index d91893799498..474c37710149 100644
--- a/lldb/source/Commands/CommandObjectMemory.cpp
+++ b/lldb/source/Commands/CommandObjectMemory.cpp
@@ -1707,7 +1707,6 @@ class CommandObjectMemoryRegion : public CommandObjectParsed {
                 "invalid address argument \"%s\": %s\n", command[0].c_str(),
                 error.AsCString());
             result.SetStatus(eReturnStatusFailed);
-            return false;
           }
         }
 

diff  --git a/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py b/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py
index 61e64d44e794..283cc945ed09 100644
--- a/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py
+++ b/lldb/test/API/functionalities/memory-region/TestMemoryRegion.py
@@ -41,12 +41,6 @@ def test(self):
         self.assertFalse(result.Succeeded())
         self.assertRegexpMatches(result.GetError(), "Usage: memory region ADDR")
 
-        # Test that when the address fails to parse, we show an error and do not continue
-        interp.HandleCommand("memory region not_an_address", result)
-        self.assertFalse(result.Succeeded())
-        self.assertEqual(result.GetError(),
-                "error: invalid address argument \"not_an_address\": address expression \"not_an_address\" evaluation failed\n")
-
         # Now let's print the memory region starting at 0 which should always work.
         interp.HandleCommand("memory region 0x0", result)
         self.assertTrue(result.Succeeded())