llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Mikhail Zakharov (real-mikhail) <details> <summary>Changes</summary> Original PR where test was introduced and improvements discussed: https://github.com/llvm/llvm-project/pull/129092#issuecomment-2855337004 --- Full diff: https://github.com/llvm/llvm-project/pull/138941.diff 1 Files Affected: - (modified) lldb/test/Shell/Expr/TestProcessModificationIdOnExpr.cpp (+30-12) ``````````diff diff --git a/lldb/test/Shell/Expr/TestProcessModificationIdOnExpr.cpp b/lldb/test/Shell/Expr/TestProcessModificationIdOnExpr.cpp index fe6c2fd93303c..4d67200745018 100644 --- a/lldb/test/Shell/Expr/TestProcessModificationIdOnExpr.cpp +++ b/lldb/test/Shell/Expr/TestProcessModificationIdOnExpr.cpp @@ -1,7 +1,7 @@ // Tests that ProcessModID.m_memory_id is not bumped when evaluating expressions without side effects. -// REQUIRES: target-windows && target-x86 -// Due to different implementations exact numbers (m_stop_id) are different on different OSs. So we lock this test to specific platform (Windows). It is limited to x86 because on x86, running get() +// REQUIRES: target-windows && (target-x86 || target-x86_64) +// Due to different implementations exact numbers (m_stop_id) are different on different OSs. So we lock this test to specific platform (Windows). It is limited to x86/x64 because on x86/x64, running get() // requires that we write the return address to the stack, this does not happen on AArch64. // RUN: %build %s -o %t @@ -11,10 +11,13 @@ // RUN: -o "process status -d" \ // RUN: -o "expr x.i != 42" \ // RUN: -o "process status -d" \ +// RUN: -o "process status -d" \ // RUN: -o "expr x.get()" \ // RUN: -o "process status -d" \ +// RUN: -o "process status -d" \ // RUN: -o "expr x.i = 10" \ // RUN: -o "process status -d" \ +// RUN: -o "process status -d" \ // RUN: -o "continue" \ // RUN: -o "process status -d" \ // RUN: -o "exit" | FileCheck %s -dump-input=fail @@ -36,34 +39,49 @@ int main() { } // CHECK-LABEL: process status -d -// CHECK: m_stop_id: 2 -// CHECK: m_memory_id: 0 +// CHECK: m_stop_id: [[#STOP_ID:]] +// CHECK: m_memory_id: [[#MEMORY_ID:]] // CHECK-LABEL: expr x.i != 42 // IDs are not changed when executing simple expressions // CHECK-LABEL: process status -d -// CHECK: m_stop_id: 2 -// CHECK: m_memory_id: 0 +// CHECK: m_stop_id: [[#STOP_ID]] +// CHECK: m_memory_id: [[#MEMORY_ID]] + +// CHECK-LABEL: process status -d +// Remember new values +// CHECK: m_stop_id: [[#STOP_ID:]] +// CHECK: m_memory_id: [[#MEMORY_ID:]] // CHECK-LABEL: expr x.get() // Expression causes ID to be bumped because LLDB has to execute function and in doing // so must write the return address to the stack. // CHECK-LABEL: process status -d -// CHECK: m_stop_id: 3 -// CHECK: m_memory_id: 1 +// CHECK-NOT: m_stop_id: [[#STOP_ID]] +// CHECK-NOT: m_memory_id: [[#MEMORY_ID]] + +// CHECK-LABEL: process status -d +// Remember new values +// CHECK: m_stop_id: [[#STOP_ID:]] +// CHECK: m_memory_id: [[#MEMORY_ID:]] // CHECK-LABEL: expr x.i = 10 // Expression causes MemoryID to be bumped because LLDB writes to non-cache memory // CHECK-LABEL: process status -d -// CHECK: m_stop_id: 3 -// CHECK: m_memory_id: 2 +// CHECK: m_stop_id: [[#STOP_ID]] +// CHECK-NOT: m_memory_id: [[#MEMORY_ID]] + +// CHECK-LABEL: process status -d +// Remember new values +// CHECK: m_stop_id: [[#STOP_ID:]] +// CHECK: m_memory_id: [[#MEMORY_ID:]] // CHECK-LABEL: continue // Continue causes StopID to be bumped because process is resumed // CHECK-LABEL: process status -d -// CHECK: m_stop_id: 4 -// CHECK: m_memory_id: 2 +// CHECK-NOT: m_stop_id: [[#STOP_ID]] +// CHECK: m_memory_id: [[#MEMORY_ID]] `````````` </details> https://github.com/llvm/llvm-project/pull/138941 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
