Merge pull request #6921 from dchopra001/JITServerChecks

Add JITServer checks in the z codegen
eclipse-openj9 · Jul 20, 2020 · 1f94fbe · 1f94fbe
2 parents bb7b45e + 608cdf5
commit 1f94fbe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/runtime/compiler/z/codegen/J9S390Snippet.cpp b/runtime/compiler/z/codegen/J9S390Snippet.cpp
@@ -117,7 +117,7 @@ TR::S390HeapAllocSnippet::emitSnippetBody()
    this->setSnippetDestAddr(destAddr);
 
    *(int32_t *) buffer = (int32_t)((destAddr - (intptr_t)(buffer - 2)) / 2);
-   if (comp->compileRelocatableCode())
+   if (comp->compileRelocatableCode() || comp->isOutOfProcessCompilation())
       {
       cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(buffer, (uint8_t*) getDestination(), TR_HelperAddress, cg()),
                                 __FILE__, __LINE__, getNode());

diff --git a/runtime/compiler/z/codegen/J9TreeEvaluator.cpp b/runtime/compiler/z/codegen/J9TreeEvaluator.cpp
@@ -9617,7 +9617,7 @@ J9::Z::TreeEvaluator::genArrayCopyWithArrayStoreCHK(TR::Node* node,
 
    // Ready parameter 6: helper reg
    intptr_t *funcdescrptr = (intptr_t*) fej9->getReferenceArrayCopyHelperAddress();
-   if (comp->compileRelocatableCode())
+   if (comp->compileRelocatableCode() || comp->isOutOfProcessCompilation())
       {
       generateRegLitRefInstruction(cg, TR::InstOpCode::getLoadOpCode(), node, helperReg, (intptr_t)funcdescrptr, TR_ArrayCopyHelper, NULL, NULL, NULL);
       }

diff --git a/runtime/compiler/z/codegen/S390J9CallSnippet.cpp b/runtime/compiler/z/codegen/S390J9CallSnippet.cpp
@@ -466,7 +466,7 @@ TR::S390UnresolvedCallSnippet::emitSnippetBody()
    if (comp->getOption(TR_EnableRMODE64))
 #endif
       {
-      if (comp->compileRelocatableCode() && comp->getOption(TR_TraceRelocatableDataDetailsCG))
+      if ((comp->compileRelocatableCode() || comp->isOutOfProcessCompilation()) && comp->getOption(TR_TraceRelocatableDataDetailsCG))
          {
          traceMsg(comp, "<relocatableDataTrampolinesCG>\n");
          traceMsg(comp, "%s\n", comp->signature());