Merge pull request #36803 from compnerd/indirection

xedin · web-flow · commit 88f20b514c00 · 2021-04-08T00:14:48.000-07:00
IRGen: repair the IRGen on Windows
diff --git a/lib/IRGen/IRGenModule.cpp b/lib/IRGen/IRGenModule.cpp
@@ -899,9 +899,8 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,
 }
 
 llvm::Constant *IRGenModule::getDeletedAsyncMethodErrorAsyncFunctionPointer() {
-  return getAddrOfLLVMVariable(
-      LinkEntity::forKnownAsyncFunctionPointer("swift_deletedAsyncMethodError"),
-      ConstantInit(), DebugTypeInfo());
+  return getAddrOfLLVMVariableOrGOTEquivalent(
+      LinkEntity::forKnownAsyncFunctionPointer("swift_deletedAsyncMethodError")).getValue();
 }
 
 #define QUOTE(...) __VA_ARGS__

Original file line number	Diff line number	Diff line change
`@@ -899,9 +899,8 @@ llvm::Constant *swift::getRuntimeFn(llvm::Module &Module,`
`899`	`899`	`}`
`900`	`900`
`901`	`901`	`llvm::Constant *IRGenModule::getDeletedAsyncMethodErrorAsyncFunctionPointer() {`
`902`		`- return getAddrOfLLVMVariable(`
`903`		`- LinkEntity::forKnownAsyncFunctionPointer("swift_deletedAsyncMethodError"),`
`904`		`- ConstantInit(), DebugTypeInfo());`
	`902`	`+ return getAddrOfLLVMVariableOrGOTEquivalent(`
	`903`	`+ LinkEntity::forKnownAsyncFunctionPointer("swift_deletedAsyncMethodError")).getValue();`
`905`	`904`	`}`
`906`	`905`
`907`	`906`	`#define QUOTE(...) __VA_ARGS__`