Re: emacs-29 ec4d29c4494: Improve performance of treesit_cursor_helper_1

Re: emacs-29 ec4d29c4494: Improve performance of treesit_cursor_helper_1

[Corwin Brust]

[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]

On Wed, Aug 30, 2023 at 11:24 PM Yuan Fu <casouri@gmail.com> wrote:
>
> branch: emacs-29
> commit ec4d29c4494f32acf0ff7c5632a1d951d957f084
> Author: Yuan Fu <casouri@gmail.com>
> Commit: Yuan Fu <casouri@gmail.com>
>
>     Improve performance of treesit_cursor_helper_1
>
>     * src/treesit.c: (treesit_cursor_helper_1): Use

> -  if (!ts_tree_cursor_goto_first_child (cursor))
> +  if (ts_tree_cursor_goto_first_child_for_byte (cursor, start_pos) == -1)

Hi Yuan,

I think this commit may have broken things for the Windows port.

Running configure I now get:

C:/msys2/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/11.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe:
treesit.o:treesit.c:(.text+0xce2): undefined reference to
`ts_tree_cursor_goto_first_child_for_byte'

Interestingly, it does seem to exist in
mingw32/mingw-w64-i686-tree-sitter 0.20.6-1 (current, according to
pacman -Ss tree-sitter):

Function Name Address Relative Address Ordinal Filename Full Path Type
ts_tree_cursor_goto_first_child_for_byte 0x00000002c62ef550 0x0001f550
179 (0xb3) libtree-sitter.dll C:\msys2\mingw64\bin\libtree-sitter.dll
Exported Function

I've attached the complete log, here's my configure command. which
followed a git clean -xf && ./autogen.sh:

 ./configure --enable-checking='yes,glyphs'
--enable-check-lisp-object-type --with-modules --without-dbus
--with-native-compilation=aot --without-compress-install
--with-tree-sitter CFLAGS='-O0 -g3' | tee /g/quick.log

[-- Attachment #2: quick.zip --]
[-- Type: application/x-zip-compressed, Size: 6398 bytes --]

Re: emacs-29 ec4d29c4494: Improve performance of treesit_cursor_helper_1

[Yuan Fu]

> On Aug 31, 2023, at 2:23 PM, Corwin Brust <corwin@bru.st> wrote:
> 
> On Wed, Aug 30, 2023 at 11:24 PM Yuan Fu <casouri@gmail.com> wrote:
>> 
>> branch: emacs-29
>> commit ec4d29c4494f32acf0ff7c5632a1d951d957f084
>> Author: Yuan Fu <casouri@gmail.com>
>> Commit: Yuan Fu <casouri@gmail.com>
>> 
>>    Improve performance of treesit_cursor_helper_1
>> 
>>    * src/treesit.c: (treesit_cursor_helper_1): Use
> 
>> -  if (!ts_tree_cursor_goto_first_child (cursor))
>> +  if (ts_tree_cursor_goto_first_child_for_byte (cursor, start_pos) == -1)
> 
> Hi Yuan,
> 
> I think this commit may have broken things for the Windows port.
> 
> Running configure I now get:
> 
> C:/msys2/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/11.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe:
> treesit.o:treesit.c:(.text+0xce2): undefined reference to
> `ts_tree_cursor_goto_first_child_for_byte'
> 
> Interestingly, it does seem to exist in
> mingw32/mingw-w64-i686-tree-sitter 0.20.6-1 (current, according to
> pacman -Ss tree-sitter):
> 
> Function Name Address Relative Address Ordinal Filename Full Path Type
> ts_tree_cursor_goto_first_child_for_byte 0x00000002c62ef550 0x0001f550
> 179 (0xb3) libtree-sitter.dll C:\msys2\mingw64\bin\libtree-sitter.dll
> Exported Function
> 
> I've attached the complete log, here's my configure command. which
> followed a git clean -xf && ./autogen.sh:
> 
> ./configure --enable-checking='yes,glyphs'
> --enable-check-lisp-object-type --with-modules --without-dbus
> --with-native-compilation=aot --without-compress-install
> --with-tree-sitter CFLAGS='-O0 -g3' | tee /g/quick.log
> <quick.zip>

I forgot to add window boilerplate for tree-sitter functions again. I pushed a fix to emacs-29. I’m very sorry :-(

Yuan

Re: emacs-29 ec4d29c4494: Improve performance of treesit_cursor_helper_1

[Corwin Brust]

On Thu, Aug 31, 2023 at 9:07 PM Yuan Fu <casouri@gmail.com> wrote:
>

>
> I pushed a fix to emacs-29. I’m very sorry :-(

Thank you so much for the quick fix!

>
> Yuan