android: Realign stack pointer on JNI entry.

base/android/jni_generator/golden_sample_for_tests_jni.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/example/jni_generator/SampleForTests
 
 #ifndef org_chromium_example_jni_generator_SampleForTests_JNI
@@ skipping 33 matching lines @@
 namespace base {
 namespace android {
 
 // Step 2: method stubs.
 
 static jlong Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     jcaller,
     const base::android::JavaParamRef<jstring>& param);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)

[Primiano Tucci (use gerrit), 2016/11/28 14:39:28]

maybe just #define ALIGN_STACK_X86 ... this once on the top and then use just a
macro here and below ?

[rmcilroy, 2016/11/28 15:21:56]

+1

+__attribute__((force_align_arg_pointer))
+#endif
 jlong Java_org_chromium_example_jni_1generator_SampleForTests_nativeInit(JNIEnv*
     env, jobject jcaller,
     jstring param) {
   return Init(env, base::android::JavaParamRef<jobject>(env, jcaller),
       base::android::JavaParamRef<jstring>(env, param));
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeDestroy(JNIEnv*
     env,
     jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "Destroy");
   return native->Destroy(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
 
 static jdouble GetDoubleFunction(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jdouble
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetDoubleFunction(JNIEnv*
     env, jobject jcaller) {
   return GetDoubleFunction(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
 
 static jfloat GetFloatFunction(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& jcaller);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jfloat
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetFloatFunction(JNIEnv*
     env, jclass jcaller) {
   return GetFloatFunction(env, base::android::JavaParamRef<jclass>(env,
       jcaller));
 }
 
 static void SetNonPODDatatype(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jobject>& rect);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeSetNonPODDatatype(JNIEnv*
     env, jobject jcaller,
     jobject rect) {
   return SetNonPODDatatype(env, base::android::JavaParamRef<jobject>(env,
       jcaller), base::android::JavaParamRef<jobject>(env, rect));
 }
 
 static base::android::ScopedJavaLocalRef<jobject> GetNonPODDatatype(JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jobject
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeGetNonPODDatatype(JNIEnv*
     env, jobject jcaller) {
   return GetNonPODDatatype(env, base::android::JavaParamRef<jobject>(env,
       jcaller)).Release();
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethod(JNIEnv*
     env,
     jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
   return native->Method(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jdouble
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethodOtherP0(JNIEnv*
     env,
     jobject jcaller,
     jlong nativePtr) {
   CPPClass::InnerClass* native =
       reinterpret_cast<CPPClass::InnerClass*>(nativePtr);
   CHECK_NATIVE_PTR(env, jcaller, native, "MethodOtherP0", 0);
   return native->MethodOtherP0(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeAddStructB(JNIEnv*
     env,
     jobject jcaller,
     jlong nativeCPPClass,
     jobject b) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "AddStructB");
   return native->AddStructB(env, base::android::JavaParamRef<jobject>(env,
       jcaller), base::android::JavaParamRef<jobject>(env, b));
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 void
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeIterateAndDoSomethingWithStructB(JNIEnv*
     env,
     jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "IterateAndDoSomethingWithStructB");
   return native->IterateAndDoSomethingWithStructB(env,
       base::android::JavaParamRef<jobject>(env, jcaller));
 }
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jstring
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeReturnAString(JNIEnv*
     env,
     jobject jcaller,
     jlong nativeCPPClass) {
   CPPClass* native = reinterpret_cast<CPPClass*>(nativeCPPClass);
   CHECK_NATIVE_PTR(env, jcaller, native, "ReturnAString", NULL);
   return native->ReturnAString(env, base::android::JavaParamRef<jobject>(env,
       jcaller)).Release();
 }
 
 static jint GetInnerIntFunction(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& jcaller);
 
 extern "C" __attribute__((visibility("default")))
+#if defined(ARCH_CPU_X86)
+__attribute__((force_align_arg_pointer))
+#endif
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024InnerClass_nativeGetInnerIntFunction(JNIEnv*
     env, jclass jcaller) {
   return GetInnerIntFunction(env, base::android::JavaParamRef<jclass>(env,
       jcaller));
 }
 
 static base::subtle::AtomicWord g_SampleForTests_javaMethod = 0;
 static jint Java_SampleForTests_javaMethod(JNIEnv* env, const
     base::android::JavaRefOrBare<jobject>& obj, JniIntWrapper foo,
@@ skipping 327 matching lines @@
     return false;
   }
 
   return true;
 }
 
 }  // namespace android
 }  // namespace base
 
 #endif  // org_chromium_example_jni_generator_SampleForTests_JNI