summaryrefslogtreecommitdiff
path: root/test/MultiDex/Second.java
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2019-10-18 15:00:00 -0700
committerNick Desaulniers <ndesaulniers@google.com>2019-10-21 23:39:36 +0000
commit776d0015730e1c00c86119a5db2fe606867ae3a7 (patch)
treee84e848c7cd108fc2be2a46576f4b6b93ae70c6c /test/MultiDex/Second.java
parenta7239b55d3eeba68b84414eba2a3869dca56b916 (diff)
[art] fix -Wreorder-init-list for jvmtiEventCallbacks
C++2a adds support for designated initialization, but would like member order to match that of the aggregate definition (due to side effects of the expressions in the designated initializer). The FOR_ALL_SUPPORTED_EVENTS macro is implemented in terms of the FOR_ALL_SUPPORTED_JNI_EVENTS and FOR_ALL_SUPPORTED_NO_JNI_EVENTS macros that clearly delineate between which members of jvmtiEventCallbacks have JNI events or not. The declaration of this struct intersperses the members with this distinction. We can reorder the JNI events, but we still have a problem with FOR_ALL_SUPPORTED_EVENTS which would try to intersperse them in the wrong order. It seems that the `fun` macro parameter only differs for GENERATE_LOG_FUNCTION_{NO_}JNI. We can change the FOR_ALL_SUPPORTED_JNI_EVENTS macro to accept 2 functions, one for JNI events, and one for non-JNI events. We can then order the members correctly, and specify differing arguments at the macro expansion sites (of FOR_ALL_SUPPORTED_JNI_EVENTS) if needed, otherwise we can specify the same parameter twice (small price to pay for member order). Bug: 139945549 Test: mm Change-Id: I4636b0b08747fe63c8f68e87bd24e4a38d58ffff
Diffstat (limited to 'test/MultiDex/Second.java')
0 files changed, 0 insertions, 0 deletions