Merge pull request #9084 from Akira1Saitoh/aarch64UPicSitev0.20.0

(0.20.0) AArch64: Implement TR_UnloadedClassPicSite::compensate
eclipse-openj9 · Apr 3, 2020 · 61846f8 · 61846f8
2 parents 3ca52d8 + decf341
commit 61846f8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/runtime/compiler/runtime/ClassUnloadAssumption.cpp b/runtime/compiler/runtime/ClassUnloadAssumption.cpp
@@ -716,6 +716,11 @@ void TR_UnloadedClassPicSite::compensate(TR_FrontEnd *, bool isSMP, void *)
    value |= 0x03a00001;
    *((uint32_t *)_picLocation) = value;
    armCodeSync(_picLocation, 4);
+#elif defined(TR_HOST_ARM64)
+   // On aarch64, we use constant data snippet for class unloading pic site
+   extern void arm64CodeSync(unsigned char *codeStart, unsigned int codeSize);
+   *(int64_t *)_picLocation = -1;
+   arm64CodeSync(_picLocation, 8);
 #else
    //   TR_ASSERT(0, "unloaded class PIC patching is not implemented on this platform yet");
 #endif