Merge branch 'main' into kabir/wasm-plugins

kabiroberai · kabiroberai · commit 4a58104c6edf · 2024-04-24T18:22:19.000-04:00
diff --git a/Sources/SwiftCompilerPlugin/CompilerPlugin.swift b/Sources/SwiftCompilerPlugin/CompilerPlugin.swift
@@ -96,7 +96,12 @@ extension CompilerPlugin {
       }
     }
 
-    let pluginPath = CommandLine.arguments.first ?? "<unknown>"
+    let pluginPath: String
+    if CommandLine.argc > 0, let cPluginPath = CommandLine.unsafeArgv[0] {
+      pluginPath = String(cString: cPluginPath)
+    } else {
+      pluginPath = "<unknown>"
+    }
     throw CompilerPluginError(
       message:
         "macro implementation type '\(moduleName).\(typeName)' could not be found in executable plugin '\(pluginPath)'"

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,12 @@ extension CompilerPlugin {`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`		`- let pluginPath = CommandLine.arguments.first ?? "<unknown>"`
	`99`	`+ let pluginPath: String`
	`100`	`+ if CommandLine.argc > 0, let cPluginPath = CommandLine.unsafeArgv[0] {`
	`101`	`+ pluginPath = String(cString: cPluginPath)`
	`102`	`+ } else {`
	`103`	`+ pluginPath = "<unknown>"`
	`104`	`+ }`
`100`	`105`	`throw CompilerPluginError(`
`101`	`106`	`message:`
`102`	`107`	`"macro implementation type '\(moduleName).\(typeName)' could not be found in executable plugin '\(pluginPath)'"`