Orfox bustage on tor-browser-52.7.3esr-8.0-1

added TorBrowserTeam201805R component::applications/tor browser owner::tbb-team priority::high resolution::fixed severity::normal status::closed tbb-mobile type::defect labels

This is because:

 0:28.10 In file included from /home/sysrqb/Orfox/external/tor-browser/intl/hyphenation/glue/hnjstdio.cpp:11:0:
 0:28.10 /home/sysrqb/Orfox/external/tor-browser/intl/hyphenation/glue/hnjalloc.h:34:0: warning: "feof" redefined
 0:28.10  #define feof(file)            hnjFeof(file)
 0:28.10  ^
 0:28.10 In file included from /home/sysrqb/.mozbuild/android-ndk-r11b//sources/android/support/include/stdio.h:41:0,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/obj-tbb-arm-linux-androideabi/dist/system_wrappers/stdio.h:3,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/obj-tbb-arm-linux-androideabi/dist/include/mozilla/throw_gcc.h:13,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/obj-tbb-arm-linux-androideabi/dist/stl_wrappers/type_traits:66,
 0:28.10                  from /home/sysrqb/.mozbuild/android-ndk-r11b//sources/cxx-stl/llvm-libc++/libcxx/include/exception:81,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/obj-tbb-arm-linux-androideabi/dist/system_wrappers/exception:3,
 0:28.10                  from /home/sysrqb/.mozbuild/android-ndk-r11b//sources/cxx-stl/llvm-libc++/libcxx/include/new:68,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/obj-tbb-arm-linux-androideabi/dist/system_wrappers/new:3,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/obj-tbb-arm-linux-androideabi/dist/stl_wrappers/new:44,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/obj-tbb-arm-linux-androideabi/dist/include/mozilla/mozalloc.h:16,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/intl/hyphenation/glue/hnjalloc.h:13,
 0:28.10                  from /home/sysrqb/Orfox/external/tor-browser/intl/hyphenation/glue/hnjstdio.cpp:11:
 0:28.10 /home/sysrqb/.mozbuild/android-ndk-r11b/platforms/android-9/arch-arm/usr/include/stdio.h:367:0: note: this is the location of the previous definition
 0:28.10  #define feof(p)  __sfeof(p)

and

#ifdef feof
inline _LIBCPP_INLINE_VISIBILITY int __libcpp_feof(FILE* __stream) {return feof(__stream);}
#undef feof
inline _LIBCPP_INLINE_VISIBILITY int feof(FILE* __stream) {return __libcpp_feof(__stream);}
#endif  // feof

in /home/sysrqb/.mozbuild/android-ndk-r11b//sources/cxx-stl/llvm-libc++/libcxx/include/cstdio

Trac:
Summary: Orfox bustage on Alpha branch to Orfox bustage on tor-browser-52.7.3esr-8.0-1

Looks like this came in from upstream

commit 0e1e49d4971bb891152c93b8b62665f24bd8a0c2
Author: Jonathan Kew <jkew@mozilla.com>
Date:   Wed Mar 28 10:17:51 2018 +0100

    Bug 1448771 - Update hnjstdio to handle additional functions from stdio.h that libhyphen wants to use. r=glandium, a=RyanVM
    
    --HG--
    extra : source : 846bcaa210aa2264bec412c0595113964fafc972

Right, so this patch redefines feof() and changes the function signature (feof(FILE*) -> feof(hnjFile*)), and it seems there isn't a conversion between FILE and hnjFile. Fun.

diff --git a/intl/hyphenation/glue/hnjalloc.h b/intl/hyphenation/glue/hnjalloc.h
index fec3a4b..5cee1be1 100644
--- a/intl/hyphenation/glue/hnjalloc.h
+++ b/intl/hyphenation/glue/hnjalloc.h
@@ -31,6 +31,8 @@
 #define fopen(path,mode)      hnjFopen(path,mode)
 #define fclose(file)          hnjFclose(file)
 #define fgets(buf,count,file) hnjFgets(buf,count,file)
+#define feof(file)            hnjFeof(file)
+#define fgetc(file)           hnjFgetc(file)
 
 typedef struct hnjFile_ hnjFile;
 
@@ -44,6 +46,10 @@ int hnjFclose(hnjFile* f);
 
 char* hnjFgets(char* s, int n, hnjFile* f);
 
+int hnjFeof(hnjFile* f);
+
+int hnjFgetc(hnjFile* f);
+
 #ifdef __cplusplus
 }
 #endif

The reason this isn't busted on Mozilla beta or alpha is because the newer Android NDK doesn't explicitly declare the signature.

$ grep -n feof /home/sysrqb/.mozbuild/android-ndk-r15c/sources/cxx-stl/llvm-libc++/include/cstdio
143:using ::feof;

Okay, easy fix.

On Android, the NDK (from LLVM) defines __libc_feof(FILE*) as a wrapper around feof(FILE*). Mozilla redefined feof as feof(hnjFile*), this caused a type mismatch because __libc_feof(FILE* f) then called feof(f) but f was the wrong type (FILE*, instead of hnjFile*). We can redefine __libc_feof the same way Mozilla redefined feof - using a C++ preprocessor.

The guards around the #define aren't strictly necessary, but I didn't want to introduce unnecessary changes on other platforms. We can delete them if that's preferred.

Branch bug25980 https://git.torproject.org/user/sysrqb/tor-browser.git

Trac:
Status: new to needs_review

Trac:
Keywords: N/A deleted, TorBrowserTeam201805R added

Looks reasonable to me, thanks. igt0: does the patch fix the Orfox build bustage for you as well?

Trac:
Status: needs_review to needs_information

Yes, I also ran the hyphenation reftests and the patch looks good. +1. Replying to gk:

Looks reasonable to me, thanks. igt0: does the patch fix the Orfox build bustage for you as well?

Thanks, cherry-picked to tor-browser-52.7.3esr-8.0-1 as commit d51742d0dd8364c20bb33a15cec5c2ae6d81f9b5.

Trac:
Status: needs_information to closed
Resolution: N/A to fixed

closed

moved to tpo/applications/tor-browser#25980 (closed)

Orfox bustage on tor-browser-52.7.3esr-8.0-1

Child items 0

Activity