From 6951fe3989343c6605c397ac427acea4e39d2132 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Mon, 4 May 2020 14:16:17 -0700 Subject: [PATCH] [arm64] Remove an old special case that's not needed anymore. Debug info generation & codegen now steps onto the correct line. --- .../API/functionalities/thread/step_out/TestThreadStepOut.py | 4 ++-- lldb/test/API/functionalities/thread/step_out/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py index 2d9632eb2dd6..eb2d264ec2e3 100644 --- a/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py +++ b/lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py @@ -70,9 +70,9 @@ 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() or self.getArchitecture() in ['arm64', 'arm64e']: + 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; arm64)') + '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)') diff --git a/lldb/test/API/functionalities/thread/step_out/main.cpp b/lldb/test/API/functionalities/thread/step_out/main.cpp index 76818fff925a..14d84010de8a 100644 --- a/lldb/test/API/functionalities/thread/step_out/main.cpp +++ b/lldb/test/API/functionalities/thread/step_out/main.cpp @@ -22,7 +22,7 @@ thread_func () step_out_of_here(); // Expect to stop here after step-out (clang) // Return - return NULL; // Expect to stop here after step-out (icc and gcc; arm64) + return NULL; // Expect to stop here after step-out (icc and gcc) } int main ()