From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 10 Oct 2021 16:45:59 -0400 Subject: [PATCH] constify JNINativeMethod tables --- runtime/native/dalvik_system_BaseDexClassLoader.cc | 2 +- runtime/native/dalvik_system_DexFile.cc | 2 +- runtime/native/dalvik_system_VMDebug.cc | 2 +- runtime/native/dalvik_system_VMRuntime.cc | 2 +- runtime/native/dalvik_system_VMStack.cc | 2 +- runtime/native/dalvik_system_ZygoteHooks.cc | 2 +- runtime/native/java_lang_Class.cc | 2 +- runtime/native/java_lang_Object.cc | 2 +- runtime/native/java_lang_String.cc | 2 +- runtime/native/java_lang_StringFactory.cc | 2 +- runtime/native/java_lang_System.cc | 2 +- runtime/native/java_lang_Thread.cc | 2 +- runtime/native/java_lang_Throwable.cc | 2 +- runtime/native/java_lang_VMClassLoader.cc | 2 +- runtime/native/java_lang_invoke_MethodHandleImpl.cc | 2 +- runtime/native/java_lang_ref_FinalizerReference.cc | 2 +- runtime/native/java_lang_ref_Reference.cc | 2 +- runtime/native/java_lang_reflect_Array.cc | 2 +- runtime/native/java_lang_reflect_Constructor.cc | 2 +- runtime/native/java_lang_reflect_Executable.cc | 2 +- runtime/native/java_lang_reflect_Field.cc | 2 +- runtime/native/java_lang_reflect_Method.cc | 2 +- runtime/native/java_lang_reflect_Parameter.cc | 2 +- runtime/native/java_lang_reflect_Proxy.cc | 2 +- runtime/native/java_util_concurrent_atomic_AtomicLong.cc | 2 +- runtime/native/libcore_util_CharsetUtils.cc | 2 +- runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc | 2 +- runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc | 2 +- runtime/native/sun_misc_Unsafe.cc | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/runtime/native/dalvik_system_BaseDexClassLoader.cc b/runtime/native/dalvik_system_BaseDexClassLoader.cc index 607395d308..f3d84e57a8 100644 --- a/runtime/native/dalvik_system_BaseDexClassLoader.cc +++ b/runtime/native/dalvik_system_BaseDexClassLoader.cc @@ -58,7 +58,7 @@ static jobjectArray BaseDexClassLoader_computeClassLoaderContextsNative(JNIEnv* return result; } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { NATIVE_METHOD(BaseDexClassLoader, computeClassLoaderContextsNative, "()[Ljava/lang/String;"), }; diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index f8ad7f1b7a..b0f7cd8f17 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -913,7 +913,7 @@ static void DexFile_setTrusted(JNIEnv* env, jclass, jobject j_cookie) { } } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { NATIVE_METHOD(DexFile, closeDexFile, "(Ljava/lang/Object;)Z"), NATIVE_METHOD(DexFile, defineClassNative, diff --git a/runtime/native/dalvik_system_VMDebug.cc b/runtime/native/dalvik_system_VMDebug.cc index 5c8bd8431a..fdd0ad079d 100644 --- a/runtime/native/dalvik_system_VMDebug.cc +++ b/runtime/native/dalvik_system_VMDebug.cc @@ -489,7 +489,7 @@ static void VMDebug_setAllocTrackerStackDepth(JNIEnv* env, jclass, jint stack_de } } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { NATIVE_METHOD(VMDebug, countInstancesOfClass, "(Ljava/lang/Class;Z)J"), NATIVE_METHOD(VMDebug, countInstancesOfClasses, "([Ljava/lang/Class;Z)[J"), NATIVE_METHOD(VMDebug, dumpHprofData, "(Ljava/lang/String;I)V"), diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index 842590408d..8283f30995 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -506,7 +506,7 @@ static jboolean VMRuntime_isValidClassLoaderContext(JNIEnv* env, return ClassLoaderContext::IsValidEncoding(encoded_class_loader_context.c_str()); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(VMRuntime, addressOf, "(Ljava/lang/Object;)J"), NATIVE_METHOD(VMRuntime, bootClassPath, "()Ljava/lang/String;"), NATIVE_METHOD(VMRuntime, clampGrowthLimit, "()V"), diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc index e88516e248..58e40f6e8a 100644 --- a/runtime/native/dalvik_system_VMStack.cc +++ b/runtime/native/dalvik_system_VMStack.cc @@ -168,7 +168,7 @@ static jobjectArray VMStack_getAnnotatedThreadStackTrace(JNIEnv* env, jclass, jo return GetThreadStack(soa, javaThread, fn); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(VMStack, fillStackTraceElements, "(Ljava/lang/Thread;[Ljava/lang/StackTraceElement;)I"), FAST_NATIVE_METHOD(VMStack, getCallingClassLoader, "()Ljava/lang/ClassLoader;"), FAST_NATIVE_METHOD(VMStack, getClosestUserClassLoader, "()Ljava/lang/ClassLoader;"), diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc index 050233dac5..37551d049b 100644 --- a/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc @@ -456,7 +456,7 @@ static jboolean ZygoteHooks_nativeZygoteLongSuspendOk(JNIEnv* env ATTRIBUTE_UNUS } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { NATIVE_METHOD(ZygoteHooks, nativePreFork, "()J"), NATIVE_METHOD(ZygoteHooks, nativePostZygoteFork, "()V"), NATIVE_METHOD(ZygoteHooks, nativePostForkSystemServer, "(I)V"), diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index 776b14f735..bdf3ea92ec 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -981,7 +981,7 @@ static jobject Class_newInstance(JNIEnv* env, jobject javaThis) { return soa.AddLocalReference(receiver.Get()); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Class, classForName, "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;"), FAST_NATIVE_METHOD(Class, getDeclaredAnnotation, diff --git a/runtime/native/java_lang_Object.cc b/runtime/native/java_lang_Object.cc index 8fc10d1114..8740755199 100644 --- a/runtime/native/java_lang_Object.cc +++ b/runtime/native/java_lang_Object.cc @@ -54,7 +54,7 @@ static jint Object_identityHashCodeNative(JNIEnv* env, jclass, jobject javaObjec return static_cast(o->IdentityHashCode()); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Object, internalClone, "()Ljava/lang/Object;"), FAST_NATIVE_METHOD(Object, notify, "()V"), FAST_NATIVE_METHOD(Object, notifyAll, "()V"), diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc index 86f93299d9..ec4b8a9025 100644 --- a/runtime/native/java_lang_String.cc +++ b/runtime/native/java_lang_String.cc @@ -109,7 +109,7 @@ static jcharArray String_toCharArray(JNIEnv* env, jobject java_this) { return soa.AddLocalReference(mirror::String::ToCharArray(s, soa.Self())); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(String, charAt, "(I)C"), FAST_NATIVE_METHOD(String, compareTo, "(Ljava/lang/String;)I"), FAST_NATIVE_METHOD(String, concat, "(Ljava/lang/String;)Ljava/lang/String;"), diff --git a/runtime/native/java_lang_StringFactory.cc b/runtime/native/java_lang_StringFactory.cc index 9086ee932d..de0a81e9a5 100644 --- a/runtime/native/java_lang_StringFactory.cc +++ b/runtime/native/java_lang_StringFactory.cc @@ -264,7 +264,7 @@ static jstring StringFactory_newStringFromUtf8Bytes(JNIEnv* env, jclass, jbyteAr return soa.AddLocalReference(result); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(StringFactory, newStringFromBytes, "([BIII)Ljava/lang/String;"), FAST_NATIVE_METHOD(StringFactory, newStringFromChars, "(II[C)Ljava/lang/String;"), FAST_NATIVE_METHOD(StringFactory, newStringFromString, "(Ljava/lang/String;)Ljava/lang/String;"), diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc index 63cbd2c815..e7b3894aad 100644 --- a/runtime/native/java_lang_System.cc +++ b/runtime/native/java_lang_System.cc @@ -239,7 +239,7 @@ static void System_arraycopyBooleanUnchecked(JNIEnv* env, javaDst, dstPos, count); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(System, arraycopy, "(Ljava/lang/Object;ILjava/lang/Object;II)V"), FAST_NATIVE_METHOD(System, arraycopyCharUnchecked, "([CI[CII)V"), FAST_NATIVE_METHOD(System, arraycopyByteUnchecked, "([BI[BII)V"), diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc index c3b4fe09de..8ff4e02605 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -193,7 +193,7 @@ static void Thread_yield(JNIEnv*, jobject) { sched_yield(); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Thread, currentThread, "()Ljava/lang/Thread;"), FAST_NATIVE_METHOD(Thread, interrupted, "()Z"), FAST_NATIVE_METHOD(Thread, isInterrupted, "()Z"), diff --git a/runtime/native/java_lang_Throwable.cc b/runtime/native/java_lang_Throwable.cc index b89e287481..5cdd70c513 100644 --- a/runtime/native/java_lang_Throwable.cc +++ b/runtime/native/java_lang_Throwable.cc @@ -38,7 +38,7 @@ static jobjectArray Throwable_nativeGetStackTrace(JNIEnv* env, jclass, jobject j return Thread::InternalStackTraceToStackTraceElementArray(soa, javaStackState); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Throwable, nativeFillInStackTrace, "()Ljava/lang/Object;"), FAST_NATIVE_METHOD(Throwable, nativeGetStackTrace, "(Ljava/lang/Object;)[Ljava/lang/StackTraceElement;"), }; diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc index 11e02a2ce4..ce37a33086 100644 --- a/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc @@ -155,7 +155,7 @@ static jobjectArray VMClassLoader_getBootClassPathEntries(JNIEnv* env, jclass) { return array; } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(VMClassLoader, findLoadedClass, "(Ljava/lang/ClassLoader;Ljava/lang/String;)Ljava/lang/Class;"), NATIVE_METHOD(VMClassLoader, getBootClassPathEntries, "()[Ljava/lang/String;"), }; diff --git a/runtime/native/java_lang_invoke_MethodHandleImpl.cc b/runtime/native/java_lang_invoke_MethodHandleImpl.cc index 45d9a8abef..afeaa94ec5 100644 --- a/runtime/native/java_lang_invoke_MethodHandleImpl.cc +++ b/runtime/native/java_lang_invoke_MethodHandleImpl.cc @@ -63,7 +63,7 @@ static jobject MethodHandleImpl_getMemberInternal(JNIEnv* env, jobject thiz) { return soa.AddLocalReference(h_object.Get()); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { NATIVE_METHOD(MethodHandleImpl, getMemberInternal, "()Ljava/lang/reflect/Member;"), }; diff --git a/runtime/native/java_lang_ref_FinalizerReference.cc b/runtime/native/java_lang_ref_FinalizerReference.cc index 535b243411..0a8dfb6c09 100644 --- a/runtime/native/java_lang_ref_FinalizerReference.cc +++ b/runtime/native/java_lang_ref_FinalizerReference.cc @@ -42,7 +42,7 @@ static jobject FinalizerReference_getReferent(JNIEnv* env, jobject javaThis) { return soa.AddLocalReference(referent); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(FinalizerReference, makeCircularListIfUnenqueued, "()Z"), FAST_NATIVE_METHOD(FinalizerReference, getReferent, "()Ljava/lang/Object;"), }; diff --git a/runtime/native/java_lang_ref_Reference.cc b/runtime/native/java_lang_ref_Reference.cc index f23010bf48..e36287154f 100644 --- a/runtime/native/java_lang_ref_Reference.cc +++ b/runtime/native/java_lang_ref_Reference.cc @@ -73,7 +73,7 @@ static void Reference_clearReferent(JNIEnv* env, jobject javaThis) { Runtime::Current()->GetHeap()->GetReferenceProcessor()->ClearReferent(ref); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Reference, getReferent, "()Ljava/lang/Object;"), FAST_NATIVE_METHOD(Reference, clearReferent, "()V"), FAST_NATIVE_METHOD(Reference, refersTo0, "(Ljava/lang/Object;)Z"), diff --git a/runtime/native/java_lang_reflect_Array.cc b/runtime/native/java_lang_reflect_Array.cc index ff94593cdf..e359e7d8a8 100644 --- a/runtime/native/java_lang_reflect_Array.cc +++ b/runtime/native/java_lang_reflect_Array.cc @@ -74,7 +74,7 @@ static jobject Array_createObjectArray(JNIEnv* env, jclass, jclass javaElementCl return soa.AddLocalReference(new_array); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Array, createMultiArray, "(Ljava/lang/Class;[I)Ljava/lang/Object;"), FAST_NATIVE_METHOD(Array, createObjectArray, "(Ljava/lang/Class;I)Ljava/lang/Object;"), }; diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc index 1d362c0302..16f5dedb44 100644 --- a/runtime/native/java_lang_reflect_Constructor.cc +++ b/runtime/native/java_lang_reflect_Constructor.cc @@ -128,7 +128,7 @@ static jobject Constructor_newInstanceFromSerialization(JNIEnv* env, jclass unus return env->NewObject(allocClass, ctor); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Constructor, getExceptionTypes, "()[Ljava/lang/Class;"), FAST_NATIVE_METHOD(Constructor, newInstance0, "([Ljava/lang/Object;)Ljava/lang/Object;"), FAST_NATIVE_METHOD(Constructor, newInstanceFromSerialization, "(Ljava/lang/Class;Ljava/lang/Class;)Ljava/lang/Object;"), diff --git a/runtime/native/java_lang_reflect_Executable.cc b/runtime/native/java_lang_reflect_Executable.cc index fef16b9099..1acce4e5d3 100644 --- a/runtime/native/java_lang_reflect_Executable.cc +++ b/runtime/native/java_lang_reflect_Executable.cc @@ -383,7 +383,7 @@ static jint Executable_getParameterCountInternal(JNIEnv* env, jobject javaMethod } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Executable, compareMethodParametersInternal, "(Ljava/lang/reflect/Method;)I"), FAST_NATIVE_METHOD(Executable, getAnnotationNative, diff --git a/runtime/native/java_lang_reflect_Field.cc b/runtime/native/java_lang_reflect_Field.cc index cfc4a292ba..7bbff9ba36 100644 --- a/runtime/native/java_lang_reflect_Field.cc +++ b/runtime/native/java_lang_reflect_Field.cc @@ -521,7 +521,7 @@ static jboolean Field_isAnnotationPresentNative(JNIEnv* env, return annotations::IsFieldAnnotationPresent(field, klass); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Field, get, "(Ljava/lang/Object;)Ljava/lang/Object;"), FAST_NATIVE_METHOD(Field, getBoolean, "(Ljava/lang/Object;)Z"), FAST_NATIVE_METHOD(Field, getByte, "(Ljava/lang/Object;)B"), diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc index 2c0dd806e1..e052ba9b2c 100644 --- a/runtime/native/java_lang_reflect_Method.cc +++ b/runtime/native/java_lang_reflect_Method.cc @@ -86,7 +86,7 @@ static jobject Method_invoke(JNIEnv* env, jobject javaMethod, jobject javaReceiv return InvokeMethod(soa, javaMethod, javaReceiver, javaArgs); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Method, getDefaultValue, "()Ljava/lang/Object;"), FAST_NATIVE_METHOD(Method, getExceptionTypes, "()[Ljava/lang/Class;"), FAST_NATIVE_METHOD(Method, invoke, "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"), diff --git a/runtime/native/java_lang_reflect_Parameter.cc b/runtime/native/java_lang_reflect_Parameter.cc index 263a56796f..92bf9078a4 100644 --- a/runtime/native/java_lang_reflect_Parameter.cc +++ b/runtime/native/java_lang_reflect_Parameter.cc @@ -98,7 +98,7 @@ static jobject Parameter_getAnnotationNative(JNIEnv* env, annotations::GetAnnotationForMethodParameter(method, parameterIndex, klass)); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD( Parameter, getAnnotationNative, diff --git a/runtime/native/java_lang_reflect_Proxy.cc b/runtime/native/java_lang_reflect_Proxy.cc index f723ed223d..c2b533de5d 100644 --- a/runtime/native/java_lang_reflect_Proxy.cc +++ b/runtime/native/java_lang_reflect_Proxy.cc @@ -37,7 +37,7 @@ static jclass Proxy_generateProxy(JNIEnv* env, jclass, jstring name, jobjectArra soa, name, interfaces, loader, methods, throws)); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Proxy, generateProxy, "(Ljava/lang/String;[Ljava/lang/Class;Ljava/lang/ClassLoader;[Ljava/lang/reflect/Method;[[Ljava/lang/Class;)Ljava/lang/Class;"), }; diff --git a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc index fa288edcb8..299ac5a61d 100644 --- a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc +++ b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc @@ -30,7 +30,7 @@ static jboolean AtomicLong_VMSupportsCS8(JNIEnv*, jclass) { return QuasiAtomic::LongAtomicsUseMutexes(kRuntimeISA) ? JNI_FALSE : JNI_TRUE; } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { NATIVE_METHOD(AtomicLong, VMSupportsCS8, "()Z"), }; diff --git a/runtime/native/libcore_util_CharsetUtils.cc b/runtime/native/libcore_util_CharsetUtils.cc index f0764f1d74..d9303a9b93 100644 --- a/runtime/native/libcore_util_CharsetUtils.cc +++ b/runtime/native/libcore_util_CharsetUtils.cc @@ -183,7 +183,7 @@ static jbyteArray CharsetUtils_toUtf8Bytes(JNIEnv* env, jclass, jstring java_str return soa.AddLocalReference(result); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(CharsetUtils, asciiBytesToChars, "([BII[C)V"), FAST_NATIVE_METHOD(CharsetUtils, isoLatin1BytesToChars, "([BII[C)V"), FAST_NATIVE_METHOD(CharsetUtils, toAsciiBytes, "(Ljava/lang/String;II)[B"), diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc index 419aed8578..ccbef4f3f4 100644 --- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc +++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc @@ -38,7 +38,7 @@ static void DdmServer_nativeSendChunk(JNIEnv* env, jclass, jint type, Runtime::Current()->GetRuntimeCallbacks()->DdmPublishChunk(static_cast(type), chunk); } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(DdmServer, nativeSendChunk, "(I[BII)V"), }; diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc index f74e1206f5..044364cc45 100644 --- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc +++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc @@ -209,7 +209,7 @@ static jbyteArray DdmVmInternal_getThreadStats(JNIEnv* env, jclass) { return result; } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { NATIVE_METHOD(DdmVmInternal, setRecentAllocationsTrackingEnabled, "(Z)V"), NATIVE_METHOD(DdmVmInternal, setThreadNotifyEnabled, "(Z)V"), NATIVE_METHOD(DdmVmInternal, getStackTraceById, "(I)[Ljava/lang/StackTraceElement;"), diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc index 5014f340cd..bb9226d1fa 100644 --- a/runtime/native/sun_misc_Unsafe.cc +++ b/runtime/native/sun_misc_Unsafe.cc @@ -541,7 +541,7 @@ static void Unsafe_unpark(JNIEnv* env, jobject, jobject jthread) { } } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { FAST_NATIVE_METHOD(Unsafe, compareAndSwapInt, "(Ljava/lang/Object;JII)Z"), FAST_NATIVE_METHOD(Unsafe, compareAndSwapLong, "(Ljava/lang/Object;JJJ)Z"), FAST_NATIVE_METHOD(Unsafe, compareAndSwapObject, "(Ljava/lang/Object;JLjava/lang/Object;Ljava/lang/Object;)Z"),