Skip to content

Commit

Permalink
[GR-51662] Cleanups.
Browse files Browse the repository at this point in the history 
PullRequest: graal/16755
  • Loading branch information
@christianhaeubl
christianhaeubl committed Jan 29, 2024
2 parents b006347 + ba0a33c commit a647ddd
Show file tree
Hide file tree
Showing 24 changed files with 102 additions and 183 deletions.
3 changes: 1 addition & 2 deletions substratevm/mx.substratevm/testhello.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1030,8 +1030,7 @@ def test():
execute("continue")

exec_string = execute("info args")
rexp = [r"this = 0x%s"%(hex_digits_pattern),
r"m1 = 0x%s"%(hex_digits_pattern),
rexp = [r"m1 = 0x%s"%(hex_digits_pattern),
r"s = 1",
r"ss1 = 0x%s"%(hex_digits_pattern),
r"l = 123456789",
Expand Down
4 changes: 2 additions & 2 deletions ...dalone.test/src/com/oracle/graal/pointsto/standalone/test/ArrayNewInstancePluginCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

package com.oracle.graal.pointsto.standalone.test;

import java.lang.reflect.Array;

import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
import jdk.graal.compiler.nodes.spi.Replacements;

import java.lang.reflect.Array;

/**
* This case is for
* {@link jdk.graal.compiler.replacements.StandardGraphBuilderPlugins#registerArrayPlugins(InvocationPlugins, Replacements)}.
Expand Down
3 changes: 1 addition & 2 deletions ...vm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,7 @@ private void updateInstanceField(AnalysisField field, ImageHeapInstance imageHea
}
}

@SuppressWarnings("unused")
public boolean isValueAvailable(AnalysisField field) {
public boolean isValueAvailable(@SuppressWarnings("unused") AnalysisField field) {
return true;
}

Expand Down
4 changes: 0 additions & 4 deletions substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.regex.Pattern;

import org.graalvm.nativeimage.Platform;
import org.graalvm.nativeimage.ProcessProperties;
Expand Down Expand Up @@ -487,9 +486,6 @@ private static void ignoreConfigFromClasspath(JvmtiEnv jvmti, ConfigurationFileC
}
}

@SuppressWarnings("unused") private static final Pattern propertyBlacklist = Pattern.compile("(java\\..*)|(sun\\..*)|(jvmci\\..*)");
@SuppressWarnings("unused") private static final Pattern propertyWhitelist = Pattern.compile("(java\\.library\\.path)|(java\\.io\\.tmpdir)");

private static String transformPath(String path) {
String result = path;
if (result.contains("{pid}")) {
Expand Down
6 changes: 3 additions & 3 deletions ...e.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapPartition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,18 @@ private void allocateObjectsInAlignedChunks(ChunkedImageHeapAllocator allocator)
}
}

private ImageHeapObject dequeueBestFit(NavigableMap<Long, Queue<ImageHeapObject>> objectsParam, long nbytes) {
private ImageHeapObject dequeueBestFit(NavigableMap<Long, Queue<ImageHeapObject>> sortedObjects, long nbytes) {
if (nbytes < minimumObjectSize) {
return null;
}
Map.Entry<Long, Queue<ImageHeapObject>> entry = objectsParam.floorEntry(nbytes);
Map.Entry<Long, Queue<ImageHeapObject>> entry = sortedObjects.floorEntry(nbytes);
if (entry == null) {
return null;
}
Queue<ImageHeapObject> queue = entry.getValue();
ImageHeapObject info = queue.remove();
if (queue.isEmpty()) {
objectsParam.remove(entry.getKey());
sortedObjects.remove(entry.getKey());
}
return info;
}
Expand Down
24 changes: 16 additions & 8 deletions ...evm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,16 +304,24 @@ static void logZapValues(Log log) {
if (HeapParameters.getZapProducedHeapChunks() || HeapParameters.getZapConsumedHeapChunks()) {
/* Padded with spaces so the columns line up between the int and word variants. */
if (HeapParameters.getZapProducedHeapChunks()) {
log.string("producedHeapChunkZapInt: ").string(" hex: ").spaces(8).hex(HeapParameters.getProducedHeapChunkZapInt()).string(" signed: ").spaces(9).signed(
HeapParameters.getProducedHeapChunkZapInt()).string(" unsigned: ").spaces(10).unsigned(HeapParameters.getProducedHeapChunkZapInt()).newline();
log.string("producedHeapChunkZapWord:").string(" hex: ").hex(HeapParameters.getProducedHeapChunkZapWord()).string(" signed: ").signed(
HeapParameters.getProducedHeapChunkZapWord()).string(" unsigned: ").unsigned(HeapParameters.getProducedHeapChunkZapWord()).newline();
log.string("producedHeapChunkZapInt: ") //
.string(" hex: ").spaces(8).hex(HeapParameters.getProducedHeapChunkZapInt()) //
.string(" signed: ").spaces(9).signed(HeapParameters.getProducedHeapChunkZapInt()) //
.string(" unsigned: ").spaces(10).unsigned(HeapParameters.getProducedHeapChunkZapInt()).newline();
log.string("producedHeapChunkZapWord:") //
.string(" hex: ").hex(HeapParameters.getProducedHeapChunkZapWord()) //
.string(" signed: ").signed(HeapParameters.getProducedHeapChunkZapWord()) //
.string(" unsigned: ").unsigned(HeapParameters.getProducedHeapChunkZapWord()).newline();
}
if (HeapParameters.getZapConsumedHeapChunks()) {
log.string("consumedHeapChunkZapInt: ").string(" hex: ").spaces(8).hex(HeapParameters.getConsumedHeapChunkZapInt()).string(" signed: ").spaces(10).signed(
HeapParameters.getConsumedHeapChunkZapInt()).string(" unsigned: ").spaces(10).unsigned(HeapParameters.getConsumedHeapChunkZapInt()).newline();
log.string("consumedHeapChunkZapWord:").string(" hex: ").hex(HeapParameters.getConsumedHeapChunkZapWord()).string(" signed: ").signed(
HeapParameters.getConsumedHeapChunkZapWord()).string(" unsigned: ").unsigned(HeapParameters.getConsumedHeapChunkZapWord()).newline();
log.string("consumedHeapChunkZapInt: ") //
.string(" hex: ").spaces(8).hex(HeapParameters.getConsumedHeapChunkZapInt()) //
.string(" signed: ").spaces(10).signed(HeapParameters.getConsumedHeapChunkZapInt()) //
.string(" unsigned: ").spaces(10).unsigned(HeapParameters.getConsumedHeapChunkZapInt()).newline();
log.string("consumedHeapChunkZapWord:") //
.string(" hex: ").hex(HeapParameters.getConsumedHeapChunkZapWord()) //
.string(" signed: ").signed(HeapParameters.getConsumedHeapChunkZapWord()) //
.string(" unsigned: ").unsigned(HeapParameters.getConsumedHeapChunkZapWord()).newline();
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions ...com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,12 @@ public int initialize(Pointer reservedAddressSpace, UnsignedWord reservedSize, W
}

@Uninterruptible(reason = "Called during isolate initialization.")
private static int initializeImageHeap(Pointer imageHeapParam, UnsignedWord reservedSize, WordPointer endPointer, WordPointer cachedFd, WordPointer cachedOffsetInFile,
private static int initializeImageHeap(Pointer imageHeap, UnsignedWord reservedSize, WordPointer endPointer, WordPointer cachedFd, WordPointer cachedOffsetInFile,
Pointer magicAddress, Word heapBeginSym, Word heapEndSym, Word heapRelocsSym, Pointer heapAnyRelocPointer, Word heapRelocsEndSym, Word heapWritableSym, Word heapWritableEndSym) {
assert heapBeginSym.belowOrEqual(heapWritableSym) && heapWritableSym.belowOrEqual(heapWritableEndSym) && heapWritableEndSym.belowOrEqual(heapEndSym);
assert heapBeginSym.belowOrEqual(heapRelocsSym) && heapRelocsSym.belowOrEqual(heapRelocsEndSym) && heapRelocsEndSym.belowOrEqual(heapEndSym);
assert heapAnyRelocPointer.isNull() || (heapRelocsSym.belowOrEqual(heapAnyRelocPointer) && heapAnyRelocPointer.belowThan(heapRelocsEndSym));

Pointer imageHeap = imageHeapParam;
SignedWord fd = cachedFd.read();

/*
Expand Down Expand Up @@ -206,8 +205,8 @@ private static int initializeImageHeap(Pointer imageHeapParam, UnsignedWord rese

// Create memory mappings from the image file.
UnsignedWord fileOffset = cachedOffsetInFile.read();
imageHeap = VirtualMemoryProvider.get().mapFile(imageHeap, imageHeapSize, fd, fileOffset, Access.READ);
if (imageHeap.isNull()) {
Pointer mappedImageHeap = VirtualMemoryProvider.get().mapFile(imageHeap, imageHeapSize, fd, fileOffset, Access.READ);
if (mappedImageHeap.isNull() || mappedImageHeap != imageHeap) {
return CEntryPointErrors.MAP_HEAP_FAILED;
}

Expand Down
5 changes: 3 additions & 2 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,9 @@ private static void dumpInterruptibly(Pointer sp, CodePointer ip, PointerBase si

boolean printedDiagnostics = SubstrateDiagnostics.printFatalError(log, sp, ip, context, false);
if (SubstrateSegfaultHandler.isInstalled() && printedDiagnostics) {
log.string("Segfault detected, aborting process. ").string("Use '-XX:-InstallSegfaultHandler' to disable the segfault handler at run time and create a core dump instead. ").string(
"Rebuild with '-R:-InstallSegfaultHandler' to disable the handler permanently at build time.") //
log.string("Segfault detected, aborting process. ") //
.string("Use '-XX:-InstallSegfaultHandler' to disable the segfault handler at run time and create a core dump instead. ") //
.string("Rebuild with '-R:-InstallSegfaultHandler' to disable the handler permanently at build time.") //
.newline().newline();
}
}
Expand Down
36 changes: 18 additions & 18 deletions ...src/com.oracle.svm.core/src/com/oracle/svm/core/graal/replacements/SubstrateGraphKit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public class SubstrateGraphKit extends GraphKit {

private final FrameStateBuilder frameState;
private int nextBCI;
private final List<ValueNode> arguments;
private final List<ValueNode> initialArguments;

@SuppressWarnings("this-escape")
public SubstrateGraphKit(DebugContext debug, ResolvedJavaMethod stubMethod, Providers providers,
Expand All @@ -107,7 +107,7 @@ public SubstrateGraphKit(DebugContext debug, ResolvedJavaMethod stubMethod, Prov
frameState.disableStateVerification();
List<ValueNode> collectedArguments = new ArrayList<>();
frameState.initializeForMethodStart(null, true, graphBuilderPlugins, collectedArguments);
arguments = Collections.unmodifiableList(collectedArguments);
initialArguments = Collections.unmodifiableList(collectedArguments);
graph.start().setStateAfter(frameState.create(bci(), graph.start()));
}

Expand Down Expand Up @@ -137,7 +137,7 @@ public void storeLocal(int index, JavaKind slotKind, ValueNode value) {
}

public List<ValueNode> getInitialArguments() {
return arguments;
return initialArguments;
}

public LoadFieldNode createLoadField(ValueNode object, ResolvedJavaField field) {
Expand Down Expand Up @@ -168,24 +168,24 @@ public ValueNode createInvokeWithExceptionAndUnwind(Class<?> declaringClass, Str
return createInvokeWithExceptionAndUnwind(findMethod(declaringClass, name, invokeKind == InvokeKind.Static), invokeKind, frameState, bci(), args);
}

public InvokeWithExceptionNode createJavaCallWithException(InvokeKind kind, ResolvedJavaMethod targetMethod, ValueNode... argumentsParam) {
return startInvokeWithException(targetMethod, kind, frameState, bci(), argumentsParam);
public InvokeWithExceptionNode createJavaCallWithException(InvokeKind kind, ResolvedJavaMethod targetMethod, ValueNode... args) {
return startInvokeWithException(targetMethod, kind, frameState, bci(), args);
}

public InvokeWithExceptionNode createJavaCallWithExceptionAndUnwind(InvokeKind kind, ResolvedJavaMethod targetMethod, ValueNode... argumentsParam) {
return createInvokeWithExceptionAndUnwind(targetMethod, kind, frameState, bci(), argumentsParam);
public InvokeWithExceptionNode createJavaCallWithExceptionAndUnwind(InvokeKind kind, ResolvedJavaMethod targetMethod, ValueNode... args) {
return createInvokeWithExceptionAndUnwind(targetMethod, kind, frameState, bci(), args);
}

public ConstantNode createConstant(Constant value, JavaKind kind) {
return ConstantNode.forConstant(StampFactory.forKind(kind), value, getMetaAccess(), getGraph());
}

public ValueNode createCFunctionCall(ValueNode targetAddress, List<ValueNode> argumentsParam, Signature signature, int newThreadStatus, boolean emitDeoptTarget) {
return createCFunctionCallWithCapture(targetAddress, argumentsParam, signature, newThreadStatus, emitDeoptTarget, SubstrateCallingConventionKind.Native.toType(true),
public ValueNode createCFunctionCall(ValueNode targetAddress, List<ValueNode> args, Signature signature, int newThreadStatus, boolean emitDeoptTarget) {
return createCFunctionCallWithCapture(targetAddress, args, signature, newThreadStatus, emitDeoptTarget, SubstrateCallingConventionKind.Native.toType(true),
null, null, null);
}

public ValueNode createCFunctionCallWithCapture(ValueNode targetAddress, List<ValueNode> argumentsParam, Signature signature, int newThreadStatus, boolean emitDeoptTarget,
public ValueNode createCFunctionCallWithCapture(ValueNode targetAddress, List<ValueNode> args, Signature signature, int newThreadStatus, boolean emitDeoptTarget,
CallingConvention.Type convention, ForeignCallDescriptor captureFunction, ValueNode statesToCapture, ValueNode captureBuffer) {
assert ((captureFunction == null) && (statesToCapture == null) && (captureBuffer == null)) ||
((captureFunction != null) && (statesToCapture != null) && (captureBuffer != null));
Expand All @@ -211,7 +211,7 @@ public ValueNode createCFunctionCallWithCapture(ValueNode targetAddress, List<Va
JavaKind cReturnKind = javaReturnKind.getStackKind();
JavaType returnType = signature.getReturnType(null);
Stamp returnStamp = returnStamp(returnType, cReturnKind);
InvokeNode invoke = createIndirectCall(targetAddress, argumentsParam, signature.toParameterTypes(null), returnStamp, cReturnKind, convention);
InvokeNode invoke = createIndirectCall(targetAddress, args, signature.toParameterTypes(null), returnStamp, cReturnKind, convention);

if (fixedStatesToCapture != null) {
append(new CFunctionCaptureNode(captureFunction, fixedStatesToCapture, captureBuffer));
Expand Down Expand Up @@ -243,26 +243,26 @@ public ValueNode createCFunctionCallWithCapture(ValueNode targetAddress, List<Va
return getLoweringProvider().implicitLoadConvertWithBooleanCoercionIfNecessary(getGraph(), asKind(returnType), result);
}

public InvokeNode createIndirectCall(ValueNode targetAddress, List<ValueNode> argumentsParam, Signature signature, SubstrateCallingConventionKind callKind) {
assert argumentsParam.size() == signature.getParameterCount(false);
public InvokeNode createIndirectCall(ValueNode targetAddress, List<ValueNode> args, Signature signature, SubstrateCallingConventionKind callKind) {
assert args.size() == signature.getParameterCount(false);
assert callKind != SubstrateCallingConventionKind.Native : "return kind and stamp would be incorrect";
JavaKind returnKind = signature.getReturnKind().getStackKind();
Stamp returnStamp = returnStamp(signature.getReturnType(null), returnKind);
return createIndirectCall(targetAddress, argumentsParam, signature.toParameterTypes(null), returnStamp, returnKind, callKind);
return createIndirectCall(targetAddress, args, signature.toParameterTypes(null), returnStamp, returnKind, callKind);
}

private InvokeNode createIndirectCall(ValueNode targetAddress, List<ValueNode> argumentsParam, JavaType[] parameterTypes, Stamp returnStamp, JavaKind returnKind,
private InvokeNode createIndirectCall(ValueNode targetAddress, List<ValueNode> args, JavaType[] parameterTypes, Stamp returnStamp, JavaKind returnKind,
SubstrateCallingConventionKind callKind) {
return createIndirectCall(targetAddress, argumentsParam, parameterTypes, returnStamp, returnKind, callKind.toType(true));
return createIndirectCall(targetAddress, args, parameterTypes, returnStamp, returnKind, callKind.toType(true));
}

private InvokeNode createIndirectCall(ValueNode targetAddress, List<ValueNode> argumentsParam, JavaType[] parameterTypes, Stamp returnStamp, JavaKind returnKind,
private InvokeNode createIndirectCall(ValueNode targetAddress, List<ValueNode> args, JavaType[] parameterTypes, Stamp returnStamp, JavaKind returnKind,
CallingConvention.Type convention) {
frameState.clearStack();

int bci = bci();
CallTargetNode callTarget = getGraph().add(
new IndirectCallTargetNode(targetAddress, argumentsParam.toArray(new ValueNode[argumentsParam.size()]), StampPair.createSingle(returnStamp), parameterTypes, null,
new IndirectCallTargetNode(targetAddress, args.toArray(new ValueNode[args.size()]), StampPair.createSingle(returnStamp), parameterTypes, null,
convention, InvokeKind.Static));
InvokeNode invoke = append(new InvokeNode(callTarget, bci));

Expand Down
Loading

0 comments on commit a647ddd

Please sign in to comment.