android: Realign stack pointer on JNI entry.

base/android/jni_generator/golden_sample_for_tests_jni.h

Index: base/android/jni_generator/golden_sample_for_tests_jni.h
diff --git a/base/android/jni_generator/golden_sample_for_tests_jni.h b/base/android/jni_generator/golden_sample_for_tests_jni.h
index 94fc6b0c5ba682d9724f10c8e5b2bb308d5b3d52..71f7b657fc62cd7ba3919c3e3e8e36873d120517 100644
--- a/base/android/jni_generator/golden_sample_for_tests_jni.h
+++ b/base/android/jni_generator/golden_sample_for_tests_jni.h
@@ -51,6 +51,9 @@ static jlong Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     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) {
@@ -59,6 +62,9 @@ jlong Java_org_chromium_example_jni_1generator_SampleForTests_nativeInit(JNIEnv*
 }
 
 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,
@@ -74,6 +80,9 @@ 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) {
@@ -85,6 +94,9 @@ 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) {
@@ -97,6 +109,9 @@ static void SetNonPODDatatype(JNIEnv* env, const
     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,
@@ -109,6 +124,9 @@ 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) {
@@ -117,6 +135,9 @@ jobject
 }
 
 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,
@@ -129,6 +150,9 @@ jint
 }
 
 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,
@@ -142,6 +166,9 @@ jdouble
 }
 
 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,
@@ -155,6 +182,9 @@ void
 }
 
 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,
@@ -167,6 +197,9 @@ void
 }
 
 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,
@@ -182,6 +215,9 @@ 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) {