From 59abd0e88b4aecad099f21d00afbb50a78edc4c5 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 25 Aug 2023 16:41:17 -0700
Subject: [PATCH] doc/go1.22: mention new #cgo directives

For #56378

Change-Id: I0c9c662c6d765cad6f7bf17fdd648db8d73e429b
Reviewed-on: https://go-review.googlesource.com/c/go/+/522937
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Bypass: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
---
 doc/go1.22.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/doc/go1.22.html b/doc/go1.22.html
index 1bf759a9a6..c32669b13a 100644
--- a/doc/go1.22.html
+++ b/doc/go1.22.html
@@ -37,6 +37,27 @@ Do not send CLs removing the interior tags from such phrases.
   TODO: complete this section, or delete if not needed
 </p>
 
+<h3 id="cgo">Cgo</h3>
+
+<p><!-- CL 497837 --> The special comment that precedes
+  <code>import</code> <code>"C"</code> may now include two
+  new <code>#cgo</code> directives.
+  <ul>
+    <li>
+      <code>#cgo</code> <code>noescape</code> <code>cFunctionName</code>
+      tells cgo that Go pointers passed to the C function
+      <code>cFunctionName</code> do not escape.
+    </li>
+    <li>
+      <code>#cgo</code> <code>nocallback</code> <code>cFunctionName</code>
+      tells cgo that the C function <code>cFunctionName</code> does
+      not call any Go functions.
+    </li>
+  </ul>
+  See <a href="/cmd/cgo#hdr-Optimizing_calls_of_C_code">the <code>cgo</code>
+  documentation</a> for more details.
+</p>
+
 <h2 id="runtime">Runtime</h2>
 
 <p>
-- 
2.50.0