[embedded] add test for calling methods on classes, fix layout

Author: kubamracek

lib/IRGen/ClassMetadataVisitor.h

@@ -68,6 +68,14 @@ template <class Impl> class ClassMetadataVisitor
     static_assert(MetadataAdjustmentIndex::Class == 3,
                   "Adjustment index must be synchronized with this layout");
 
+    if (IGM.Context.LangOpts.hasFeature(Feature::Embedded)) {
+      asImpl().noteAddressPoint();
+      asImpl().addSuperclass();
+      asImpl().addDestructorFunction();
+      addEmbeddedClassMembers(Target);
+      return;
+    }
+
     // Pointer to layout string
     asImpl().addLayoutStringPointer();
 
@@ -99,13 +107,6 @@ template <class Impl> class ClassMetadataVisitor
     addClassMembers(Target, Target);
   }
 
-  void embeddedLayout() {
-    asImpl().noteAddressPoint();
-    asImpl().addSuperclass();
-    asImpl().addDestructorFunction();
-    addEmbeddedClassMembers(Target);
-  }
-
   /// Notes the beginning of the field offset vector for a particular ancestor
   /// of a generic-layout class.
   void noteStartOfFieldOffsets(ClassDecl *whichClass) {}

lib/IRGen/GenMeta.cpp

@@ -3949,6 +3949,12 @@ namespace {
     }
 
     void addDestructorFunction() {
+      if (IGM.Context.LangOpts.hasFeature(Feature::Embedded)) {
+        auto dtorRef = SILDeclRef(Target->getDestructor(), SILDeclRef::Kind::Deallocator);
+        addReifiedVTableEntry(dtorRef);
+        return;
+      }      
+
       if (asImpl().getFieldLayout().hasObjCImplementation())
         return;
 
@@ -4969,8 +4975,8 @@ void irgen::emitClassMetadata(IRGenModule &IGM, ClassDecl *classDecl,
 
 void irgen::emitEmbeddedClassMetadata(IRGenModule &IGM, ClassDecl *classDecl,
                                       const ClassLayout &fragileLayout) {
-  assert(!classDecl->isForeign());
   PrettyStackTraceDecl stackTraceRAII("emitting metadata for", classDecl);
+  assert(!classDecl->isForeign());
 
   // Set up a dummy global to stand in for the metadata object while we produce
   // relative references.
@@ -4984,7 +4990,7 @@ void irgen::emitEmbeddedClassMetadata(IRGenModule &IGM, ClassDecl *classDecl,
 
   FixedClassMetadataBuilder metadataBuilder(IGM, classDecl, init,
                                             fragileLayout);
-  metadataBuilder.embeddedLayout();
+  metadataBuilder.layout();
   bool canBeConstant = metadataBuilder.canBeConstant();
   metadataBuilder.createMetadataAccessFunction();
 
@@ -4994,6 +5000,7 @@ void irgen::emitEmbeddedClassMetadata(IRGenModule &IGM, ClassDecl *classDecl,
   bool isPattern = false;
   auto var = IGM.defineTypeMetadata(declaredType, isPattern, canBeConstant,
                                     init.finishAndCreateFuture(), section);
+  (void)var;
 }
 
 void irgen::emitSpecializedGenericClassMetadata(IRGenModule &IGM, CanType type,

test/embedded/classes-methods-no-stdlib.swift

@@ -0,0 +1,37 @@
+// RUN: %target-swift-emit-ir %s -parse-stdlib -enable-experimental-feature Embedded -target arm64e-apple-none | %FileCheck %s
+
+public class MyClass {
+  func foo() { }
+  func bar() { }
+}
+
+public class MySubClass: MyClass {
+  override func foo() { }
+}
+
+// CHECK: @"$s4main7MyClassCN" = {{.*}}<{ ptr, ptr, ptr, ptr, ptr }> <{ ptr null, ptr @"$s4main7MyClassCfD", ptr @"$s4main7MyClassC3fooyyF", ptr @"$s4main7MyClassC3baryyF", ptr @"$s4main7MyClassCACycfC" }>
+// CHECK: @"$s4main10MySubClassCN" = {{.*}}<{ ptr, ptr, ptr, ptr, ptr }> <{ ptr @"$s4main7MyClassCN", ptr @"$s4main10MySubClassCfD", ptr @"$s4main10MySubClassC3fooyyF", ptr @"$s4main7MyClassC3baryyF", ptr @"$s4main10MySubClassCACycfC" }>
+
+// CHECK: define {{.*}}void @"$s4main4test1xyAA7MyClassC_tF"(ptr %0)
+public func test(x: MyClass) {
+
+  x.foo() // goes through the vtable
+  // CHECK: %1 = load ptr, ptr %0
+  // CHECK: %2 = getelementptr inbounds ptr, ptr %1, i64 2
+  // CHECK: %3 = load ptr, ptr %2
+  // CHECK: call swiftcc void %3(ptr swiftself %0)
+
+  x.bar() // does not go through the vtable
+  // CHECK: call swiftcc void @"$s4main7MyClassC3baryyF"
+
+  let y = MySubClass()
+  // CHECK: call swiftcc %swift.metadata_response @"$s4main10MySubClassCMa"
+  // CHECK: call swiftcc ptr @"$s4main10MySubClassCACycfC"
+
+  y.foo() // does not go through the vtable
+  // CHECK: call swiftcc void @"$s4main10MySubClassC3fooyyF"
+
+  y.bar() // does not go through the vtable
+  // CHECK: call swiftcc void @"$s4main7MyClassC3baryyF"
+
+}

test/embedded/classes-no-stdlib.swift

@@ -1,8 +1,5 @@
 // RUN: %target-swift-emit-ir %s -parse-stdlib -enable-experimental-feature Embedded -target arm64e-apple-none | %FileCheck %s
 
-// TODO: investigate why windows is generating more metadata.
-// XFAIL: OS=windows-msvc
-
 public class MyClass {}
 
 // CHECK-DAG: @"$s4main7MyClassCN" = {{.*}}<{ ptr, ptr, ptr }> <{ ptr null, ptr @"$s4main7MyClassCfD", ptr @"$s4main7MyClassCACycfC" }>