Make some wrappers more concise

speednoisemovement · speednoisemovement · commit 17a935f9d054 · 2025-12-19T14:37:27.000-05:00
diff --git a/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp b/lldb/source/Plugins/SymbolFile/NativePDB/PdbAstBuilder.cpp
@@ -321,10 +321,7 @@ clang::DeclContext *PdbAstBuilder::GetOrCreateClangDeclContextForUid(PdbSymUid u
 }
 
 CompilerDeclContext PdbAstBuilder::GetOrCreateDeclContextForUid(PdbSymUid uid) {
-  clang::DeclContext *context = GetOrCreateClangDeclContextForUid(uid);
-  if (!context)
-    return {};
-  return ToCompilerDeclContext(*context);
+  return m_clang.CreateDeclContext(GetOrCreateClangDeclContextForUid(uid));
 }
 
 std::pair<clang::DeclContext *, std::string>
@@ -428,10 +425,7 @@ clang::DeclContext *PdbAstBuilder::GetParentClangDeclContext(PdbSymUid uid) {
 }
 
 CompilerDeclContext PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) {
-  clang::DeclContext *context = GetParentClangDeclContext(uid);
-  if (!context)
-    return {};
-  return ToCompilerDeclContext(*context);
+  return m_clang.CreateDeclContext(GetParentClangDeclContext(uid));
 }
 
 bool PdbAstBuilder::CompleteType(CompilerType ct) {

Original file line number	Diff line number	Diff line change
`@@ -321,10 +321,7 @@ clang::DeclContext *PdbAstBuilder::GetOrCreateClangDeclContextForUid(PdbSymUid u`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`CompilerDeclContext PdbAstBuilder::GetOrCreateDeclContextForUid(PdbSymUid uid) {`
`324`		`- clang::DeclContext *context = GetOrCreateClangDeclContextForUid(uid);`
`325`		`- if (!context)`
`326`		`- return {};`
`327`		`- return ToCompilerDeclContext(*context);`
	`324`	`+ return m_clang.CreateDeclContext(GetOrCreateClangDeclContextForUid(uid));`
`328`	`325`	`}`
`329`	`326`
`330`	`327`	`std::pair<clang::DeclContext *, std::string>`
`@@ -428,10 +425,7 @@ clang::DeclContext *PdbAstBuilder::GetParentClangDeclContext(PdbSymUid uid) {`
`428`	`425`	`}`
`429`	`426`
`430`	`427`	`CompilerDeclContext PdbAstBuilder::GetParentDeclContext(PdbSymUid uid) {`
`431`		`- clang::DeclContext *context = GetParentClangDeclContext(uid);`
`432`		`- if (!context)`
`433`		`- return {};`
`434`		`- return ToCompilerDeclContext(*context);`
	`428`	`+ return m_clang.CreateDeclContext(GetParentClangDeclContext(uid));`
`435`	`429`	`}`
`436`	`430`
`437`	`431`	`bool PdbAstBuilder::CompleteType(CompilerType ct) {`