Merge pull request #8311 from Michael137/bugfix/lldb-origin-layout-tracking-mismerge-fix-to-20230725

Michael137 · web-flow · commit 3e44914b3519 · 2024-03-01T14:22:45.000Z
[lldb][ClangASTImporter] Fix mismerge in LayoutRecordType The return statement was dropped when resolving merge conflicts in #8306.
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTImporter.cpp
@@ -785,6 +785,7 @@ bool ClangASTImporter::LayoutRecordType(
     field_offsets.swap(pos->second.field_offsets);
     base_offsets.swap(pos->second.base_offsets);
     vbase_offsets.swap(pos->second.vbase_offsets);
+    return true;
   }
 
   // It's possible that we calculated the layout in a different

Original file line number	Diff line number	Diff line change
`@@ -785,6 +785,7 @@ bool ClangASTImporter::LayoutRecordType(`
`785`	`785`	`field_offsets.swap(pos->second.field_offsets);`
`786`	`786`	`base_offsets.swap(pos->second.base_offsets);`
`787`	`787`	`vbase_offsets.swap(pos->second.vbase_offsets);`
	`788`	`+ return true;`
`788`	`789`	`}`
`789`	`790`
`790`	`791`	`// It's possible that we calculated the layout in a different`