Skip to content

Commit 1ab9a29

Browse files
committed
[lldb] Fix C2360: initialization of 'identifier' is skipped by 'case' label
Make sure that every case has its own lexical block.
1 parent 7875802 commit 1ab9a29

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

lldb/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -592,52 +592,59 @@ static llvm::ArrayRef<const char *> GetCompatibleArchs(ArchSpec::Core core) {
592592
};
593593
return {g_armv7f_compatible_archs};
594594
}
595-
case ArchSpec::eCore_arm_armv7k:
595+
case ArchSpec::eCore_arm_armv7k: {
596596
static const char *g_armv7k_compatible_archs[] = {
597597
"armv7k", "armv7", "armv6m", "armv6", "armv5",
598598
"armv4", "arm", "thumbv7k", "thumbv7", "thumbv6m",
599599
"thumbv6", "thumbv5", "thumbv4t", "thumb",
600600
};
601601
return {g_armv7k_compatible_archs};
602-
case ArchSpec::eCore_arm_armv7s:
602+
}
603+
case ArchSpec::eCore_arm_armv7s: {
603604
static const char *g_armv7s_compatible_archs[] = {
604605
"armv7s", "armv7", "armv6m", "armv6", "armv5",
605606
"armv4", "arm", "thumbv7s", "thumbv7", "thumbv6m",
606607
"thumbv6", "thumbv5", "thumbv4t", "thumb",
607608
};
608609
return {g_armv7s_compatible_archs};
609-
case ArchSpec::eCore_arm_armv7m:
610+
}
611+
case ArchSpec::eCore_arm_armv7m: {
610612
static const char *g_armv7m_compatible_archs[] = {
611613
"armv7m", "armv7", "armv6m", "armv6", "armv5",
612614
"armv4", "arm", "thumbv7m", "thumbv7", "thumbv6m",
613615
"thumbv6", "thumbv5", "thumbv4t", "thumb",
614616
};
615617
return {g_armv7m_compatible_archs};
616-
case ArchSpec::eCore_arm_armv7em:
618+
}
619+
case ArchSpec::eCore_arm_armv7em: {
617620
static const char *g_armv7em_compatible_archs[] = {
618621
"armv7em", "armv7", "armv6m", "armv6", "armv5",
619622
"armv4", "arm", "thumbv7em", "thumbv7", "thumbv6m",
620623
"thumbv6", "thumbv5", "thumbv4t", "thumb",
621624
};
622625
return {g_armv7em_compatible_archs};
623-
case ArchSpec::eCore_arm_armv6m:
626+
}
627+
case ArchSpec::eCore_arm_armv6m: {
624628
static const char *g_armv6m_compatible_archs[] = {
625629
"armv6m", "armv6", "armv5", "armv4", "arm",
626630
"thumbv6m", "thumbv6", "thumbv5", "thumbv4t", "thumb",
627631
};
628632
return {g_armv6m_compatible_archs};
629-
case ArchSpec::eCore_arm_armv6:
633+
}
634+
case ArchSpec::eCore_arm_armv6: {
630635
static const char *g_armv6_compatible_archs[] = {
631636
"armv6", "armv5", "armv4", "arm",
632637
"thumbv6", "thumbv5", "thumbv4t", "thumb",
633638
};
634639
return {g_armv6_compatible_archs};
635-
case ArchSpec::eCore_arm_armv5:
640+
}
641+
case ArchSpec::eCore_arm_armv5: {
636642
static const char *g_armv5_compatible_archs[] = {
637643
"armv5", "armv4", "arm", "thumbv5", "thumbv4t", "thumb",
638644
};
639645
return {g_armv5_compatible_archs};
640-
case ArchSpec::eCore_arm_armv4:
646+
}
647+
case ArchSpec::eCore_arm_armv4: {
641648
static const char *g_armv4_compatible_archs[] = {
642649
"armv4",
643650
"arm",
@@ -646,6 +653,7 @@ static llvm::ArrayRef<const char *> GetCompatibleArchs(ArchSpec::Core core) {
646653
};
647654
return {g_armv4_compatible_archs};
648655
}
656+
}
649657
return {};
650658
}
651659

0 commit comments

Comments
 (0)