[LLVM-C] Add bindings for addCoroutinePassesToExtensionPoints

[aykevl]

Summary

This patch adds bindings to C and Go for addCoroutinePassesToExtensionPoints, which is used to add coroutine passes to the correct locations in PassManagerBuilder.

[whitequark]

LGTM

[aykevl]

Can someone merge this patch? I don't have commit access.

[whitequark]

This broke the bots; the LLVM-C API you added should really be in Transforms/Coroutines, not Transforms/IPO. Please update the patch.

[aykevl]

Ok, will update the patch.

[aykevl]

Moved LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints to lib/Transforms/Coroutines/Coroutines.cpp.
This also required moving of wrap/unwrap functions for the PassManagerBuilder, as they were defined in lib/Transforms/IPO/PassManagerBuilder.cpp instead of in a header file. I think that's the reason I added them originally to PassManagerBuilder.cpp instead of to Coroutines.cpp.

[aykevl]

@whitequark can you take another look at this patch? (I can rebase it if needed).

[whitequark]

Looks good now.

[aykevl]

Rebased on master.

[aykevl]

Merged: https://github.com/llvm/llvm-project/commit/2a7a989c3edc33ad3042052ed50fee37ab254c7d (but Phabricator won't show a second merge)

llvm/bindings/go/llvm/transforms_pmbuilder.go

 //===- transforms_pmbuilder.go - Bindings for PassManagerBuilder ----------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines bindings for the PassManagerBuilder class.
 //
 //===----------------------------------------------------------------------===//
 
 package llvm
 
 /*
 #include "llvm-c/Transforms/PassManagerBuilder.h"
+#include "llvm-c/Transforms/Coroutines.h"
 */
 import "C"
 
 type PassManagerBuilder struct {
   C C.LLVMPassManagerBuilderRef
 }
 
 func NewPassManagerBuilder() (pmb PassManagerBuilder) {

 
 func (pmb PassManagerBuilder) SetDisableSimplifyLibCalls(val bool) {
   C.LLVMPassManagerBuilderSetDisableSimplifyLibCalls(pmb.C, boolToLLVMBool(val))
 }
 
 func (pmb PassManagerBuilder) UseInlinerWithThreshold(threshold uint) {
   C.LLVMPassManagerBuilderUseInlinerWithThreshold(pmb.C, C.uint(threshold))
 }
+
+func (pmb PassManagerBuilder) AddCoroutinePassesToExtensionPoints() {
+  C.LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints(pmb.C);
+}

llvm/include/llvm-c/Transforms/Coroutines.h

 |*                                                                            *|
 \*===----------------------------------------------------------------------===*/
 
 #ifndef LLVM_C_TRANSFORMS_COROUTINES_H
 #define LLVM_C_TRANSFORMS_COROUTINES_H
 
 #include "llvm-c/ExternC.h"
 #include "llvm-c/Types.h"
+#include "llvm-c/Transforms/PassManagerBuilder.h"
 
 LLVM_C_EXTERN_C_BEGIN
 
 /**
  * @defgroup LLVMCTransformsCoroutines Coroutine transformations
  * @ingroup LLVMCTransforms
  *
  * @{
  */
 
 /** See llvm::createCoroEarlyLegacyPass function. */
 void LLVMAddCoroEarlyPass(LLVMPassManagerRef PM);
 
 /** See llvm::createCoroSplitLegacyPass function. */
 void LLVMAddCoroSplitPass(LLVMPassManagerRef PM);
 
 /** See llvm::createCoroElideLegacyPass function. */
 void LLVMAddCoroElidePass(LLVMPassManagerRef PM);
 
 /** See llvm::createCoroCleanupLegacyPass function. */
 void LLVMAddCoroCleanupPass(LLVMPassManagerRef PM);
 
+/** See llvm::addCoroutinePassesToExtensionPoints. */
+void LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints(LLVMPassManagerBuilderRef PMB);
+
 /**
  * @}
  */
 
 LLVM_C_EXTERN_C_END
 
 #endif

llvm/include/llvm/Transforms/IPO/PassManagerBuilder.h

 // llvm/Transforms/IPO/PassManagerBuilder.h - Build Standard Pass -*- C++ -*-=//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the PassManagerBuilder class, which is used to set up a
 // "standard" optimization sequence suitable for languages like C and C++.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_TRANSFORMS_IPO_PASSMANAGERBUILDER_H
 #define LLVM_TRANSFORMS_IPO_PASSMANAGERBUILDER_H
 
+#include "llvm-c/Transforms/PassManagerBuilder.h"
 #include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 
 namespace llvm {
 class ModuleSummaryIndex;
 class Pass;
public:
   ~RegisterStandardPasses() {
     // If the collection holding the global extensions is destroyed after the
     // plugin is unloaded, the extension has to be removed here. Indeed, the
     // destructor of the ExtensionFn may reference code in the plugin.
     PassManagerBuilder::removeGlobalExtension(ExtensionID);
   }
 };
 
+inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) {
+    return reinterpret_cast<PassManagerBuilder*>(P);
+}
+
+inline LLVMPassManagerBuilderRef wrap(PassManagerBuilder *P) {
+  return reinterpret_cast<LLVMPassManagerBuilderRef>(P);
+}
+
 } // end namespace llvm
 #endif

llvm/lib/Transforms/Coroutines/Coroutines.cpp

 
 void LLVMAddCoroElidePass(LLVMPassManagerRef PM) {
   unwrap(PM)->add(createCoroElideLegacyPass());
 }
 
 void LLVMAddCoroCleanupPass(LLVMPassManagerRef PM) {
   unwrap(PM)->add(createCoroCleanupLegacyPass());
 }
+
+void
+LLVMPassManagerBuilderAddCoroutinePassesToExtensionPoints(LLVMPassManagerBuilderRef PMB) {
+  PassManagerBuilder *Builder = unwrap(PMB);
+  addCoroutinePassesToExtensionPoints(*Builder);
+}

llvm/lib/Transforms/IPO/PassManagerBuilder.cpp

     addLateLTOOptimizationPasses(PM);
 
   addExtensionsToPM(EP_FullLinkTimeOptimizationLast, PM);
 
   if (VerifyOutput)
     PM.add(createVerifierPass());
 }
 
-inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) {
-    return reinterpret_cast<PassManagerBuilder*>(P);
-}
-
-inline LLVMPassManagerBuilderRef wrap(PassManagerBuilder *P) {
-  return reinterpret_cast<LLVMPassManagerBuilderRef>(P);
-}
-
 LLVMPassManagerBuilderRef LLVMPassManagerBuilderCreate() {
   PassManagerBuilder *PMB = new PassManagerBuilder();
   return wrap(PMB);
 }
 
 void LLVMPassManagerBuilderDispose(LLVMPassManagerBuilderRef PMB) {
   PassManagerBuilder *Builder = unwrap(PMB);
   delete Builder;