review followup: assertion message

ktoso · ktoso · commit b9fd0a442867 · 2025-07-17T12:30:16.000+09:00
diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift
@@ -356,9 +356,8 @@ extension JNISwift2JavaGenerator {
       }
       assert(\(selfPointerParam.name) != 0, "\(selfPointerParam.name) memory address was null")
       let selfBits$ = Int(Int64(fromJNI: \(selfPointerParam.name), in: env$))
-      assert(selfBits$ != 0, "$self memory address was null: \(selfPointerParam.name) = \\(\(selfPointerParam.name))" )
       guard let \(newSelfParamName) = UnsafeMutablePointer<\(swiftParentName)>(bitPattern: selfBits$) else {
-        fatalError("Missing self pointer in call to \\(#function)!")
+        fatalError("self memory address was null in call to \\(#function)!")
       }
       """
     )
diff --git a/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift b/Tests/JExtractSwiftTests/JNI/JNIClassTests.swift
@@ -212,9 +212,8 @@ struct JNIClassTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           self$.deinitialize(count: 1)
           self$.deallocate()
@@ -266,9 +265,8 @@ struct JNIClassTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           self$.pointee.doSomething(x: Int64(fromJNI: x, in: environment!))
         }
diff --git a/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift b/Tests/JExtractSwiftTests/JNI/JNIStructTests.swift
@@ -144,9 +144,8 @@ struct JNIStructTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyStruct>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           self$.deinitialize(count: 1)
           self$.deallocate()
@@ -198,9 +197,8 @@ struct JNIStructTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyStruct>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           self$.pointee.doSomething(x: Int64(fromJNI: x, in: environment!))
         }
diff --git a/Tests/JExtractSwiftTests/JNI/JNIVariablesTests.swift b/Tests/JExtractSwiftTests/JNI/JNIVariablesTests.swift
@@ -74,9 +74,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           let result = self$.pointee.constant
           return result.getJNIValue(in: environment)
@@ -144,9 +143,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           let result = self$.pointee.mutable
           return result.getJNIValue(in: environment)
@@ -160,9 +158,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           self$.pointee.mutable = Int64(fromJNI: newValue, in: environment!)
         }
@@ -214,9 +211,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
 
           let result = self$.pointee.computed
@@ -270,9 +266,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
 
           do {
@@ -346,9 +341,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
 
           let result = self$.pointee.getterAndSetter
@@ -363,9 +357,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
 
           self$.pointee.getterAndSetter = Int64(fromJNI: newValue, in: environment!)
@@ -433,9 +426,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           let result = self$.pointee.someBoolean
           return result.getJNIValue(in: environment)
@@ -449,9 +441,8 @@ struct JNIVariablesTests {
           }
           assert(selfPointer != 0, "selfPointer memory address was null")
           let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))
-          assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )
           guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {
-            fatalError("Missing self pointer in call to \\(#function)!")
+            fatalError("self memory address was null in call to \\(#function)!")
           }
           self$.pointee.someBoolean = Bool(fromJNI: newValue, in: environment!)
         }

Original file line number	Diff line number	Diff line change
`@@ -356,9 +356,8 @@ extension JNISwift2JavaGenerator {`
`356`	`356`	`}`
`357`	`357`	`assert(\(selfPointerParam.name) != 0, "\(selfPointerParam.name) memory address was null")`
`358`	`358`	`let selfBits$ = Int(Int64(fromJNI: \(selfPointerParam.name), in: env$))`
`359`		`- assert(selfBits$ != 0, "$self memory address was null: \(selfPointerParam.name) = \\(\(selfPointerParam.name))" )`
`360`	`359`	`guard let \(newSelfParamName) = UnsafeMutablePointer<\(swiftParentName)>(bitPattern: selfBits$) else {`
`361`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`360`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`362`	`361`	`}`
`363`	`362`	`"""`
`364`	`363`	`)`
Original file line number	Diff line number	Diff line change
`@@ -212,9 +212,8 @@ struct JNIClassTests {`
`212`	`212`	`}`
`213`	`213`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`214`	`214`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`215`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`216`	`215`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`217`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`216`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`218`	`217`	`}`
`219`	`218`	`self$.deinitialize(count: 1)`
`220`	`219`	`self$.deallocate()`
`@@ -266,9 +265,8 @@ struct JNIClassTests {`
`266`	`265`	`}`
`267`	`266`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`268`	`267`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`269`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`270`	`268`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`271`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`269`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`272`	`270`	`}`
`273`	`271`	`self$.pointee.doSomething(x: Int64(fromJNI: x, in: environment!))`
`274`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,9 +144,8 @@ struct JNIStructTests {`
`144`	`144`	`}`
`145`	`145`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`146`	`146`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`147`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`148`	`147`	`guard let self$ = UnsafeMutablePointer<MyStruct>(bitPattern: selfBits$) else {`
`149`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`148`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`150`	`149`	`}`
`151`	`150`	`self$.deinitialize(count: 1)`
`152`	`151`	`self$.deallocate()`
`@@ -198,9 +197,8 @@ struct JNIStructTests {`
`198`	`197`	`}`
`199`	`198`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`200`	`199`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`201`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`202`	`200`	`guard let self$ = UnsafeMutablePointer<MyStruct>(bitPattern: selfBits$) else {`
`203`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`201`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`204`	`202`	`}`
`205`	`203`	`self$.pointee.doSomething(x: Int64(fromJNI: x, in: environment!))`
`206`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,8 @@ struct JNIVariablesTests {`
`74`	`74`	`}`
`75`	`75`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`76`	`76`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`77`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`78`	`77`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`79`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`78`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`80`	`79`	`}`
`81`	`80`	`let result = self$.pointee.constant`
`82`	`81`	`return result.getJNIValue(in: environment)`
`@@ -144,9 +143,8 @@ struct JNIVariablesTests {`
`144`	`143`	`}`
`145`	`144`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`146`	`145`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`147`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`148`	`146`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`149`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`147`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`150`	`148`	`}`
`151`	`149`	`let result = self$.pointee.mutable`
`152`	`150`	`return result.getJNIValue(in: environment)`
`@@ -160,9 +158,8 @@ struct JNIVariablesTests {`
`160`	`158`	`}`
`161`	`159`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`162`	`160`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`163`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`164`	`161`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`165`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`162`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`166`	`163`	`}`
`167`	`164`	`self$.pointee.mutable = Int64(fromJNI: newValue, in: environment!)`
`168`	`165`	`}`
`@@ -214,9 +211,8 @@ struct JNIVariablesTests {`
`214`	`211`	`}`
`215`	`212`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`216`	`213`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`217`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`218`	`214`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`219`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`215`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`220`	`216`	`}`
`221`	`217`
`222`	`218`	`let result = self$.pointee.computed`
`@@ -270,9 +266,8 @@ struct JNIVariablesTests {`
`270`	`266`	`}`
`271`	`267`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`272`	`268`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`273`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`274`	`269`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`275`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`270`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`276`	`271`	`}`
`277`	`272`
`278`	`273`	`do {`
`@@ -346,9 +341,8 @@ struct JNIVariablesTests {`
`346`	`341`	`}`
`347`	`342`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`348`	`343`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`349`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`350`	`344`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`351`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`345`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`352`	`346`	`}`
`353`	`347`
`354`	`348`	`let result = self$.pointee.getterAndSetter`
`@@ -363,9 +357,8 @@ struct JNIVariablesTests {`
`363`	`357`	`}`
`364`	`358`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`365`	`359`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`366`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`367`	`360`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`368`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`361`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`369`	`362`	`}`
`370`	`363`
`371`	`364`	`self$.pointee.getterAndSetter = Int64(fromJNI: newValue, in: environment!)`
`@@ -433,9 +426,8 @@ struct JNIVariablesTests {`
`433`	`426`	`}`
`434`	`427`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`435`	`428`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`436`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`437`	`429`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`438`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`430`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`439`	`431`	`}`
`440`	`432`	`let result = self$.pointee.someBoolean`
`441`	`433`	`return result.getJNIValue(in: environment)`
`@@ -449,9 +441,8 @@ struct JNIVariablesTests {`
`449`	`441`	`}`
`450`	`442`	`assert(selfPointer != 0, "selfPointer memory address was null")`
`451`	`443`	`let selfBits$ = Int(Int64(fromJNI: selfPointer, in: env$))`
`452`		`- assert(selfBits$ != 0, "$self memory address was null: selfPointer = \\(selfPointer)" )`
`453`	`444`	`guard let self$ = UnsafeMutablePointer<MyClass>(bitPattern: selfBits$) else {`
`454`		`- fatalError("Missing self pointer in call to \\(#function)!")`
	`445`	`+ fatalError("self memory address was null in call to \\(#function)!")`
`455`	`446`	`}`
`456`	`447`	`self$.pointee.someBoolean = Bool(fromJNI: newValue, in: environment!)`
`457`	`448`	`}`