Merge pull request #60 from knn-k/aarch64instr36_0.20.0

0xdaryl · web-flow · commit d4365f371ce8 · 2020-04-14T08:43:05.000-04:00
(0.20.0) AArch64: Call redoTrampolineReservationIfNecessary()
diff --git a/compiler/aarch64/codegen/ARM64BinaryEncoding.cpp b/compiler/aarch64/codegen/ARM64BinaryEncoding.cpp
@@ -95,6 +95,12 @@ uint8_t *TR::ARM64ImmSymInstruction::generateBinaryEncoding()
       else
          {
          TR::MethodSymbol *method = symRef->getSymbol()->getMethodSymbol();
+
+         if (cg()->hasCodeCacheSwitched())
+            {
+            cg()->redoTrampolineReservationIfNecessary(this, symRef);
+            }
+
          if (method && method->isHelper())
             {
             intptrj_t destination = (intptrj_t)symRef->getMethodAddress();

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,12 @@ uint8_t *TR::ARM64ImmSymInstruction::generateBinaryEncoding()`
`95`	`95`	`else`
`96`	`96`	`{`
`97`	`97`	`TR::MethodSymbol *method = symRef->getSymbol()->getMethodSymbol();`
	`98`	`+`
	`99`	`+ if (cg()->hasCodeCacheSwitched())`
	`100`	`+ {`
	`101`	`+ cg()->redoTrampolineReservationIfNecessary(this, symRef);`
	`102`	`+ }`
	`103`	`+`
`98`	`104`	`if (method && method->isHelper())`
`99`	`105`	`{`
`100`	`106`	`intptrj_t destination = (intptrj_t)symRef->getMethodAddress();`