1 files changed, 7 insertions, 0 deletions
diff --git a/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp b/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
index de6e8b59d4f..ca92b14fd90 100644
--- a/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
+++ b/llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
@@ -1290,6 +1290,13 @@ static AttributeSet legalizeCallAttributes(AttributeSet AS) {
             Attr.hasAttribute(Attribute::ReadOnly))
           continue;
 
+        // These attributes control the generation of the gc.statepoint call /
+        // invoke itself; and once the gc.statepoint is in place, they're of no
+        // use.
+        if (Attr.hasAttribute("statepoint-num-patch-bytes") ||
+            Attr.hasAttribute("statepoint-id"))
+          continue;
+
         Ret = Ret.addAttributes(
             AS.getContext(), Index,
             AttributeSet::get(AS.getContext(), Index, AttrBuilder(Attr)));