Update prebuilt Clang to r416183b from Android.
https://android.googlesource.com/platform/prebuilts/clang/host/
linux-x86/+/06a71ddac05c22edb2d10b590e1769b3f8619bef
clang 12.0.5 (based on r416183b) from build 7284624.
Change-Id: I277a316abcf47307562d8b748b84870f31a72866
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/linux-x64/clang/include/lldb/Target/ThreadPlanStepInRange.h b/linux-x64/clang/include/lldb/Target/ThreadPlanStepInRange.h
index a120c98..a26b0fb 100644
--- a/linux-x64/clang/include/lldb/Target/ThreadPlanStepInRange.h
+++ b/linux-x64/clang/include/lldb/Target/ThreadPlanStepInRange.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef liblldb_ThreadPlanStepInRange_h_
-#define liblldb_ThreadPlanStepInRange_h_
+#ifndef LLDB_TARGET_THREADPLANSTEPINRANGE_H
+#define LLDB_TARGET_THREADPLANSTEPINRANGE_H
#include "lldb/Core/AddressRange.h"
#include "lldb/Target/StackID.h"
@@ -26,13 +26,6 @@
LazyBool step_in_avoids_code_without_debug_info,
LazyBool step_out_avoids_code_without_debug_info);
- ThreadPlanStepInRange(Thread &thread, const AddressRange &range,
- const SymbolContext &addr_context,
- const char *step_into_function_name,
- lldb::RunMode stop_others,
- LazyBool step_in_avoids_code_without_debug_info,
- LazyBool step_out_avoids_code_without_debug_info);
-
~ThreadPlanStepInRange() override;
void GetDescription(Stream *s, lldb::DescriptionLevel level) override;
@@ -49,6 +42,12 @@
bool IsVirtualStep() override;
+ // Plans that are implementing parts of a step in might need to follow the
+ // behavior of this plan w.r.t. StepThrough. They can get that from here.
+ static uint32_t GetDefaultFlagsValue() {
+ return s_default_flag_values;
+ }
+
protected:
static bool DefaultShouldStopHereCallback(ThreadPlan *current_plan,
Flags &flags,
@@ -72,17 +71,6 @@
bool FrameMatchesAvoidCriteria();
private:
- friend lldb::ThreadPlanSP Thread::QueueThreadPlanForStepOverRange(
- bool abort_other_plans, const AddressRange &range,
- const SymbolContext &addr_context, lldb::RunMode stop_others,
- Status &status, LazyBool avoid_code_without_debug_info);
- friend lldb::ThreadPlanSP Thread::QueueThreadPlanForStepInRange(
- bool abort_other_plans, const AddressRange &range,
- const SymbolContext &addr_context, const char *step_in_target,
- lldb::RunMode stop_others, Status &status,
- LazyBool step_in_avoids_code_without_debug_info,
- LazyBool step_out_avoids_code_without_debug_info);
-
void SetupAvoidNoDebug(LazyBool step_in_avoids_code_without_debug_info,
LazyBool step_out_avoids_code_without_debug_info);
// Need an appropriate marker for the current stack so we can tell step out
@@ -99,9 +87,11 @@
bool m_virtual_step; // true if we've just done a "virtual step", i.e. just
// moved the inline stack depth.
ConstString m_step_into_target;
- DISALLOW_COPY_AND_ASSIGN(ThreadPlanStepInRange);
+ ThreadPlanStepInRange(const ThreadPlanStepInRange &) = delete;
+ const ThreadPlanStepInRange &
+ operator=(const ThreadPlanStepInRange &) = delete;
};
} // namespace lldb_private
-#endif // liblldb_ThreadPlanStepInRange_h_
+#endif // LLDB_TARGET_THREADPLANSTEPINRANGE_H