commit 06afb97e06edf7227f18265e0b7e26cb9406cd78
author Than McIntosh <thanm@google.com> Wed Feb 09 16:58:29 2022 -0500
committer Than McIntosh <thanm@google.com> Wed Feb 09 22:51:15 2022 +0000
tree 9054404e698120569a886095e313d3cff9a5b83b
parent 3d989cca7ce366d75b9667a0614a2b546a0e99b2

gollvm: sync with trunk at 09629215c272

Adapt to some additional changes in the IR builder and
remark header files.

Change-Id: I47ec6bd2d271a2367b39253e15cd1920379b6bd0
Reviewed-on: https://go-review.googlesource.com/c/gollvm/+/384694
Trust: Than McIntosh <thanm@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>

driver/CompileGo.cpp

diff --git a/driver/CompileGo.cpp b/driver/CompileGo.cpp
index 9a241fa..6affe49 100644
--- a/driver/CompileGo.cpp
+++ b/driver/CompileGo.cpp
@@ -51,6 +51,7 @@
 #include "llvm/Option/OptTable.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Passes/PassBuilder.h"
+#include "llvm/Remarks/RemarkStreamer.h"
 #include "llvm/Remarks/YAMLRemarkSerializer.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"

passes/GoStatepoints.cpp

diff --git a/passes/GoStatepoints.cpp b/passes/GoStatepoints.cpp
index e1279e9..3542a4f 100644
--- a/passes/GoStatepoints.cpp
+++ b/passes/GoStatepoints.cpp
@@ -1511,8 +1511,10 @@
     // the "gc arg" slots, of the statepoint. Both are recorded in the stack
     // map the same way. The difference is that "deopt arg" doesn't need
     // relocation. We're implementing non-moving GC (for now).
+    FunctionCallee FCallTarget(Call->getFunctionType(),
+                              Call->getCalledOperand());
     InvokeInst *Invoke = Builder.CreateGCStatepointInvoke(
-        StatepointID, NumPatchBytes, CallTarget, ToReplace->getNormalDest(),
+        StatepointID, NumPatchBytes, FCallTarget, ToReplace->getNormalDest(),
         ToReplace->getUnwindDest(), CallArgs, GCArgs, ArrayRef<Value*>(),
         "statepoint_token");