Rename MethodPointer.isAbsolute.

Author: peter-hofer

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/MethodPointer.java

@@ -38,24 +38,24 @@
  */
 public final class MethodPointer implements CFunctionPointer {
     private final ResolvedJavaMethod method;
-    private final boolean isAbsolute;
+    private final boolean permitsRewriteToPLT;
 
-    public MethodPointer(ResolvedJavaMethod method, boolean isAbsolute) {
+    public MethodPointer(ResolvedJavaMethod method, boolean permitsRewriteToPLT) {
         Objects.requireNonNull(method);
         this.method = method;
-        this.isAbsolute = isAbsolute;
+        this.permitsRewriteToPLT = permitsRewriteToPLT;
     }
 
     public MethodPointer(ResolvedJavaMethod method) {
-        this(method, false);
+        this(method, true);
     }
 
     public ResolvedJavaMethod getMethod() {
         return method;
     }
 
-    public boolean isAbsolute() {
-        return isAbsolute;
+    public boolean permitsRewriteToPLT() {
+        return permitsRewriteToPLT;
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java

@@ -301,7 +301,7 @@ public int getAlignedConstantsSize() {
     }
 
     public void buildRuntimeMetadata(DebugContext debug, SnippetReflectionProvider snippetReflectionProvider) {
-        buildRuntimeMetadata(debug, snippetReflectionProvider, new MethodPointer(getFirstCompilation().getLeft(), true), Word.signed(getCodeAreaSize()));
+        buildRuntimeMetadata(debug, snippetReflectionProvider, new MethodPointer(getFirstCompilation().getLeft(), false), Word.signed(getCodeAreaSize()));
     }
 
     static class HostedConstantAccess extends ConstantAccess {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/RelocatableConstant.java

@@ -114,7 +114,7 @@ public boolean equals(Object obj) {
     @Override
     public String toValueString() {
         if (pointer instanceof MethodPointer mp) {
-            return "relocatable method pointer: " + mp.getMethod().format("%H.%n(%p)") + ", isAbsolute: " + mp.isAbsolute();
+            return "relocatable method pointer: " + mp.getMethod().format("%H.%n(%p)") + ", permitsRewriteToPLT: " + mp.permitsRewriteToPLT();
         }
         return "relocatable constant";
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/IdentityMethodAddressResolverFeature.java

@@ -133,7 +133,7 @@ public void augmentImageObjectFile(ObjectFile imageObjectFile) {
 
             ObjectFile.RelocationKind relocationKind = ObjectFile.RelocationKind.getDirect(wordSize);
             for (int gotEntryNo = 0; gotEntryNo < got.length; ++gotEntryNo) {
-                offsetsSectionBuffer.addRelocationWithoutAddend(gotEntryNo * wordSize, relocationKind, new MethodPointer(got[gotEntryNo], true));
+                offsetsSectionBuffer.addRelocationWithoutAddend(gotEntryNo * wordSize, relocationKind, new MethodPointer(got[gotEntryNo], false));
             }
 
             imageObjectFile.createDefinedSymbol(offsetsSection.getName(), offsetsSection, 0, 0, false, false);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/pltgot/PLTGOTPointerRelocationProvider.java

@@ -48,15 +48,10 @@ public PLTGOTPointerRelocationProvider(Predicate<SharedMethod> shouldMarkRelocat
         this.pltSectionSupport = HostedPLTGOTConfiguration.singleton().getPLTSectionSupport();
     }
 
-    private boolean hasPLTStub(HostedMethod target, boolean isStaticallyResolved) {
-        return !isStaticallyResolved && shouldMarkRelocationToPLTStub.test(target);
-    }
-
     @Override
     public void markMethodPointerRelocation(ObjectFile.ProgbitsSectionImpl section, int offset, ObjectFile.RelocationKind relocationKind, HostedMethod target, long addend,
                     MethodPointer methodPointer, boolean isInjectedNotCompiled) {
-        boolean isStaticallyResolved = methodPointer.isAbsolute();
-        if (hasPLTStub(target, isStaticallyResolved)) {
+        if (methodPointer.permitsRewriteToPLT() && shouldMarkRelocationToPLTStub.test(target)) {
             pltSectionSupport.markRelocationToPLTStub(section, offset, relocationKind, target, addend);
         } else {
             super.markMethodPointerRelocation(section, offset, relocationKind, target, addend, methodPointer, isInjectedNotCompiled);