diff --git a/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp b/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp index 0da096ef21c..0b0a4e5c00d 100644 --- a/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp @@ -119,6 +119,9 @@ class OMR_EXTENSIBLE CodeGenerator : public J9::CodeGenerator bool suppressInliningOfRecognizedMethod(TR::RecognizedMethod method); bool callUsesHelperImplementation(TR::Symbol *sym); + + // See J9::CodeGenerator::guaranteesResolvedDirectDispatchForSVM + bool guaranteesResolvedDirectDispatchForSVM() { return true; } }; } diff --git a/runtime/compiler/control/J9Options.cpp b/runtime/compiler/control/J9Options.cpp index 73e79a3ffa0..578e9714436 100644 --- a/runtime/compiler/control/J9Options.cpp +++ b/runtime/compiler/control/J9Options.cpp @@ -2780,7 +2780,7 @@ J9::Options::fePreProcess(void * base) return false; } -#if (defined(TR_HOST_X86) || defined(TR_HOST_S390) || defined(TR_HOST_POWER)) && defined(TR_TARGET_64BIT) +#if (defined(TR_HOST_X86) || defined(TR_HOST_S390) || defined(TR_HOST_POWER) || defined(TR_HOST_ARM64)) && defined(TR_TARGET_64BIT) self()->setOption(TR_EnableSymbolValidationManager); self()->setOption(TR_DisableSVMDuringStartup); #endif