1186561 - add #include <vector> to a protobuf header to workaround problems on Android

Status: RESOLVED FIXED

(Toolkit :: General, defect)

Description

[Nathan Froyd [:froydnj]]

Compiling Gecko with libc++ and GCC 4.9 on Android runs into a problem.
The protobuf #includes and libc++ result in preprocessed code that looks
something like:

/* via <iterator> */

namespace std {
namespace __1 {
}
using namespace __1 __attribute__((__strong__));
}

namespace std { namespace __1 {
template <class _Iter>
class __wrap_iter
{
  ...
  template <class _Tp, class _Alloc> friend class vector;
  ...
};

} // namespace __1
} // namespace std

/* via <vector> */

namespace std { namespace __1 {

template <class _Tp, class _Alloc>
class _LIBCPP_TYPE_VIS_ONLY vector : ...
{ ... };

} // namespace __1
} // namespace std

and the problem is that GCC doesn't understand that the forward
declaration of vector inside __wrap_iter is forward-declaring the actual
vector class; it thinks it's declaring something else.

Hacking <iterator> to include _LIBCPP_TYPE_VIS_ONLY for the forward
declaration doesn't help.  What does help is including <vector> earlier
than <iterator>, so the __wrap_iter forward declaration picks up the
correct definition of std::vector, and makes everything happy.  It's
possible that there are other places that could get this same treatment,
but this one place was the only one I needed to modify to make things
go.

Comment 1

[Nathan Froyd [:froydnj]]

Attachment: add #include <vector> to a protobuf header to workaround problems on Android

fitzgen was the last person to touch protobuf stuff, so he gets to review this!

I'll update the Bug XXXXXX bits in the actual patch to reflect what bug # this
is before committing.  I won't pretend this is a pretty solution, but it is
minimally invasive, and the m-c-changes.patch appears to have prior art in its
modifications to wire_format_lite.h.

Comment 2

[Nick Fitzgerald [:fitzgen] [⏰PST; UTC-8]]

Comment on attachment 8637383 [details] [diff] [review]
add #include <vector> to a protobuf header to workaround problems on Android

Review of attachment 8637383 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks for the detailed comments! With that provided context, this seems rather straightforward.

Comment 3

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/3caca87b85d7

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/3caca87b85d7