using getFirstDecl for TranslationUnitDecl for consistent pointers

Vipul-Cariappa · Vipul-Cariappa · commit e2c1844744bc · 2024-09-25T05:18:39.000Z
diff --git a/lib/Interpreter/CppInterOp.cpp b/lib/Interpreter/CppInterOp.cpp
@@ -498,7 +498,7 @@ namespace Cpp {
 
   TCppScope_t GetGlobalScope()
   {
-    return getSema().getASTContext().getTranslationUnitDecl();
+    return getSema().getASTContext().getTranslationUnitDecl()->getFirstDecl();
   }
 
   static Decl *GetScopeFromType(QualType QT) {
@@ -604,8 +604,12 @@ namespace Cpp {
     if (!ParentDC)
       return 0;
 
-    return (TCppScope_t) clang::Decl::castFromDeclContext(
-            ParentDC)->getCanonicalDecl();
+    auto* P = clang::Decl::castFromDeclContext(ParentDC)->getCanonicalDecl();
+
+    if (auto* TU = llvm::dyn_cast_or_null<TranslationUnitDecl>(P))
+      return (TCppScope_t)TU->getFirstDecl();
+
+    return (TCppScope_t)P;
   }
 
   TCppIndex_t GetNumBases(TCppScope_t klass)

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ namespace Cpp {`
`498`	`498`
`499`	`499`	`TCppScope_t GetGlobalScope()`
`500`	`500`	`{`
`501`		`- return getSema().getASTContext().getTranslationUnitDecl();`
	`501`	`+ return getSema().getASTContext().getTranslationUnitDecl()->getFirstDecl();`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`static Decl *GetScopeFromType(QualType QT) {`
`@@ -604,8 +604,12 @@ namespace Cpp {`
`604`	`604`	`if (!ParentDC)`
`605`	`605`	`return 0;`
`606`	`606`
`607`		`- return (TCppScope_t) clang::Decl::castFromDeclContext(`
`608`		`- ParentDC)->getCanonicalDecl();`
	`607`	`+ auto* P = clang::Decl::castFromDeclContext(ParentDC)->getCanonicalDecl();`
	`608`	`+`
	`609`	`+ if (auto* TU = llvm::dyn_cast_or_null<TranslationUnitDecl>(P))`
	`610`	`+ return (TCppScope_t)TU->getFirstDecl();`
	`611`	`+`
	`612`	`+ return (TCppScope_t)P;`
`609`	`613`	`}`
`610`	`614`
`611`	`615`	`TCppIndex_t GetNumBases(TCppScope_t klass)`