Use unwrapDIPtr because the Scope may be passed as None

danielframpton · danielframpton · commit a3bff691344e · 2020-10-27T18:05:16.000-07:00
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -765,7 +765,7 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateTypedef(
     LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Scope) {
   return wrap(Builder->createTypedef(
     unwrap<DIType>(Type), StringRef(Name, NameLen), unwrap<DIFile>(File),
-    LineNo, unwrap<DIScope>(Scope)));
+    LineNo, unwrapDIPtr<DIScope>(Scope)));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreatePointerType(

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateTypedef(`
`765`	`765`	`LLVMMetadataRef File, unsigned LineNo, LLVMMetadataRef Scope) {`
`766`	`766`	`return wrap(Builder->createTypedef(`
`767`	`767`	`unwrap<DIType>(Type), StringRef(Name, NameLen), unwrap<DIFile>(File),`
`768`		`- LineNo, unwrap<DIScope>(Scope)));`
	`768`	`+ LineNo, unwrapDIPtr<DIScope>(Scope)));`
`769`	`769`	`}`
`770`	`770`
`771`	`771`	`extern "C" LLVMMetadataRef LLVMRustDIBuilderCreatePointerType(`