LAYOUT

Author: rintaro

Sources/JExtractSwift/JavaConstants/ForeignValueLayouts.swift

@@ -12,7 +12,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import JavaTypes
 
 /// Represents a value of a `java.lang.foreign.Self` that we want to render in generated Java code.
@@ -22,18 +21,16 @@ public struct ForeignValueLayout: CustomStringConvertible, Equatable {
   var inlineComment: String?
   var value: String
 
-  var needsMemoryLayoutCall: Bool = false
-
   public init(inlineComment: String? = nil, javaConstant: String) {
     self.inlineComment = inlineComment
     self.value = "SwiftValueLayout.\(javaConstant)"
-    self.needsMemoryLayoutCall = false
   }
 
   public init(inlineComment: String? = nil, customType: String) {
     self.inlineComment = inlineComment
-    self.value = customType
-    self.needsMemoryLayoutCall = true
+    // When the type is some custom type, e.g. another Swift struct that we imported,
+    // we need to import its layout. We do this by referring $LAYOUT on it.
+    self.value = "\(customType).$LAYOUT"
   }
 
   public init?(javaType: JavaType) {
@@ -59,12 +56,6 @@ public struct ForeignValueLayout: CustomStringConvertible, Equatable {
 
     result.append(value)
 
-    // When the type is some custom type, e.g. another Swift struct that we imported,
-    // we need to import its layout. We do this by calling $LAYOUT() on it.
-    if needsMemoryLayoutCall {
-      result.append(".$LAYOUT()")
-    }
-
     return result
   }
 }

Sources/JExtractSwift/Swift2JavaTranslator+Printing.swift

@@ -288,10 +288,7 @@ extension Swift2JavaTranslator {
   private func printClassMemoryLayout(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
     printer.print(
       """
-      private static final GroupLayout $LAYOUT = (GroupLayout) SwiftValueWitnessTable.layoutOfSwiftType(TYPE_METADATA.$memorySegment());
-      public static final GroupLayout $LAYOUT() {
-          return $LAYOUT;
-      }
+      public static final GroupLayout $LAYOUT = (GroupLayout) SwiftValueWitnessTable.layoutOfSwiftType(TYPE_METADATA.$memorySegment());
       public final GroupLayout $layout() {
           return $LAYOUT;
       }

Tests/JExtractSwiftTests/ClassPrintingTests.swift

@@ -54,10 +54,7 @@ struct ClassPrintingTests {
           return TYPE_METADATA;
       }
 
-      private static final GroupLayout $LAYOUT = (GroupLayout) SwiftValueWitnessTable.layoutOfSwiftType(TYPE_METADATA.$memorySegment());
-      public static final GroupLayout $LAYOUT() {
-          return $LAYOUT;
-      }
+      public static final GroupLayout $LAYOUT = (GroupLayout) SwiftValueWitnessTable.layoutOfSwiftType(TYPE_METADATA.$memorySegment());
       public final GroupLayout $layout() {
           return $LAYOUT;
       }

Tests/JExtractSwiftTests/MethodImportTests.swift

@@ -304,7 +304,7 @@ final class MethodImportTests {
           super(() -> {
             var mh$ = swiftjava___FakeModule_MySwiftClass_init_len_cap.HANDLE;
             try {
-              MemorySegment _result = swiftArena$.allocate(MySwiftClass.$LAYOUT());
+              MemorySegment _result = swiftArena$.allocate(MySwiftClass.$LAYOUT);
               if (SwiftKit.TRACE_DOWNCALLS) {
                   SwiftKit.traceDowncall(len, cap, _result);
               }
@@ -352,7 +352,7 @@ final class MethodImportTests {
           super(() -> {
             var mh$ = swiftjava___FakeModule_MySwiftStruct_init_len_cap.HANDLE;
             try {
-              MemorySegment _result = swiftArena$.allocate(MySwiftStruct.$LAYOUT());
+              MemorySegment _result = swiftArena$.allocate(MySwiftStruct.$LAYOUT);
               if (SwiftKit.TRACE_DOWNCALLS) {
                 SwiftKit.traceDowncall(len, cap, _result);
               }