Commit ed2853d2 authored by Raphael Isemann's avatar Raphael Isemann
Browse files

Reland [lldb] Fix TestThreadStepOut.py after "Flush local value map on every instruction" 

The original patch got reverted as a dependency of cf1c774d .
That patch got relanded so it's also necessary to reland this patch.

Original summary:

After cf1c774d, Clang seems to generate code
that is more similar to icc/Clang, so we can use the same line numbers for
all compilers in this test.
parent 060b51e0

lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py

+2 −6
Original line number Diff line number Diff line
@@ -70,12 +70,8 @@ class ThreadStepOutTestCase(TestBase): 
        self.bkpt_string = '// Set breakpoint here'

        self.breakpoint = line_number('main.cpp', self.bkpt_string)       



        if "gcc" in self.getCompiler() or self.isIntelCompiler():

        self.step_out_destination = line_number(

                'main.cpp', '// Expect to stop here after step-out (icc and gcc)')

        else:

            self.step_out_destination = line_number(

                'main.cpp', '// Expect to stop here after step-out (clang)')

             'main.cpp', '// Expect to stop here after step-out.')



    def step_out_single_thread_with_cmd(self):

        self.step_out_with_cmd("this-thread")

lldb/test/API/functionalities/thread/step_out/main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ thread_func () 
    pseudo_barrier_wait(g_barrier);



    // Do something

    step_out_of_here(); // Expect to stop here after step-out (clang)

    step_out_of_here();



    // Return

    return NULL;  // Expect to stop here after step-out (icc and gcc)

    return NULL;  // Expect to stop here after step-out.

}



int main ()