Swift: Fix AvailabilitySpec trap generation

Author: jketema

swift/extractor/translators/StmtTranslator.cpp

@@ -36,9 +36,15 @@ void StmtTranslator::translateAndEmit(const swift::PoundAvailableInfo& availabil
 }
 
 void StmtTranslator::translateAndEmit(const swift::AvailabilitySpec& spec) {
-  // auto entry = dispatcher.createEntry(spec);
-  //  TODO: Swift 6.2 platform version/wildcard
-  // dispatcher.emit(entry);
+  auto entry = dispatcher.createEntry(spec);
+  entry.is_wildcard = spec.isWildcard();
+  if (!spec.isWildcard()) {
+    auto domain = spec.getDomainOrIdentifier().getAsDomain();
+    entry.platform =
+        swift::platformString(domain ? domain->getPlatformKind() : swift::PlatformKind::none).str();
+    entry.version = spec.getRawVersion().getAsString();
+  }
+  dispatcher.emit(entry);
 }
 
 codeql::BraceStmt StmtTranslator::translateBraceStmt(const swift::BraceStmt& stmt) {

swift/ql/.generated.list

@@ -1,22 +1,22 @@
-// generated by codegen/codegen.py, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `AvailabilitySpec`.
- *
- * INTERNAL: Do not use.
- */
-
 private import codeql.swift.generated.AvailabilitySpec
 
 /**
  * INTERNAL: This module contains the customizable definition of `AvailabilitySpec` and should not
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An availability spec, that is, part of an `AvailabilityInfo` condition. For example `iOS 12` and `*` in:
    * ```
    * if #available(iOS 12, *)
    * ```
    */
-  class AvailabilitySpec extends Generated::AvailabilitySpec { }
+  class AvailabilitySpec extends Generated::AvailabilitySpec {
+    override string toStringImpl() {
+      if this.isWildcard()
+      then result = "*"
+      else result = this.getPlatform() + " " + this.getVersion()
+    }
+  }
 }