diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java index 0d4d572e7c05..531ff8b47b95 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java @@ -217,9 +217,6 @@ public void parse(CEntryPointCreateIsolateParameters parameters, IsolateArgument } copyStringArguments(arguments); - - // Temporarily needed. - overrideParameters(parameters, arguments); } @Uninterruptible(reason = "Tear-down in progress.") @@ -269,12 +266,6 @@ private static void copyStringArguments(IsolateArguments arguments) { } } - // Temporary method. - @Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true) - protected void overrideParameters(CEntryPointCreateIsolateParameters parameters, IsolateArguments arguments) { - parameters.setReservedSpaceSize(WordFactory.unsigned(readLong(arguments, getOptionIndex(SubstrateGCOptions.ReservedAddressSpaceSize)))); - } - /** * Note that this logic must be in sync with * {@link com.oracle.svm.core.option.RuntimeOptionParser#parseAndConsumeAllOptions}. diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArguments.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArguments.java index 0e16ef1730a2..90d4b640fafa 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArguments.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArguments.java @@ -30,8 +30,6 @@ import org.graalvm.nativeimage.c.type.CLongPointer; import org.graalvm.word.PointerBase; -import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters; - @RawStructure public interface IsolateArguments extends PointerBase { @@ -60,7 +58,6 @@ public interface IsolateArguments extends PointerBase { @RawField void setProtectionKey(int pkey); - // Temporary unused. @RawField int getProtectionKey(); @@ -70,11 +67,4 @@ public interface IsolateArguments extends PointerBase { @RawField boolean getIsCompilationIsolate(); - // Temporary field. - @RawField - void setParameters(CEntryPointCreateIsolateParameters parameters); - - @RawField - CEntryPointCreateIsolateParameters getParameters(); - } diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java index 89db07381e90..1b41bc3d5bb8 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java @@ -242,9 +242,6 @@ private static int createIsolate(CEntryPointCreateIsolateParameters providedPara CLongPointer parsedArgs = StackValue.get(IsolateArgumentParser.singleton().getParsedArgsSize()); arguments.setParsedArgs(parsedArgs); - // Temporarily needed. - arguments.setParameters(parameters); - IsolateArgumentParser.singleton().parse(parameters, arguments); Container.initialize(); diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java index a36381519cc3..a7b01f526f33 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java @@ -32,7 +32,6 @@ import com.oracle.svm.core.IsolateArguments; import com.oracle.svm.core.Uninterruptible; -import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters; import jdk.graal.compiler.api.replacements.Fold; @@ -53,13 +52,7 @@ static CommittedMemoryProvider get() { * @return zero in case of success, non-zero in case of an error. */ @Uninterruptible(reason = "Still being initialized.") - int initialize(WordPointer heapBasePointer, CEntryPointCreateIsolateParameters parameters); - - @Uninterruptible(reason = "Still being initialized.") - default int initialize(WordPointer heapBasePointer, IsolateArguments arguments) { - // The default implementation of this method is temporary. - return initialize(heapBasePointer, arguments.getParameters()); - } + int initialize(WordPointer heapBasePointer, IsolateArguments arguments); /** * Tear down for the current isolate. This must be the last method of this interface diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java index f7115ef811ce..60d06ade6fb4 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/OSCommittedMemoryProvider.java @@ -32,10 +32,10 @@ import org.graalvm.nativeimage.Platforms; import org.graalvm.nativeimage.c.type.WordPointer; +import com.oracle.svm.core.IsolateArguments; import com.oracle.svm.core.Isolates; import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.Uninterruptible; -import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters; import com.oracle.svm.core.c.function.CEntryPointErrors; import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature; import com.oracle.svm.core.feature.InternalFeature; @@ -48,7 +48,7 @@ public OSCommittedMemoryProvider() { @Override @Uninterruptible(reason = "Still being initialized.") - public int initialize(WordPointer heapBasePointer, CEntryPointCreateIsolateParameters parameters) { + public int initialize(WordPointer heapBasePointer, IsolateArguments arguments) { if (!SubstrateOptions.SpawnIsolates.getValue()) { int result = protectSingleIsolateImageHeap(); if (result == CEntryPointErrors.NO_ERROR) {