[embedded] Use ArrayRef<RuntimeEffect> as an argument

Author: kubamracek

lib/SILOptimizer/UtilityPasses/Link.cpp

@@ -43,42 +43,40 @@ class SILLinker : public SILModuleTransform {
     // In embedded Swift, the stdlib contains all the runtime functions needed
     // (swift_retain, etc.). Link them in so they can be referenced in IRGen.
     if (M.getOptions().EmbeddedSwift && LinkEmbeddedRuntime) {
-      linkEmbeddedRuntimeFromStdlib(!M.getOptions().NoAllocations);
+      linkEmbeddedRuntimeFromStdlib();
     }
   }
 
-  void linkEmbeddedRuntimeFromStdlib(bool includeAllocatingFunctions) {
-#define FUNCTION(ID, NAME, CC, AVAILABILITY, RETURNS, ARGS, ATTRS, EFFECT, \
-                 MEMORY_EFFECTS)                                           \
-  {                                                                        \
-    using namespace RuntimeConstants;                                      \
-    ArrayRef<RuntimeEffect> effects = {EFFECT};                            \
-    bool allocating = false;                                               \
-    for (RuntimeEffect rt : effects) {                                     \
-      if (rt == RuntimeEffect::Allocating ||                               \
-          rt == RuntimeEffect::Deallocating)                               \
-        allocating = true;                                                 \
-    }                                                                      \
-    bool include = true;                                                   \
-    if (allocating) include = includeAllocatingFunctions;                  \
-    if (include) linkEmbeddedRuntimeFunctionByName(#NAME);                 \
-  }
+  void linkEmbeddedRuntimeFromStdlib() {
+    using namespace RuntimeConstants;
+#define FUNCTION(ID, NAME, CC, AVAILABILITY, RETURNS, ARGS, ATTRS, EFFECT,     \
+                 MEMORY_EFFECTS)                                               \
+  linkEmbeddedRuntimeFunctionByName(#NAME, EFFECT);
 
 #define RETURNS(...)
 #define ARGS(...)
 #define NO_ARGS
 #define ATTRS(...)
 #define NO_ATTRS
-#define EFFECT(...) __VA_ARGS__
+#define EFFECT(...) { __VA_ARGS__ }
 #define MEMORY_EFFECTS(...)
 #define UNKNOWN_MEMEFFECTS
 
 #include "swift/Runtime/RuntimeFunctions.def"
   }
 
-  void linkEmbeddedRuntimeFunctionByName(StringRef name) {
+  void linkEmbeddedRuntimeFunctionByName(StringRef name,
+                                         ArrayRef<RuntimeEffect> effects) {
     SILModule &M = *getModule();
 
+    bool allocating = false;
+    for (RuntimeEffect rt : effects)
+      if (rt == RuntimeEffect::Allocating || rt == RuntimeEffect::Deallocating)
+        allocating = true;
+
+    // Don't link allocating runtime functions in -no-allocations mode.
+    if (M.getOptions().NoAllocations && allocating) return;
+
     // Bail if runtime function is already loaded.
     if (M.lookUpFunction(name)) return;