Author: Jonas Devlieghere Date: 2023-07-25T17:45:19-07:00 New Revision: 94e8fefe385cd3b6a4656bec244ddf9791056f0c
URL: https://github.com/llvm/llvm-project/commit/94e8fefe385cd3b6a4656bec244ddf9791056f0c DIFF: https://github.com/llvm/llvm-project/commit/94e8fefe385cd3b6a4656bec244ddf9791056f0c.diff LOG: [lldb] Increase the default timeouts when running under ASan Increase the default timeouts when running under ASan. We had something similar before we adopted tablegen, but the larger timeouts got lost in the transition, possibly because tablegen's preprocessor support is very limited. This patch passes a new define (LLDB_SANITIZED) to lldb-tablegen on which we can base the default value. Differential revision: https://reviews.llvm.org/D156279 Added: Modified: lldb/cmake/modules/AddLLDB.cmake lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td lldb/source/Target/TargetProperties.td Removed: ################################################################################ diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index d47a30f5e10921..328e883ddbe5a6 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -20,6 +20,11 @@ function(lldb_tablegen) endif() set(LLVM_TARGET_DEFINITIONS ${LTG_SOURCE}) + + if (LLVM_USE_SANITIZER MATCHES ".*Address.*") + list(APPEND LTG_UNPARSED_ARGUMENTS -DLLDB_SANITIZED) + endif() + tablegen(LLDB ${LTG_UNPARSED_ARGUMENTS}) if(LTG_TARGET) diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td index d4c3c8b94b7ef3..520dad062e09a3 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td @@ -3,7 +3,11 @@ include "../../../../include/lldb/Core/PropertiesBase.td" let Definition = "processgdbremote" in { def PacketTimeout: Property<"packet-timeout", "UInt64">, Global, +#ifdef LLDB_SANITIZED + DefaultUnsignedValue<60>, +#else DefaultUnsignedValue<5>, +#endif Desc<"Specify the default packet timeout in seconds.">; def TargetDefinitionFile: Property<"target-definition-file", "FileSpec">, Global, diff --git a/lldb/source/Target/TargetProperties.td b/lldb/source/Target/TargetProperties.td index 19ea505af65637..3bfdfa8cfaa957 100644 --- a/lldb/source/Target/TargetProperties.td +++ b/lldb/source/Target/TargetProperties.td @@ -244,10 +244,18 @@ let Definition = "process" in { DefaultTrue, Desc<"If true, stop when the inferior exec's.">; def UtilityExpressionTimeout: Property<"utility-expression-timeout", "UInt64">, +#ifdef LLDB_SANITIZED + DefaultUnsignedValue<60>, +#else DefaultUnsignedValue<15>, +#endif Desc<"The time in seconds to wait for LLDB-internal utility expressions.">; def InterruptTimeout: Property<"interrupt-timeout", "UInt64">, +#ifdef LLDB_SANITIZED + DefaultUnsignedValue<60>, +#else DefaultUnsignedValue<20>, +#endif Desc<"The time in seconds to wait for an interrupt succeed in stopping the target.">; def SteppingRunsAllThreads: Property<"run-all-threads", "Boolean">, DefaultFalse, _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
