[GR-26186] Various fixes.

PullRequest: graal/10537

Author: Christian Wimmer

compiler/src/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java

@@ -121,11 +121,11 @@ public Value emitExtendMemory(boolean isSigned, AArch64Kind accessKind, int resu
          * Issue an extending load of the proper bit size and set the result to the proper kind.
          */
         GraalError.guarantee(accessKind.isInteger(), "can only extend integer kinds");
-        Variable result = getLIRGen().newVariable(LIRKind.value(resultBits == 32 ? AArch64Kind.DWORD : AArch64Kind.QWORD));
+        AArch64Kind resultKind = resultBits <= 32 ? AArch64Kind.DWORD : AArch64Kind.QWORD;
+        Variable result = getLIRGen().newVariable(LIRKind.value(resultKind));
 
-        int dstBitSize = resultBits <= 32 ? 32 : 64;
         AArch64Move.ExtendKind extend = isSigned ? AArch64Move.ExtendKind.SIGN_EXTEND : AArch64Move.ExtendKind.ZERO_EXTEND;
-        getLIRGen().append(new AArch64Move.LoadOp(accessKind, dstBitSize, extend, result, address, state));
+        getLIRGen().append(new AArch64Move.LoadOp(accessKind, resultKind.getSizeInBytes() * Byte.SIZE, extend, result, address, state));
         return result;
     }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlow.java

@@ -87,7 +87,10 @@ public StackTraceElement[] getParsingContext() {
         List<StackTraceElement> parsingContext = new ArrayList<>();
         InvokeTypeFlow invokeFlow = parsingReason;
 
-        while (invokeFlow != null) {
+        /* Defend against cycles in the parsing context. GR-35744 should fix this properly. */
+        int maxSize = 100;
+
+        while (invokeFlow != null && parsingContext.size() < maxSize) {
             parsingContext.add(invokeFlow.getSource().getMethod().asStackTraceElement(invokeFlow.getSource().getBCI()));
             invokeFlow = ((PointsToAnalysisMethod) invokeFlow.getSource().getMethod()).getTypeFlow().parsingReason;
         }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java

@@ -587,7 +587,7 @@ private void collectMethodImplementations() {
     public static Set<AnalysisMethod> getMethodImplementations(BigBang bb, AnalysisMethod method, boolean includeInlinedMethods) {
         Set<AnalysisMethod> implementations = new LinkedHashSet<>();
         if (method.wrapped.canBeStaticallyBound() || method.isConstructor()) {
-            if (method.isImplementationInvoked()) {
+            if (includeInlinedMethods ? method.isReachable() : method.isImplementationInvoked()) {
                 implementations.add(method);
             }
         } else {

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

@@ -660,7 +660,7 @@ public String name() {
 
             @Override
             public String valueType() {
-                return hostedMethod.getSignature().getReturnType(null).toJavaName();
+                return toJavaName((HostedType) hostedMethod.getSignature().getReturnType(null));
             }
 
             @Override
@@ -669,7 +669,7 @@ public List<String> paramTypes() {
                 int parameterCount = signature.getParameterCount(false);
                 List<String> paramTypes = new ArrayList<>(parameterCount);
                 for (int i = 0; i < parameterCount; i++) {
-                    paramTypes.add(signature.getParameterType(i, null).toJavaName());
+                    paramTypes.add(toJavaName((HostedType) signature.getParameterType(i, null)));
                 }
                 return paramTypes;
             }