[lldb][ClangASTImporter] Fix mismerge in LayoutRecordType

Michael137 · Michael137 · commit 22e2a1202934 · 2024-03-01T08:16:23.000Z
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`