Revert "[lldb] Fix DW_OP_piece-O3 test on AArch64 Windows"

[kuilpd]

Reverts #117336

[llvmbot]

@llvm/pr-subscribers-lldb

Author: Ilia Kuklin (kuilpd)

Changes

Reverts llvm/llvm-project#117336

---

Full diff: https://github.com/llvm/llvm-project/pull/117354.diff

1 Files Affected:

• (modified) lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-O3.c (+5-5)

diff --git a/lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-O3.c b/lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-O3.c
index 75cd4e6a913b9c..77ea81f30395f0 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-O3.c
+++ b/lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-O3.c
@@ -7,7 +7,7 @@
 
 // RUN: %clang_host -O3 -gdwarf %s -o %t
 // RUN: %lldb %t \
-// RUN:   -o "b done" \
+// RUN:   -o "b 25" \
 // RUN:   -o "r" \
 // RUN:   -o "p/x array[2]" \
 // RUN:   -b | FileCheck %s
@@ -17,10 +17,10 @@
 
 static char array[5] = {0, 1, 2, 3, 4};
 
-int done() __attribute__((noinline));
-int done() { return array[2]; };
+void func() __attribute__((noinline));
+void func() { ++array[2]; };
 
 int main(void) {
-  ++array[2];
-  return done();
+  func();
+  return 0;
 }

[llvm-ci]

LLVM Buildbot has detected a new failure on builder lldb-x86_64-debian running on lldb-x86_64-debian while building lldb at step 6 "test".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/162/builds/11116

Here is the relevant piece of the build log for the reference

Step 6 (test) failure: build (failure)
...
PASS: lldb-api :: functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py (83 of 2714)
PASS: lldb-api :: functionalities/memory-region/TestMemoryRegion.py (84 of 2714)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py (85 of 2714)
PASS: lldb-api :: functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py (86 of 2714)
PASS: lldb-api :: types/TestLongTypes.py (87 of 2714)
PASS: lldb-api :: functionalities/thread/step_out/TestThreadStepOut.py (88 of 2714)
PASS: lldb-shell :: SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp (89 of 2714)
PASS: lldb-api :: tools/lldb-dap/completions/TestDAP_completions.py (90 of 2714)
PASS: lldb-api :: tools/lldb-server/vCont-threads/TestPartialResume.py (91 of 2714)
PASS: lldb-api :: tools/lldb-dap/module/TestDAP_module.py (92 of 2714)
FAIL: lldb-api :: tools/lldb-dap/launch/TestDAP_launch.py (93 of 2714)
******************** TEST 'lldb-api :: tools/lldb-dap/launch/TestDAP_launch.py' FAILED ********************
Script:
--
/usr/bin/python3 /home/worker/2.0.1/lldb-x86_64-debian/llvm-project/lldb/test/API/dotest.py -u CXXFLAGS -u CFLAGS --env LLVM_LIBS_DIR=/home/worker/2.0.1/lldb-x86_64-debian/build/./lib --env LLVM_INCLUDE_DIR=/home/worker/2.0.1/lldb-x86_64-debian/build/include --env LLVM_TOOLS_DIR=/home/worker/2.0.1/lldb-x86_64-debian/build/./bin --arch x86_64 --build-dir /home/worker/2.0.1/lldb-x86_64-debian/build/lldb-test-build.noindex --lldb-module-cache-dir /home/worker/2.0.1/lldb-x86_64-debian/build/lldb-test-build.noindex/module-cache-lldb/lldb-api --clang-module-cache-dir /home/worker/2.0.1/lldb-x86_64-debian/build/lldb-test-build.noindex/module-cache-clang/lldb-api --executable /home/worker/2.0.1/lldb-x86_64-debian/build/./bin/lldb --compiler /home/worker/2.0.1/lldb-x86_64-debian/build/./bin/clang --dsymutil /home/worker/2.0.1/lldb-x86_64-debian/build/./bin/dsymutil --make /usr/bin/make --llvm-tools-dir /home/worker/2.0.1/lldb-x86_64-debian/build/./bin --lldb-obj-root /home/worker/2.0.1/lldb-x86_64-debian/build/tools/lldb --lldb-libs-dir /home/worker/2.0.1/lldb-x86_64-debian/build/./lib -t /home/worker/2.0.1/lldb-x86_64-debian/llvm-project/lldb/test/API/tools/lldb-dap/launch -p TestDAP_launch.py
--
Exit Code: 1

Command Output (stdout):
--
lldb version 20.0.0git (https://github.com/llvm/llvm-project.git revision dc637e940cb115fe72408ba96ad2e5e2396a3e94)
  clang revision dc637e940cb115fe72408ba96ad2e5e2396a3e94
  llvm revision dc637e940cb115fe72408ba96ad2e5e2396a3e94
Skipping the following test categories: ['libc++', 'dsym', 'gmodules', 'debugserver', 'objc']
========= DEBUG ADAPTER PROTOCOL LOGS =========
1732298203.846438885 --> 
Content-Length: 344

{
  "arguments": {
    "adapterID": "lldb-native",
    "clientID": "vscode",
    "columnsStartAt1": true,
    "linesStartAt1": true,
    "locale": "en-us",
    "pathFormat": "path",
    "sourceInitFile": false,
    "supportsRunInTerminalRequest": true,
    "supportsStartDebuggingRequest": true,
    "supportsVariablePaging": true,
    "supportsVariableType": true
  },
  "command": "initialize",
  "seq": 1,
  "type": "request"
}
1732298203.848520756 <-- 
Content-Length: 1589