Skip to content

Commit 1512c8f

Browse files
committed
[lldb] Fix C2360: initialization of 'identifier' is skipped by 'case' label
Make sure that every case has its own lexical block. (cherry picked from commit 1ab9a29)
1 parent f4451aa commit 1512c8f

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
@@ -583,52 +583,59 @@ static llvm::ArrayRef<const char *> GetCompatibleArchs(ArchSpec::Core core) {
583583
};
584584
return {g_armv7f_compatible_archs};
585585
}
586-
case ArchSpec::eCore_arm_armv7k:
586+
case ArchSpec::eCore_arm_armv7k: {
587587
static const char *g_armv7k_compatible_archs[] = {
588588
"armv7k", "armv7", "armv6m", "armv6", "armv5",
589589
"armv4", "arm", "thumbv7k", "thumbv7", "thumbv6m",
590590
"thumbv6", "thumbv5", "thumbv4t", "thumb",
591591
};
592592
return {g_armv7k_compatible_archs};
593-
case ArchSpec::eCore_arm_armv7s:
593+
}
594+
case ArchSpec::eCore_arm_armv7s: {
594595
static const char *g_armv7s_compatible_archs[] = {
595596
"armv7s", "armv7", "armv6m", "armv6", "armv5",
596597
"armv4", "arm", "thumbv7s", "thumbv7", "thumbv6m",
597598
"thumbv6", "thumbv5", "thumbv4t", "thumb",
598599
};
599600
return {g_armv7s_compatible_archs};
600-
case ArchSpec::eCore_arm_armv7m:
601+
}
602+
case ArchSpec::eCore_arm_armv7m: {
601603
static const char *g_armv7m_compatible_archs[] = {
602604
"armv7m", "armv7", "armv6m", "armv6", "armv5",
603605
"armv4", "arm", "thumbv7m", "thumbv7", "thumbv6m",
604606
"thumbv6", "thumbv5", "thumbv4t", "thumb",
605607
};
606608
return {g_armv7m_compatible_archs};
607-
case ArchSpec::eCore_arm_armv7em:
609+
}
610+
case ArchSpec::eCore_arm_armv7em: {
608611
static const char *g_armv7em_compatible_archs[] = {
609612
"armv7em", "armv7", "armv6m", "armv6", "armv5",
610613
"armv4", "arm", "thumbv7em", "thumbv7", "thumbv6m",
611614
"thumbv6", "thumbv5", "thumbv4t", "thumb",
612615
};
613616
return {g_armv7em_compatible_archs};
614-
case ArchSpec::eCore_arm_armv6m:
617+
}
618+
case ArchSpec::eCore_arm_armv6m: {
615619
static const char *g_armv6m_compatible_archs[] = {
616620
"armv6m", "armv6", "armv5", "armv4", "arm",
617621
"thumbv6m", "thumbv6", "thumbv5", "thumbv4t", "thumb",
618622
};
619623
return {g_armv6m_compatible_archs};
620-
case ArchSpec::eCore_arm_armv6:
624+
}
625+
case ArchSpec::eCore_arm_armv6: {
621626
static const char *g_armv6_compatible_archs[] = {
622627
"armv6", "armv5", "armv4", "arm",
623628
"thumbv6", "thumbv5", "thumbv4t", "thumb",
624629
};
625630
return {g_armv6_compatible_archs};
626-
case ArchSpec::eCore_arm_armv5:
631+
}
632+
case ArchSpec::eCore_arm_armv5: {
627633
static const char *g_armv5_compatible_archs[] = {
628634
"armv5", "armv4", "arm", "thumbv5", "thumbv4t", "thumb",
629635
};
630636
return {g_armv5_compatible_archs};
631-
case ArchSpec::eCore_arm_armv4:
637+
}
638+
case ArchSpec::eCore_arm_armv4: {
632639
static const char *g_armv4_compatible_archs[] = {
633640
"armv4",
634641
"arm",
@@ -637,6 +644,7 @@ static llvm::ArrayRef<const char *> GetCompatibleArchs(ArchSpec::Core core) {
637644
};
638645
return {g_armv4_compatible_archs};
639646
}
647+
}
640648
return {};
641649
}
642650

0 commit comments

Comments
 (0)