This is an archive of the discontinued LLVM Phabricator instance.

Differential D71797

Fix thread-step-out-ret-addr-check.test PT_GNU_STACK compilation on Windows
AbandonedPublic

Authored by jankratochvil on Dec 21 2019, 4:21 AM.

Details

Reviewers
stella.stamenova
mossberg
labath
Summary

D71784 broke Windows: http://lab.llvm.org:8011/builders/lldb-x64-windows-ninja/builds/11924/steps/test/logs/stdio

E:\build_slave\lldb-x64-windows-ninja\llvm-project\lldb\test\Shell\Unwind/Inputs/thread-step-out-ret-addr-check.s:23:27: error: unexpected token in directive
        .section .note.GNU-stack,"",@progbits
                          ^

Is this patch OK? I am not sure about the backquotes, grep etc. how it can work on Windows. The only other idea I have is to use Python test for it. Or give up on the stack and create some non-executable data section like D71789.

Diff Detail

Event Timeline

jankratochvil created this revision.Dec 21 2019, 4:21 AM
Herald added a subscriber: krytarowski. · View Herald TranscriptDec 21 2019, 4:21 AM
jankratochvil marked an inline comment as done.Dec 21 2019, 4:22 AM
jankratochvil added inline comments.
lldb/test/Shell/Unwind/Inputs/thread-step-out-ret-addr-check.s
22

That was apparently a comment now. And OSX does not mind this section.

labath added a comment.Dec 21 2019, 4:28 AM

I already fixed the compilation error in rGce3ce9f, but it does not seem to be enough.. I guess the test will need to be re-disabled on windows. (My vague knowledge of windows tells me that the nonstandard_stub symbol might not make it into the final executable.)

jankratochvil abandoned this revision.Dec 21 2019, 4:36 AM

This has been already fixed by @labath: https://github.com/llvm/llvm-project/commit/ce3ce9f46404688cc2d95f794799c8f834630905

Revision Contents

PathSize
lldb/
test/
Shell/
Unwind/
Inputs/
4 lines
3 lines

Diff 235013

lldb/test/Shell/Unwind/Inputs/thread-step-out-ret-addr-check.s

Show All 13 Linesnonstandard_stub:
mov (%rsp), %rdi mov (%rsp), %rdi
mov (%rdi), %rsi mov (%rdi), %rsi
add $1, %rsi add $1, %rsi
mov %rsi, (%rdi) mov %rsi, (%rdi)
add $0x10, %rsp add $0x10, %rsp
ret ret
#ifdef __linux__ .ifdef LINUX
jankratochvilAuthorUnsubmitted
Done
ReplyInline Actions

That was apparently a comment now. And OSX does not mind this section.

jankratochvil: That was apparently a comment now. And OSX does not mind this section.
.section .note.GNU-stack,"",@progbits .section .note.GNU-stack,"",@progbits
#endif .endif

lldb/test/Shell/Unwind/thread-step-out-ret-addr-check.test

# Test that `thread step-out` fails when the "return address" # Test that `thread step-out` fails when the "return address"
# points to non-executable memory. # points to non-executable memory.
# REQUIRES: target-x86_64 # REQUIRES: target-x86_64
# RUN: %clang_host %p/Inputs/call-asm.c %p/Inputs/thread-step-out-ret-addr-check.s -o %t # RUN: llvm-mc -filetype=asm `%clang_host -print-target-triple|grep -qi linux && echo --defsym LINUX=0` %p/Inputs/thread-step-out-ret-addr-check.s > %t.s
# RUN: %clang_host %p/Inputs/call-asm.c %t.s -o %t
# RUN: %lldb %t -s %s -b 2>&1 | FileCheck %s # RUN: %lldb %t -s %s -b 2>&1 | FileCheck %s
breakpoint set -n nonstandard_stub breakpoint set -n nonstandard_stub
# CHECK: Breakpoint 1: where = {{.*}}`nonstandard_stub # CHECK: Breakpoint 1: where = {{.*}}`nonstandard_stub
process launch process launch
# CHECK: stop reason = breakpoint 1.1 # CHECK: stop reason = breakpoint 1.1
thread step-out thread step-out
# CHECK: Could not create return address breakpoint. # CHECK: Could not create return address breakpoint.
# CHECK: Return address (0x{{[a-f0-9]*}}) did not point to executable memory. # CHECK: Return address (0x{{[a-f0-9]*}}) did not point to executable memory.