[embedded] Move isEmbedded check to MandatoryPerformanceOptimizations from VTableSpecializer

Author: kubamracek

SwiftCompilerSources/Sources/Optimizer/ModulePasses/MandatoryPerformanceOptimizations.swift

@@ -50,7 +50,7 @@ private func optimizeFunctionsTopDown(using worklist: inout FunctionWorklist,
         return
       }
 
-      optimize(function: f, context, &worklist)
+      optimize(function: f, context, &worklist, isEmbeddedSwift: moduleContext.options.enableEmbeddedSwift)
     }
   }
 }
@@ -60,7 +60,7 @@ fileprivate struct PathFunctionTuple: Hashable {
   var function: Function
 }
 
-private func optimize(function: Function, _ context: FunctionPassContext, _ worklist: inout FunctionWorklist) {
+private func optimize(function: Function, _ context: FunctionPassContext, _ worklist: inout FunctionWorklist, isEmbeddedSwift: Bool) {
   var alreadyInlinedFunctions: Set<PathFunctionTuple> = Set()
 
   var changed = true
@@ -75,12 +75,21 @@ private func optimize(function: Function, _ context: FunctionPassContext, _ work
       switch instruction {
       case let apply as FullApplySite:
         inlineAndDevirtualize(apply: apply, alreadyInlinedFunctions: &alreadyInlinedFunctions, context, simplifyCtxt)
+
+      // Embedded Swift specific transformations
       case let alloc as AllocRefInst:
-        specializeVTableAndAddEntriesToWorklist(for: alloc.type, in: function, context, &worklist)
+        if isEmbeddedSwift {
+          specializeVTableAndAddEntriesToWorklist(for: alloc.type, in: function, context, &worklist)
+        }
       case let metatype as MetatypeInst:
-        specializeVTableAndAddEntriesToWorklist(for: metatype.type, in: function, context, &worklist)
+        if isEmbeddedSwift {
+          specializeVTableAndAddEntriesToWorklist(for: metatype.type, in: function, context, &worklist)
+        }
       case let classMethod as ClassMethodInst:
-        _ = context.specializeClassMethodInst(classMethod)
+        if isEmbeddedSwift {
+          _ = context.specializeClassMethodInst(classMethod)
+        }
+
       default:
         break
       }

lib/SILOptimizer/Transforms/VTableSpecializer.cpp

@@ -106,9 +106,6 @@ bool VTableSpecializer::specializeVTables(SILModule &module) {
 
 SILVTable *swift::specializeVTableForType(SILType classTy, SILModule &module,
                                 SILTransform *transform) {
-  if (!module.getASTContext().LangOpts.hasFeature(Feature::Embedded))
-    return nullptr;
-
   CanType astType = classTy.getASTType();
   BoundGenericClassType *genClassTy = dyn_cast<BoundGenericClassType>(astType);
   if (!genClassTy) return nullptr;
@@ -193,9 +190,6 @@ bool swift::specializeClassMethodInst(ClassMethodInst *cm) {
   SILFunction *f = cm->getFunction();
   SILModule &m = f->getModule();
 
-  if (!m.getASTContext().LangOpts.hasFeature(Feature::Embedded))
-    return false;
-
   SILValue instance = cm->getOperand();
   SILType classTy = instance->getType();
   CanType astType = classTy.getASTType();