Merge pull request #37192 from adrian-prantl/twice-the-pointers-5.5

xymus · web-flow · commit 8deca5a72ddf · 2021-04-30T21:57:27.000-07:00
Update the correct size of Builting.Executor, it is now 2 pointers.
diff --git a/lib/IRGen/IRGenDebugInfo.cpp b/lib/IRGen/IRGenDebugInfo.cpp
@@ -1340,10 +1340,9 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     }
 
     case TypeKind::BuiltinExecutor: {
-      unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0);
-      return DBuilder.createPointerType(nullptr, PtrSize, 0,
-                                        /* DWARFAddressSpace */ None,
-                                        MangledName);
+      return createDoublePointerSizedStruct(
+          Scope, "Builtin.Executor", nullptr, MainFile, 0,
+          llvm::DINode::FlagArtificial, MangledName);
     }
 
     case TypeKind::DynamicSelf: {

Original file line number	Diff line number	Diff line change
`@@ -1340,10 +1340,9 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {`
`1340`	`1340`	`}`
`1341`	`1341`
`1342`	`1342`	`case TypeKind::BuiltinExecutor: {`
`1343`		`- unsigned PtrSize = CI.getTargetInfo().getPointerWidth(0);`
`1344`		`- return DBuilder.createPointerType(nullptr, PtrSize, 0,`
`1345`		`- /* DWARFAddressSpace */ None,`
`1346`		`- MangledName);`
	`1343`	`+ return createDoublePointerSizedStruct(`
	`1344`	`+ Scope, "Builtin.Executor", nullptr, MainFile, 0,`
	`1345`	`+ llvm::DINode::FlagArtificial, MangledName);`
`1347`	`1346`	`}`
`1348`	`1347`
`1349`	`1348`	`case TypeKind::DynamicSelf: {`