[CIR] Fix build due to the improvement after 91cdd35

darkbuck · darkbuck · commit c1f797ea6dd1 · 2025-08-12T13:42:12.000-04:00
diff --git a/clang/lib/CIR/CodeGen/CIRGenClass.cpp b/clang/lib/CIR/CodeGen/CIRGenClass.cpp
@@ -284,7 +284,8 @@ void CIRGenFunction::initializeVTablePointer(mlir::Location loc,
   } else {
     // We can just use the base offset in the complete class.
     nonVirtualOffset = vptr.base.getBaseOffset();
-    baseValueTy = convertType(getContext().getTagDeclType(vptr.base.getBase()));
+    baseValueTy =
+        convertType(getContext().getCanonicalTagType(vptr.base.getBase()));
   }
 
   // Apply the offsets.

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,8 @@ void CIRGenFunction::initializeVTablePointer(mlir::Location loc,`
`284`	`284`	`} else {`
`285`	`285`	`// We can just use the base offset in the complete class.`
`286`	`286`	`nonVirtualOffset = vptr.base.getBaseOffset();`
`287`		`- baseValueTy = convertType(getContext().getTagDeclType(vptr.base.getBase()));`
	`287`	`+ baseValueTy =`
	`288`	`+ convertType(getContext().getCanonicalTagType(vptr.base.getBase()));`
`288`	`289`	`}`
`289`	`290`
`290`	`291`	`// Apply the offsets.`