fix D103172

[wallace]

Summary

D103172 has a couple of mistakes when modifying a variable outside the for loop. I really don't know how to make a test for this, so feel free to commandeer this diff and finish it.

With this patch I was able to set breakpoints on a complex binary I have.

[teemperor]

I think this part of the patch can just be reverted. Thanks for tracking this down! Reverted the respective changes in e4977f9cb58ff7820d0287ba309490af57787749

Feel free to close this. I'll see that we can give this code some test coverage.

[wallace]

Thanks!

[clayborg]

In D107434#2924761, @teemperor wrote:

I think this part of the patch can just be reverted. Thanks for tracking this down! Reverted the respective changes in e4977f9cb58ff7820d0287ba309490af57787749

Feel free to close this. I'll see that we can give this code some test coverage.

Couldn't e4977f9cb58ff7820d0287ba309490af57787749, which looks like:

-  for (DWARFDIE src_die : src_class_die.children()) {
+  for (src_die = src_class_die.GetFirstChild(); src_die.IsValid();
+       src_die = src_die.GetSibling()) {

Just been:

-  for (DWARFDIE src_die : src_class_die.children()) {
+ for (src_die : src_class_die.children()) {

?

lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

bool DWARFASTParserClang::CopyUniqueClassMethodTypes(
   class_type->GetFullCompilerType();
 
   DWARFDIE src_die;
   DWARFDIE dst_die;
   UniqueCStringMap<DWARFDIE> src_name_to_die;
   UniqueCStringMap<DWARFDIE> dst_name_to_die;
   UniqueCStringMap<DWARFDIE> src_name_to_die_artificial;
   UniqueCStringMap<DWARFDIE> dst_name_to_die_artificial;
-  for (DWARFDIE src_die : src_class_die.children()) {
+  for (DWARFDIE src_die_ : src_class_die.children()) {
+    src_die = src_die_;
     if (src_die.Tag() == DW_TAG_subprogram) {
       // Make sure this is a declaration and not a concrete instance by looking
       // for DW_AT_declaration set to 1. Sometimes concrete function instances
       // are placed inside the class definitions and shouldn't be included in
       // the list of things are are tracking here.
       if (src_die.GetAttributeValueAsUnsigned(DW_AT_declaration, 0) == 1) {
         const char *src_name = src_die.GetMangledName();
         if (src_name) {
           ConstString src_const_name(src_name);
           if (src_die.GetAttributeValueAsUnsigned(DW_AT_artificial, 0))
             src_name_to_die_artificial.Append(src_const_name, src_die);
           else
             src_name_to_die.Append(src_const_name, src_die);
         }
       }
     }
   }
-  for (DWARFDIE dst_die : dst_class_die.children()) {
+  for (DWARFDIE dst_die_ : dst_class_die.children()) {
+    dst_die = dst_die_;
     if (dst_die.Tag() == DW_TAG_subprogram) {
       // Make sure this is a declaration and not a concrete instance by looking
       // for DW_AT_declaration set to 1. Sometimes concrete function instances
       // are placed inside the class definitions and shouldn't be included in
       // the list of things are are tracking here.
       if (dst_die.GetAttributeValueAsUnsigned(DW_AT_declaration, 0) == 1) {
         const char *dst_name = dst_die.GetMangledName();
         if (dst_name) {