cdecl lowering: move indirect returns after self

This is meant to match the existing thunk generation.

Author: DougGregor

Sources/JExtractSwift/CDeclLowering/Swift2JavaTranslator+FunctionLowering.swift

@@ -113,6 +113,13 @@ extension Swift2JavaTranslator {
       contentsOf: loweredParameters.flatMap { $0.cdeclParameters }
     )
 
+    // Lower self.
+    if let loweredSelf {
+      allLoweredParameters.append(loweredSelf)
+      cdeclLoweredParameters.append(contentsOf: loweredSelf.cdeclParameters)
+    }
+
+    // Lower indirect results.
     let cdeclResult: SwiftResult
     if indirectResult {
       cdeclLoweredParameters.append(
@@ -128,11 +135,6 @@ extension Swift2JavaTranslator {
       fatalError("Improper lowering of result for \(signature)")
     }
 
-    if let loweredSelf {
-      allLoweredParameters.append(loweredSelf)
-      cdeclLoweredParameters.append(contentsOf: loweredSelf.cdeclParameters)
-    }
-
     let cdeclSignature = SwiftFunctionSignature(
       selfParameter: nil,
       parameters: cdeclLoweredParameters,

Tests/JExtractSwiftTests/FunctionLoweringTests.swift

@@ -78,11 +78,11 @@ final class FunctionLoweringTests {
       enclosingType: "Point",
       expectedCDecl: """
       @_cdecl("c_shifted")
-      func c_shifted(_ delta_0: Double, _ delta_1: Double, _ _result: UnsafeMutableRawPointer, _ self: UnsafeRawPointer) {
+      func c_shifted(_ delta_0: Double, _ delta_1: Double, _ self: UnsafeRawPointer, _ _result: UnsafeMutableRawPointer) {
         _result.assumingMemoryBound(to: Point.self).pointee = self.assumingMemoryBound(to: Point.self).pointee.shifted(by: (delta_0, delta_1))
       }
       """,
-      expectedCFunction: "void c_shifted(double delta_0, double delta_1, void* _result, void const* self)"
+      expectedCFunction: "void c_shifted(double delta_0, double delta_1, void const* self, void* _result)"
     )
   }