diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -20,6 +20,11 @@ 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 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td @@ -3,7 +3,11 @@ 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 --- a/lldb/source/Target/TargetProperties.td +++ b/lldb/source/Target/TargetProperties.td @@ -244,10 +244,18 @@ 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,