From fdc55201c813799f4314fec7c78cc123ed816960 Mon Sep 17 00:00:00 2001
From: Jakob Lykke Andersen <Jakob@caput.dk>
Date: Sun, 15 Mar 2020 00:08:27 +0100
Subject: [PATCH] C, add __int64 as a fundamental type

---
 sphinx/domains/c.py                 | 19 +++++++++----------
 tests/roots/test-domain-c/index.rst |  6 ++++++
 tests/test_domain_c.py              |  4 ++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py
index 3a65c9b85..a1c96afe5 100644
--- a/sphinx/domains/c.py
+++ b/sphinx/domains/c.py
@@ -1889,8 +1889,9 @@ class Symbol:
 class DefinitionParser(BaseParser):
     # those without signedness and size modifiers
     # see https://en.cppreference.com/w/cpp/language/types
-    _simple_fundemental_types = (
+    _simple_fundamental_types = (
         'void', '_Bool', 'bool', 'char', 'int', 'float', 'double',
+        '__int64',
     )
 
     _prefix_keys = ('struct', 'enum', 'union')
@@ -2357,9 +2358,9 @@ class DefinitionParser(BaseParser):
         return ASTNestedName(names, rooted)
 
     def _parse_trailing_type_spec(self) -> Any:
-        # fundemental types
+        # fundamental types
         self.skip_ws()
-        for t in self._simple_fundemental_types:
+        for t in self._simple_fundamental_types:
             if self.skip_word(t):
                 return ASTTrailingTypeSpecFundamental(t)
 
@@ -2382,6 +2383,8 @@ class DefinitionParser(BaseParser):
             elements.append('int')
         elif self.skip_word_and_ws('double'):
             elements.append('double')
+        elif self.skip_word_and_ws('__int64'):
+            elements.append('__int64')
         if len(elements) > 0:
             return ASTTrailingTypeSpecFundamental(' '.join(elements))
 
@@ -3205,6 +3208,9 @@ class CDomain(Domain):
             print(self.data['root_symbol'].dump(0))
             print("process_doc end:", docname)
 
+    def process_field_xref(self, pnode: pending_xref) -> None:
+        pnode.attributes.update(self.env.ref_context)
+
     def merge_domaindata(self, docnames: List[str], otherdata: Dict) -> None:
         if Symbol.debug_show_tree:
             print("merge_domaindata:")
@@ -3239,13 +3245,6 @@ class CDomain(Domain):
 
         warner = Warner()
 
-        # strip pointer asterisk
-        target = target.rstrip(' *')
-
-        # becase TypedField can generate xrefs
-        if target in _keywords:
-            raise NoUri(target, typ)
-
         parser = DefinitionParser(target, warner)
         try:
             name = parser.parse_xref_object()
diff --git a/tests/roots/test-domain-c/index.rst b/tests/roots/test-domain-c/index.rst
index 1265b7967..22c3bd9e5 100644
--- a/tests/roots/test-domain-c/index.rst
+++ b/tests/roots/test-domain-c/index.rst
@@ -6,6 +6,12 @@ directives
 
 .. c:function:: int hello(char *name)
 
+   :rtype: int
+
+.. c:function:: MyStruct hello2(char *name)
+
+   :rtype: MyStruct
+
 .. c:member:: float Sphinx.version
 .. c:var:: int version
 
diff --git a/tests/test_domain_c.py b/tests/test_domain_c.py
index df3126d38..d00e2cfa8 100644
--- a/tests/test_domain_c.py
+++ b/tests/test_domain_c.py
@@ -108,6 +108,8 @@ def test_expressions():
     exprCheck('int *restrict*')
     exprCheck('int *(*)(double)')
     exprCheck('const int*')
+    exprCheck('__int64')
+    exprCheck('unsigned __int64')
 
     # actual expressions
 
@@ -260,6 +262,8 @@ def test_member_definitions():
     check('member', 'double a', {1: 'a'})
 
     check('member', 'unsigned long a', {1: 'a'})
+    check('member', '__int64 a', {1: 'a'})
+    check('member', 'unsigned __int64 a', {1: 'a'})
 
     check('member', 'int .a', {1: 'a'})