[LLDB][MIPS] Fix TestMiExec.py failure

[nitesh.jain]

Summary

Call to s_MyFunction may not follow immediately after g_MyFunction. There might be some instructions in between to restore caller-saved registers. We need to get past these instructions with a step to reach call to s_MyFunction.

[labath]

sounds reasonable

[ki.stfu]

Thanks for catching this! Could you update this CL to let me commit it?

packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

287–289

Remove this.

306–313

Please do like this.

325–336

it = self.expect(["\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"30\"",
                  "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"29\""])
if it == 1:
    # Call to s_MyFunction may not follow immediately after g_MyFunction.  There might be
    # some instructions in between to restore caller-saved registers.   
    self.runCmd("-exec-step")
    self.expect("\^running")
    self.expect(
        "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"30\"")

packages/Python/lldbsuite/test/tools/lldb-mi/control/main.cpp

29–30

Revert this

[nitesh.jain]

Update diff as per suggestion.

[nitesh.jain]

In D32340#733387, @ki.stfu wrote:

Thanks for catching this! Could you update this CL to let me commit it?

Yes , Please commit it.

Thanks

[ki.stfu]

lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

329 ↗

(On Diff #96890)

I mistyped there should be -exec-next,, and why you are not checking that it has stopped at the right line (as I suggested)?

[nitesh.jain]

lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

329 ↗

(On Diff #96890)

ohh. i just forgot to do that . I will update it

[nitesh.jain]

Hi Ki,

The changes has been committed (rL301537).

Thanks

packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py

def test_lldbmi_exec_step(self):
         """Test that 'lldb-mi --interpreter' works for stepping into."""
 
         self.spawnLldbMi(args=None)
 
         # Load executable
         self.runCmd("-file-exec-and-symbols %s" % self.myexe)
         self.expect("\^done")
 
+        self.g_MyFunction_line_no = line_number('main.cpp', "function_line_1")
+        self.s_MyFunction_line_no = line_number('main.cpp', "function_line_2")
+
         # Run to main
         self.runCmd("-break-insert -f main")
         self.expect("\^done,bkpt={number=\"1\"")
         self.runCmd("-exec-run")
         self.expect("\^running")
         self.expect("\*stopped,reason=\"breakpoint-hit\"")
 
         # Warning: the following is sensitive to the lines in the source
 
         # Test that -exec-step steps into (or not) printf depending on debug info
         # Note that message is different in Darwin and Linux:
         # Darwin: "*stopped,reason=\"end-stepping-range\",frame={addr=\"0x[0-9a-f]+\",func=\"main\",args=[{name=\"argc\",value=\"1\"},{name=\"argv\",value="0x[0-9a-f]+\"}],file=\"main.cpp\",fullname=\".+main.cpp\",line=\"\d\"},thread-id=\"1\",stopped-threads=\"all\"
         # Linux:
         # "*stopped,reason=\"end-stepping-range\",frame={addr="0x[0-9a-f]+\",func=\"__printf\",args=[{name=\"format\",value=\"0x[0-9a-f]+\"}],file=\"printf.c\",fullname=\".+printf.c\",line="\d+"},thread-id=\"1\",stopped-threads=\"all\"
         self.runCmd("-exec-step --thread 1 --frame 0")
         self.expect("\^running")
         it = self.expect(["\*stopped,reason=\"end-stepping-range\".+?func=\"main\"",
                           "\*stopped,reason=\"end-stepping-range\".+?func=\"(?!main).+?\""])
         # Exit from printf if needed
         if it == 1:
             self.runCmd("-exec-finish")
             self.expect("\^running")
             self.expect(
                 "\*stopped,reason=\"end-stepping-range\".+?func=\"main\"")
 
         # Test that -exec-step steps into g_MyFunction and back out
         # (and that --thread is optional)
         self.runCmd("-exec-step --frame 0")
         self.expect("\^running")
         self.expect(
             "\*stopped,reason=\"end-stepping-range\".+?func=\"g_MyFunction.*?\"")
         # Use -exec-finish here to make sure that control reaches the caller.
         # -exec-step can keep us in the g_MyFunction for gcc
         self.runCmd("-exec-finish --frame 0")
         self.expect("\^running")
         self.expect(
-            "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"30\"")
+            "\*stopped,reason=\"end-stepping-range\".+?main\.cpp\",line=\"(30|29)\"")
+
+        finish_status = self.child.after
+        string_to_match = 'line="{0}"'.format(self.g_MyFunction_line_no)
+
+        # Call to s_MyFunction may not follow immediately after g_MyFunction.
+        # There might be some instructions in between to restore caller-saved registers.
+        # We need to get past these instructions with a step to reach call to s_MyFunction.
+
+        if (finish_status.find(string_to_match) >= 0):
+            self.runCmd("-exec-step --thread 1")
 
         # Test that -exec-step steps into s_MyFunction
         # (and that --frame is optional)
         self.runCmd("-exec-step --thread 1")
         self.expect("\^running")
         self.expect(
             "\*stopped,reason=\"end-stepping-range\".+?func=\".*?s_MyFunction.*?\"")
 

packages/Python/lldbsuite/test/tools/lldb-mi/control/main.cpp

s_MyFunction(void)
     g_MyFunction();
     printf("s_MyFunction");
 }
 
 int
 main(int argc, char const *argv[])
 {
     printf("start");
-    g_MyFunction();
-    s_MyFunction();
+    g_MyFunction(); // function_line_1
+    s_MyFunction(); // function_line_2
     printf("exit");
     return 0;
 }