Skip to content

Commit 761636a

Browse files
author
git apple-llvm automerger
committed
Merge commit 'a511a88e2fc6' from apple/stable/20200714 into swift/main
2 parents 0050ad0 + a511a88 commit 761636a

File tree

4 files changed

+318
-148
lines changed

4 files changed

+318
-148
lines changed

lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,8 @@ DynamicLoaderDarwinKernel::DynamicLoaderDarwinKernel(Process *process,
517517
Status error;
518518
PlatformSP platform_sp(
519519
Platform::Create(PlatformDarwinKernel::GetPluginNameStatic(), error));
520-
// Only select the darwin-kernel Platform if we've been asked to load kexts.
521-
// It can take some time to scan over all of the kext info.plists and that
522-
// shouldn't be done if kext loading is explicitly disabled.
523-
if (platform_sp.get() && GetGlobalProperties()->GetLoadKexts()) {
520+
if (platform_sp.get())
524521
process->GetTarget().SetPlatform(platform_sp);
525-
}
526522
}
527523

528524
// Destructor

0 commit comments

Comments
 (0)