diff options
| author | 2025-02-25 11:35:07 -0800 | |
|---|---|---|
| committer | 2025-02-25 11:35:07 -0800 | |
| commit | 842ca8ec897ef475fc73f0681bc044e1551347a7 (patch) | |
| tree | d076e8cc4bc082fce2280ee92e87dc004093479d | |
| parent | a4c1275794dd2562b8462adc724eeb940abc97e9 (diff) | |
| parent | 7cd38047cb17f495e3ef32852f95311631019a7a (diff) | |
Disable -Wcast-function-type-mismatch am: 9aad1508e7 am: 7cd38047cb
Original change: https://android-review.googlesource.com/c/platform/art/+/3507251
Change-Id: I1ebca005849c7e2f550ed56e45925ba932d4fa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | openjdkjvmti/ti_heap.cc | 3 | ||||
| -rw-r--r-- | test/913-heaps/heaps.cc | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/openjdkjvmti/ti_heap.cc b/openjdkjvmti/ti_heap.cc index af74b67b17..49a6748c28 100644 --- a/openjdkjvmti/ti_heap.cc +++ b/openjdkjvmti/ti_heap.cc @@ -1583,6 +1583,8 @@ jvmtiError HeapExtensions::GetHeapName(jvmtiEnv* env, jint heap_id, char** heap_ } } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wcast-function-type-mismatch" jvmtiError HeapExtensions::IterateThroughHeapExt(jvmtiEnv* env, jint heap_filter, jclass klass, @@ -1614,6 +1616,7 @@ jvmtiError HeapExtensions::IterateThroughHeapExt(jvmtiEnv* env, callbacks, user_data); } +#pragma clang diagnostic pop namespace { diff --git a/test/913-heaps/heaps.cc b/test/913-heaps/heaps.cc index 197230f01e..e857c4b57c 100644 --- a/test/913-heaps/heaps.cc +++ b/test/913-heaps/heaps.cc @@ -1119,6 +1119,8 @@ static jint JNICALL HeapIterationExtCallback([[maybe_unused]] jlong class_tag, return 0; } +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wcast-function-type-mismatch" extern "C" JNIEXPORT void JNICALL Java_art_Test913_iterateThroughHeapExt( JNIEnv* env, [[maybe_unused]] jclass klass) { CHECK(gIterateThroughHeapExt != nullptr); @@ -1132,6 +1134,7 @@ extern "C" JNIEXPORT void JNICALL Java_art_Test913_iterateThroughHeapExt( JvmtiErrorToException(env, jvmti_env, ret); CHECK(gFoundExt); } +#pragma clang diagnostic pop extern "C" JNIEXPORT jboolean JNICALL Java_art_Test913_checkInitialized(JNIEnv* env, jclass, jclass c) { jint status; |