From 463bd6b80da09e69d41716e555e13964ec6e478e Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Fri, 13 Oct 2023 21:08:27 +0200 Subject: [PATCH] move jdk.compiler.graal.truffle.compiler.* to jdk.compiler.graal.truffle.* --- .../graal/core/test/CheckGraalInvariants.java | 2 +- .../graal/core/test/OptionsVerifierTest.java | 2 +- .../graal/core/test/VerifyDebugUsage.java | 6 +-- .../test/AgnosticInliningPhaseTest.java | 10 ++-- .../test/ArrayUtilsIndexOfWithMaskTest.java | 2 +- ...UtilsRegionEqualsWithMaskConstantTest.java | 2 +- .../ArrayUtilsRegionEqualsWithMaskTest.java | 2 +- .../graal/truffle/test/ArrayUtilsTest.java | 2 +- .../test/CompilerDirectivesTypeTest.java | 4 +- .../truffle/test/CompilerLoggingTest.java | 2 +- .../truffle/test/ConditionAnchoringTest.java | 4 +- .../DynamicObjectPartialEvaluationTest.java | 2 +- .../truffle/test/EncodedGraphCacheTest.java | 6 +-- .../graal/truffle/test/ExactMathTest.java | 2 +- .../graal/truffle/test/HostInliningTest.java | 2 +- .../test/InstrumentBranchesPhaseTest.java | 4 +- .../truffle/test/PartialEvaluationTest.java | 14 +++--- .../truffle/test/PerformanceWarningTest.java | 4 +- .../graal/truffle/test/PhiTransformTest.java | 4 +- .../truffle/test/TruffleCompilerImplTest.java | 6 +-- .../libgraal/JNIExceptionWrapperTest.java | 2 +- .../truffle/test/strings/TStringTest.java | 2 +- .../AbstractKnownTruffleTypes.java | 2 +- .../AbstractTruffleCompilationSupport.java | 2 +- ...ommunityPartialEvaluatorConfiguration.java | 2 +- .../EconomyPartialEvaluatorConfiguration.java | 2 +- .../{compiler => }/ExpansionStatistics.java | 2 +- .../GraphTooBigBailoutException.java | 2 +- .../{compiler => }/KnownTruffleTypes.java | 2 +- .../PEAgnosticInlineInvokePlugin.java | 2 +- .../ParsingInlineInvokePlugin.java | 2 +- .../{compiler => }/PartialEvaluator.java | 10 ++-- .../PartialEvaluatorConfiguration.java | 4 +- .../PerformanceInformationHandler.java | 4 +- .../PostPartialEvaluationSuite.java | 6 +-- .../{compiler => }/SuppressFBWarnings.java | 2 +- .../truffle/{compiler => }/TruffleAST.java | 6 +-- .../{compiler => }/TruffleCompilation.java | 2 +- .../TruffleCompilationIdentifier.java | 2 +- .../TruffleCompilerConfiguration.java | 2 +- .../{compiler => }/TruffleCompilerImpl.java | 12 ++--- .../TruffleCompilerOptions.java | 2 +- .../TruffleConstantFieldProvider.java | 2 +- .../TruffleDebugHandlersFactory.java | 2 +- .../TruffleDebugJavaMethod.java | 2 +- .../{compiler => }/TruffleElementCache.java | 2 +- .../{compiler => }/TruffleInliningScope.java | 4 +- .../TruffleStringConstantFieldProvider.java | 2 +- .../TruffleTierConfiguration.java | 4 +- .../{compiler => }/TruffleTierContext.java | 4 +- .../host/HostInliningPhase.java | 6 +-- .../host/InjectImmutableFrameFieldsPhase.java | 2 +- .../host/TruffleHostEnvironment.java | 6 +-- .../host/TruffleKnownHostTypes.java | 6 +-- .../hotspot/HotSpotKnownTruffleTypes.java | 4 +- .../hotspot/HotSpotPartialEvaluator.java | 8 ++-- .../HotSpotTruffleCompilationIdentifier.java | 4 +- .../HotSpotTruffleCompilationSupport.java | 4 +- .../hotspot/HotSpotTruffleCompilerImpl.java | 16 +++---- .../HotSpotTruffleGraphBuilderPlugins.java | 2 +- .../HotSpotTruffleHostEnvironment.java | 8 ++-- .../HotSpotTruffleHostEnvironmentLookup.java | 4 +- .../HotSpotTruffleLoweringExtensions.java | 5 +- ...otSpotTruffleSafepointLoweringSnippet.java | 6 +-- ...fleCallBoundaryInstrumentationFactory.java | 4 +- ...TruffleCommunityCompilerConfiguration.java | 8 ++-- ...CommunityCompilerConfigurationFactory.java | 2 +- .../hotspot/TruffleEntryPointDecorator.java | 4 +- ...fleCallBoundaryInstrumentationFactory.java | 8 ++-- ...fleCallBoundaryInstrumentationFactory.java | 8 ++-- .../{compiler => }/nodes/AnyExtendNode.java | 2 +- .../nodes/IsCompilationConstantNode.java | 2 +- .../nodes/ObjectLocationIdentity.java | 2 +- .../nodes/SpeculativeExceptionAnchorNode.java | 4 +- .../nodes/TruffleAssumption.java | 2 +- .../nodes/TruffleSafepointNode.java | 2 +- .../asserts/NeverPartOfCompilationNode.java | 2 +- .../nodes/frame/AllowMaterializeNode.java | 2 +- .../nodes/frame/ForceMaterializeNode.java | 2 +- .../nodes/frame/NewFrameNode.java | 4 +- .../nodes/frame/VirtualFrameAccessFlags.java | 2 +- .../nodes/frame/VirtualFrameAccessType.java | 2 +- .../VirtualFrameAccessVerificationNode.java | 4 +- .../nodes/frame/VirtualFrameAccessorNode.java | 2 +- .../nodes/frame/VirtualFrameClearNode.java | 2 +- .../nodes/frame/VirtualFrameCopyNode.java | 2 +- .../nodes/frame/VirtualFrameGetNode.java | 2 +- .../nodes/frame/VirtualFrameGetTagNode.java | 2 +- .../nodes/frame/VirtualFrameIsNode.java | 2 +- .../nodes/frame/VirtualFrameSetNode.java | 2 +- .../nodes/frame/VirtualFrameSwapNode.java | 2 +- .../phases/DeoptimizeOnExceptionPhase.java | 4 +- .../phases/FrameAccessVerificationPhase.java | 18 +++---- .../InliningAcrossTruffleBoundaryPhase.java | 4 +- .../phases/InstrumentBranchesPhase.java | 4 +- .../phases/InstrumentPhase.java | 18 +++---- .../InstrumentTruffleBoundariesPhase.java | 4 +- .../phases/InstrumentationSuite.java | 4 +- .../phases/MaterializeFramesPhase.java | 6 +-- .../phases/NeverPartOfCompilationPhase.java | 6 +-- .../phases/PhiTransformPhase.java | 4 +- .../ReportPerformanceWarningsPhase.java | 4 +- .../phases/SetIdentityForValueTypesPhase.java | 4 +- .../phases/TruffleCompilerPhases.java | 4 +- .../TruffleLoopSafepointEliminationPhase.java | 4 +- .../TruffleSafepointInsertionPhase.java | 8 ++-- .../{compiler => }/phases/TruffleTier.java | 12 ++--- .../phases/VerifyFrameDoesNotEscapePhase.java | 6 +-- .../inlining/AgnosticInliningPhase.java | 12 ++--- .../phases/inlining/CallNode.java | 8 ++-- .../phases/inlining/CallTree.java | 10 ++-- .../inlining/DefaultInliningPolicy.java | 4 +- .../DefaultInliningPolicyProvider.java | 2 +- .../phases/inlining/GraphManager.java | 16 +++---- .../phases/inlining/InliningPolicy.java | 4 +- .../inlining/InliningPolicyProvider.java | 2 +- .../phases/inlining/NoInliningPolicy.java | 2 +- .../inlining/NoInliningPolicyProvider.java | 2 +- .../inlining/TrivialOnlyInliningPolicy.java | 4 +- .../inlining/TrivialOnlyPolicyProvider.java | 2 +- .../GraphBuilderInvocationPluginProvider.java | 4 +- .../GraphDecoderInvocationPluginProvider.java | 2 +- .../TruffleGraphBuilderPlugins.java | 48 +++++++++---------- .../TruffleInvocationPlugins.java | 2 +- .../svm/core/meta/ObjectConstantEquality.java | 2 +- .../hotspot/libgraal/LibGraalFeature.java | 12 ++--- .../LibGraalTruffleHostEnvironment.java | 8 ++-- .../LibGraalTruffleHostEnvironmentLookup.java | 2 +- .../truffle/TruffleLibGraalFeature.java | 2 +- .../truffle/TruffleToLibGraalEntryPoints.java | 6 +-- .../LegacyRuntimeCompilationFeature.java | 2 +- .../ParseOnceRuntimeCompilationFeature.java | 2 +- .../svm/graal/meta/RuntimeCodeInstaller.java | 2 +- .../truffle/SubstrateHostInliningPhase.java | 4 +- ...SubstrateTruffleCompilationIdentifier.java | 2 +- .../SubstrateTruffleHostEnvironment.java | 6 +-- ...SubstrateTruffleHostEnvironmentLookup.java | 2 +- .../svm/truffle/TruffleBaseFeature.java | 6 +-- .../oracle/svm/truffle/TruffleFeature.java | 10 ++-- .../oracle/svm/truffle/TruffleSupport.java | 10 ++-- .../api/SubstrateKnownTruffleTypes.java | 2 +- ...trateOptimizedCallTargetInstalledCode.java | 2 +- .../api/SubstratePartialEvaluator.java | 8 ++-- .../SubstratePostPartialEvaluationSuite.java | 2 +- ...SubstrateThreadLocalHandshakeSnippets.java | 2 +- .../SubstrateTruffleCompilationSupport.java | 2 +- .../truffle/api/SubstrateTruffleCompiler.java | 4 +- .../api/SubstrateTruffleCompilerImpl.java | 16 +++---- .../svm/truffle/api/TruffleBoundaryPhase.java | 2 +- .../isolated/IsolateAwareTruffleCompiler.java | 6 +-- .../IsolatedTruffleCompilationIdentifier.java | 2 +- 151 files changed, 352 insertions(+), 353 deletions(-) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/AbstractKnownTruffleTypes.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/AbstractTruffleCompilationSupport.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/CommunityPartialEvaluatorConfiguration.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/EconomyPartialEvaluatorConfiguration.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/ExpansionStatistics.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/GraphTooBigBailoutException.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/KnownTruffleTypes.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PEAgnosticInlineInvokePlugin.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/ParsingInlineInvokePlugin.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PartialEvaluator.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PartialEvaluatorConfiguration.java (93%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PerformanceInformationHandler.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PostPartialEvaluationSuite.java (94%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/SuppressFBWarnings.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleAST.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilation.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilationIdentifier.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilerConfiguration.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilerImpl.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilerOptions.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleConstantFieldProvider.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleDebugHandlersFactory.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleDebugJavaMethod.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleElementCache.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleInliningScope.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleStringConstantFieldProvider.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleTierConfiguration.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleTierContext.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/HostInliningPhase.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/InjectImmutableFrameFieldsPhase.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/TruffleHostEnvironment.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/TruffleKnownHostTypes.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotKnownTruffleTypes.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotPartialEvaluator.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleCompilationIdentifier.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleCompilationSupport.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleCompilerImpl.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleGraphBuilderPlugins.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleHostEnvironment.java (92%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleHostEnvironmentLookup.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleLoweringExtensions.java (87%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleSafepointLoweringSnippet.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleCallBoundaryInstrumentationFactory.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleCommunityCompilerConfiguration.java (92%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleCommunityCompilerConfigurationFactory.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleEntryPointDecorator.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java (94%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java (94%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/AnyExtendNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/IsCompilationConstantNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/ObjectLocationIdentity.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/SpeculativeExceptionAnchorNode.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/TruffleAssumption.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/TruffleSafepointNode.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/asserts/NeverPartOfCompilationNode.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/AllowMaterializeNode.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/ForceMaterializeNode.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/NewFrameNode.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessFlags.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessType.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessVerificationNode.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessorNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameClearNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameCopyNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameGetNode.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameGetTagNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameIsNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameSetNode.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameSwapNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/DeoptimizeOnExceptionPhase.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/FrameAccessVerificationPhase.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InliningAcrossTruffleBoundaryPhase.java (94%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentBranchesPhase.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentPhase.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentTruffleBoundariesPhase.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentationSuite.java (94%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/MaterializeFramesPhase.java (90%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/NeverPartOfCompilationPhase.java (92%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/PhiTransformPhase.java (99%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/ReportPerformanceWarningsPhase.java (93%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/SetIdentityForValueTypesPhase.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleCompilerPhases.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleLoopSafepointEliminationPhase.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleSafepointInsertionPhase.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleTier.java (84%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/VerifyFrameDoesNotEscapePhase.java (93%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/AgnosticInliningPhase.java (92%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/CallNode.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/CallTree.java (93%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/DefaultInliningPolicy.java (98%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/DefaultInliningPolicyProvider.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/GraphManager.java (94%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/InliningPolicy.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/InliningPolicyProvider.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/NoInliningPolicy.java (95%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/NoInliningPolicyProvider.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/TrivialOnlyInliningPolicy.java (93%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/TrivialOnlyPolicyProvider.java (96%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/GraphBuilderInvocationPluginProvider.java (94%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/GraphDecoderInvocationPluginProvider.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/TruffleGraphBuilderPlugins.java (97%) rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/TruffleInvocationPlugins.java (99%) diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java index 94a6d22ca54dd..fdcf373b4b295 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java @@ -203,7 +203,7 @@ protected void updateVerifiers(List> verifiers) { */ public boolean shouldCheckUsage(OptionDescriptor option) { Class declaringClass = option.getDeclaringClass(); - if (declaringClass.getName().equals("jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions")) { + if (declaringClass.getName().equals("jdk.compiler.graal.truffle.TruffleCompilerOptions")) { /* * These options are deprecated and will be removed in GraalVM 20.2.0. The * TruffleIntrinsifyFrameAccess option has no replacement and is unused. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java index d41572a450a33..a52afad763032 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java @@ -56,7 +56,7 @@ public class OptionsVerifierTest { private static Set ALLOWLIST = new TreeSet<>(Arrays.asList(// - "jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions")); + "jdk.compiler.graal.truffle.TruffleCompilerOptions")); @Test public void verifyOptions() throws IOException { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java index dc52a3959f676..16a5faec6a4f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java @@ -50,9 +50,9 @@ import jdk.compiler.graal.replacements.ReplacementsImpl; import jdk.compiler.graal.replacements.SnippetTemplate; import jdk.compiler.graal.test.GraalTest.MethodSource; -import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree; +import jdk.compiler.graal.truffle.PerformanceInformationHandler; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.phases.inlining.CallTree; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.PrimitiveConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java index 0f2d105d207da..ce97555ea78e6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java @@ -26,11 +26,11 @@ import jdk.compiler.graal.core.common.CompilationIdentifier; import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; -import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.PostPartialEvaluationSuite; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleTierContext; +import jdk.compiler.graal.truffle.phases.inlining.AgnosticInliningPhase; import org.graalvm.polyglot.Context; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java index 86920f7c6f6dc..c5a296f9e7749 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java @@ -29,7 +29,7 @@ import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java index 180eea974fe26..24170f6ad61d6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java @@ -33,7 +33,7 @@ import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; import jdk.compiler.graal.options.OptionValues; import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java index 434eb8d7017e2..d2e71ca105145 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java @@ -28,7 +28,7 @@ import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java index 61d8ad1424e2a..d9caba5d3a16d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java @@ -28,7 +28,7 @@ import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java index adb7dfcf4a77c..01659823f1d19 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java @@ -26,8 +26,8 @@ import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; +import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider; +import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java index a0168a6fb9d6f..b1cb14035b2e7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java @@ -36,7 +36,7 @@ import com.oracle.truffle.api.TruffleOptions; import com.oracle.truffle.api.frame.VirtualFrame; import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Assume; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java index b2abf89d8f17d..d26b14b986b75 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java @@ -54,8 +54,8 @@ import jdk.compiler.graal.phases.common.FloatingReadPhase; import jdk.compiler.graal.phases.common.HighTierLoweringPhase; import jdk.compiler.graal.phases.common.LoweringPhase; -import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; +import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity; +import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java index 54459acefd471..18eb1078cbfb6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java @@ -35,7 +35,7 @@ import jdk.compiler.graal.nodes.extended.UnsafeAccessNode; import jdk.compiler.graal.nodes.java.LoadFieldNode; import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity; +import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java index 5ea3c57118d0a..25a089c62c86e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java @@ -34,9 +34,9 @@ import org.graalvm.collections.EconomicMap; import jdk.compiler.graal.debug.DebugContext; import jdk.compiler.graal.nodes.EncodedGraph; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.TruffleCompilation; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.TruffleCompilation; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java index 16ea367864ffd..c051180dcb0fb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java @@ -26,7 +26,7 @@ import jdk.compiler.graal.nodes.calc.RoundNode; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; +import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java index 8882b7ea5f942..dd3a5c833cb4e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java @@ -55,7 +55,7 @@ import jdk.compiler.graal.options.OptionValues; import jdk.compiler.graal.phases.common.CanonicalizerPhase; import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase; +import jdk.compiler.graal.truffle.host.HostInliningPhase; import jdk.compiler.graal.truffle.test.HostInliningTestFactory.IfNodeGen; import org.graalvm.polyglot.Context; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java index e4168b5795407..f2495ce3dc115 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java @@ -30,8 +30,8 @@ import jdk.compiler.graal.api.directives.GraalDirectives; import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.phases.InstrumentPhase; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java index fa109ae4c6d2a..796bd9c649e97 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java @@ -44,13 +44,13 @@ import jdk.compiler.graal.phases.PhaseSuite; import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler; -import jdk.compiler.graal.truffle.compiler.TruffleCompilation; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; -import jdk.compiler.graal.truffle.compiler.phases.TruffleTier; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.PerformanceInformationHandler; +import jdk.compiler.graal.truffle.TruffleCompilation; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleDebugJavaMethod; +import jdk.compiler.graal.truffle.TruffleTierContext; +import jdk.compiler.graal.truffle.phases.TruffleTier; import org.junit.Assert; import com.oracle.truffle.api.CallTarget; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java index ddae1cd5d50a3..2d471f24dfc82 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java @@ -29,8 +29,8 @@ import jdk.compiler.graal.debug.DebugCloseable; import jdk.compiler.graal.debug.DebugContext; import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.truffle.compiler.TruffleCompilation; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilation; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java index 36e8037398ce9..e77caded135ea 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java @@ -41,8 +41,8 @@ import jdk.compiler.graal.phases.BasePhase; import jdk.compiler.graal.phases.tiers.HighTierContext; import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode; -import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase; +import jdk.compiler.graal.truffle.nodes.AnyExtendNode; +import jdk.compiler.graal.truffle.phases.PhiTransformPhase; import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java index dce997e85277f..0ad0fbe9504ce 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java @@ -30,9 +30,9 @@ import jdk.compiler.graal.core.common.CompilationIdentifier; import jdk.compiler.graal.core.target.Backend; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; -import jdk.compiler.graal.truffle.compiler.TruffleCompilation; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.KnownTruffleTypes; +import jdk.compiler.graal.truffle.TruffleCompilation; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.After; import org.junit.Assume; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java index fdb3c606c6f0b..444e20f4cb8af 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java @@ -36,7 +36,7 @@ import jdk.compiler.graal.core.CompilationWrapper; import jdk.compiler.graal.core.GraalCompilerOptions; import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import jdk.compiler.graal.truffle.test.TestWithPolyglotOptions; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java index 4f979c19e4d19..c78ecf374a3ff 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java +++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java @@ -37,7 +37,7 @@ import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.amd64.AMD64; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java index aa2de90bf2420..8ccce536bbf09 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java index 0200666aad784..e707b60c77adb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import com.oracle.truffle.compiler.TruffleCompilationSupport; import com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java index 659356612c059..ad9b2d4da551b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.serviceprovider.ServiceProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java index cf793815a8247..be45650f4f326 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.serviceprovider.ServiceProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java index f81ebcfcd30ff..87b42f4e169ee 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java index b1f4373c96f80..d414a09ddc4b4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.core.common.PermanentBailoutException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java index 4e299d6f68da6..02abe832de46a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.lang.invoke.MethodHandle; import java.lang.ref.Reference; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java index 8c171756df32a..1b01c20492620 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java index 747914d6ca438..13c327ed23f36 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.nodes.ValueNode; import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java index d89809540ac0c..2fc39d5d2598d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.net.URI; import java.nio.Buffer; import java.util.function.Supplier; -import jdk.compiler.graal.truffle.compiler.phases.DeoptimizeOnExceptionPhase; -import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase; -import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; +import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase; +import jdk.compiler.graal.truffle.phases.InstrumentPhase; +import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider; +import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins; import org.graalvm.collections.EconomicMap; import jdk.compiler.graal.core.common.type.StampPair; import jdk.compiler.graal.graph.Graph; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java index 621046288954b..cb2b3744044dc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; -import jdk.compiler.graal.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider; +import jdk.compiler.graal.truffle.substitutions.GraphDecoderInvocationPluginProvider; import jdk.vm.ci.code.Architecture; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; import jdk.compiler.graal.phases.util.Providers; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java index f8c4eedd5e631..ce8dc65a31b35 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.io.Closeable; import java.util.ArrayList; @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Set; -import jdk.compiler.graal.truffle.compiler.phases.TruffleTier; +import jdk.compiler.graal.truffle.phases.TruffleTier; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; import org.graalvm.collections.MapCursor; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java index 3e030bbc168fe..2ce32cbacc3dd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; import jdk.compiler.graal.nodes.StructuredGraph; @@ -33,8 +33,8 @@ import jdk.compiler.graal.phases.common.CanonicalizerPhase; import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import jdk.compiler.graal.phases.common.inlining.InliningUtil; -import jdk.compiler.graal.truffle.compiler.phases.FrameAccessVerificationPhase; -import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase; +import jdk.compiler.graal.truffle.phases.FrameAccessVerificationPhase; +import jdk.compiler.graal.truffle.phases.PhiTransformPhase; import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; public class PostPartialEvaluationSuite extends PhaseSuite { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java index 0d2f11a3ba56d..6528d372b1fc1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java index b0304701a09a3..66458e589018b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.ArrayList; import java.util.Collection; @@ -36,8 +36,8 @@ import jdk.compiler.graal.graph.NodeSourcePosition; import jdk.compiler.graal.nodes.ConstantNode; import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.truffle.compiler.phases.inlining.CallNode; -import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree; +import jdk.compiler.graal.truffle.phases.inlining.CallNode; +import jdk.compiler.graal.truffle.phases.inlining.CallTree; import jdk.compiler.graal.graphio.GraphBlocks; import jdk.compiler.graal.graphio.GraphStructure; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java index f82a8818ed784..a0a47db69427f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.function.Consumer; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java index a8b4a78b40c83..883a02da2944e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.core.common.CompilationIdentifier; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java index c64dfb33a1877..64ca3bed960d1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.Arrays; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java index 22d8c765e07ec..1b36437776581 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI; import static jdk.compiler.graal.core.CompilationWrapper.ExceptionAction.Diagnose; @@ -42,11 +42,11 @@ import java.util.function.Consumer; import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode; -import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption; -import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase; -import jdk.compiler.graal.truffle.compiler.phases.InstrumentationSuite; -import jdk.compiler.graal.truffle.compiler.phases.TruffleTier; +import jdk.compiler.graal.truffle.nodes.AnyExtendNode; +import jdk.compiler.graal.truffle.nodes.TruffleAssumption; +import jdk.compiler.graal.truffle.phases.InstrumentPhase; +import jdk.compiler.graal.truffle.phases.InstrumentationSuite; +import jdk.compiler.graal.truffle.phases.TruffleTier; import org.graalvm.collections.EconomicMap; import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; import jdk.compiler.graal.code.CompilationResult; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java index 5454280cf3a32..480d3b484fc54 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java index c18a24e1580da..687a4bdd3a2e7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.core.common.spi.ConstantFieldProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java index d4a3db1d27e9d..49ce4bc2d7311 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.io.IOException; import java.util.HashMap; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java index f31f002155bb4..e6f7dc59927f5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import com.oracle.truffle.compiler.TruffleCompilable; import com.oracle.truffle.compiler.TruffleCompilationTask; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java index 3c11920b5461f..0c3690b3d498f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java index 47bfb51b4e7cc..ae471204ae3fc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.io.Closeable; import jdk.compiler.graal.debug.DebugContext; import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree; +import jdk.compiler.graal.truffle.phases.inlining.CallTree; /** * Scope class intended to capture the inlined call tree during dumping. This scope has no effect if diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java index 511a8ff89f3d8..53d7fc1800dec 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.core.common.spi.ConstantFieldProvider; import jdk.compiler.graal.phases.util.Providers; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java index 5af707b99d8e0..de1a6c26b711e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import jdk.compiler.graal.core.target.Backend; import jdk.compiler.graal.lir.phases.LIRSuites; import jdk.compiler.graal.options.OptionValues; import jdk.compiler.graal.phases.tiers.Suites; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.phases.TruffleCompilerPhases; +import jdk.compiler.graal.truffle.phases.TruffleCompilerPhases; public final class TruffleTierConfiguration { private final PartialEvaluatorConfiguration configuration; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java index 9bde66f1c7b90..1f7b9221fbe43 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler; +package jdk.compiler.graal.truffle; import java.util.Objects; @@ -36,7 +36,7 @@ import jdk.compiler.graal.phases.PhaseSuite; import jdk.compiler.graal.phases.tiers.HighTierContext; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption; +import jdk.compiler.graal.truffle.nodes.TruffleAssumption; import com.oracle.truffle.compiler.TruffleCompilable; import com.oracle.truffle.compiler.TruffleCompilationTask; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java index 8825bc1ca7029..03b35b52b5c75 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.host; +package jdk.compiler.graal.truffle.host; import static jdk.compiler.graal.core.common.GraalOptions.Intrinsify; import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; @@ -78,8 +78,8 @@ import jdk.compiler.graal.phases.common.inlining.InliningUtil; import jdk.compiler.graal.phases.contract.NodeCostUtil; import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; +import jdk.compiler.graal.truffle.KnownTruffleTypes; +import jdk.compiler.graal.truffle.PartialEvaluator; import com.oracle.truffle.compiler.HostMethodInfo; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java index 34577bafd5470..8cadbe4b3366c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.host; +package jdk.compiler.graal.truffle.host; import jdk.compiler.graal.graph.Node; import jdk.compiler.graal.nodes.StructuredGraph; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java index ee142582fd834..775ca9c98ce20 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.host; +package jdk.compiler.graal.truffle.host; import jdk.compiler.graal.debug.GraalError; import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import com.oracle.truffle.compiler.HostMethodInfo; import com.oracle.truffle.compiler.TruffleCompilable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java index 887c51f464a94..1df5619ca13db 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.host; +package jdk.compiler.graal.truffle.host; -import jdk.compiler.graal.truffle.compiler.AbstractKnownTruffleTypes; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.AbstractKnownTruffleTypes; +import jdk.compiler.graal.truffle.KnownTruffleTypes; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java index f22268e0c3b35..b0e325fd23b76 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.KnownTruffleTypes; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java index e7b0e3ea10d18..0af1bf1237f5c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -37,9 +37,9 @@ import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleElementCache; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleElementCache; import com.oracle.truffle.compiler.ConstantFieldInfo; import com.oracle.truffle.compiler.PartialEvaluationMethodInfo; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java index b8f4634de8d53..e5d5dca32470e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import jdk.compiler.graal.hotspot.HotSpotCompilationIdentifier; -import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier; +import jdk.compiler.graal.truffle.TruffleCompilationIdentifier; import com.oracle.truffle.compiler.TruffleCompilable; import com.oracle.truffle.compiler.TruffleCompilationTask; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java index a9e5f8cdbea7b..243de5a744ab6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import jdk.compiler.graal.hotspot.CompilerConfigurationFactory; import jdk.compiler.graal.hotspot.HotSpotGraalOptionValues; import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.truffle.compiler.AbstractTruffleCompilationSupport; +import jdk.compiler.graal.truffle.AbstractTruffleCompilationSupport; import com.oracle.truffle.compiler.TruffleCompiler; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java index 51ecc721e859c..0f884857dea22 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import static jdk.compiler.graal.core.GraalCompiler.compileGraph; import static jdk.compiler.graal.debug.DebugOptions.DebugStubsAndSnippets; @@ -81,13 +81,13 @@ import jdk.compiler.graal.phases.util.Providers; import jdk.compiler.graal.printer.GraalDebugHandlersFactory; import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.truffle.compiler.host.InjectImmutableFrameFieldsPhase; -import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration; -import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase; +import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase; +import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilationIdentifier; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleTierConfiguration; +import jdk.compiler.graal.truffle.host.HostInliningPhase; import com.oracle.truffle.compiler.TruffleCompilable; import com.oracle.truffle.compiler.TruffleCompilationTask; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java index a449e5c12c9aa..89bd549aef883 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import java.lang.ref.Reference; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java index 43a0eb527ca37..f8950d260b3bd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleElementCache; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleElementCache; import com.oracle.truffle.compiler.HostMethodInfo; import com.oracle.truffle.compiler.TruffleCompilable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java index 45b98339ec6c0..2e70f3b5e7296 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import java.util.concurrent.atomic.AtomicReference; import jdk.compiler.graal.serviceprovider.ServiceProvider; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java index 3d5930e3b2a85..3ad38ede8ec2b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import java.util.Collections; import java.util.List; import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider; import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider.Extension; -import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleSafepointLoweringSnippet.TruffleHotSpotSafepointLoweringExtension; /** * Lowering of HotSpot Truffle specific nodes. @@ -47,6 +46,6 @@ public final class HotSpotTruffleLoweringExtensions implements DefaultHotSpotLow @Override public List createExtensions() { - return Collections.singletonList(new TruffleHotSpotSafepointLoweringExtension(truffleTypes)); + return Collections.singletonList(new HotSpotTruffleSafepointLoweringSnippet.TruffleHotSpotSafepointLoweringExtension(truffleTypes)); } } diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java index e054b42686219..8c835564c1e4b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; @@ -55,8 +55,8 @@ import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.truffle.compiler.nodes.TruffleSafepointNode; -import jdk.compiler.graal.truffle.compiler.phases.TruffleSafepointInsertionPhase; +import jdk.compiler.graal.truffle.nodes.TruffleSafepointNode; +import jdk.compiler.graal.truffle.phases.TruffleSafepointInsertionPhase; import jdk.compiler.graal.word.Word; import org.graalvm.word.LocationIdentity; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java index dd172c256ea93..1a18928f80687 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import jdk.compiler.graal.lir.asm.EntryPointDecorator; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; import com.oracle.truffle.compiler.TruffleCompilable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java index 1a5ffc4901731..7113f0aa3b3d9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import jdk.compiler.graal.core.phases.CommunityCompilerConfiguration; import jdk.compiler.graal.core.phases.HighTier; import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; import jdk.compiler.graal.nodes.spi.Replacements; import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.truffle.compiler.host.InjectImmutableFrameFieldsPhase; -import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase; +import jdk.compiler.graal.truffle.host.HostInliningPhase; +import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java index 578b14f355c54..ecdc5ded9b363 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import jdk.compiler.graal.hotspot.CommunityCompilerConfigurationFactory; import jdk.compiler.graal.hotspot.CompilerConfigurationFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java index 4d19cb09fa1b3..c9f728a60785e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot; +package jdk.compiler.graal.truffle.hotspot; import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER; @@ -33,7 +33,7 @@ import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; import jdk.compiler.graal.lir.asm.EntryPointDecorator; import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java index 731afbc491917..7d7984578f402 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot.aarch64; +package jdk.compiler.graal.truffle.hotspot.aarch64; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall; import static jdk.vm.ci.meta.JavaKind.Object; @@ -44,9 +44,9 @@ import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import jdk.compiler.graal.lir.asm.EntryPointDecorator; import jdk.compiler.graal.serviceprovider.ServiceProvider; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; -import jdk.compiler.graal.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory; -import jdk.compiler.graal.truffle.compiler.hotspot.TruffleEntryPointDecorator; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory; +import jdk.compiler.graal.truffle.hotspot.TruffleEntryPointDecorator; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java index 5e584aa1ab3c1..c8d6b33c7bf51 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.hotspot.amd64; +package jdk.compiler.graal.truffle.hotspot.amd64; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall; import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER; @@ -42,9 +42,9 @@ import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import jdk.compiler.graal.lir.asm.EntryPointDecorator; import jdk.compiler.graal.serviceprovider.ServiceProvider; -import jdk.compiler.graal.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory; -import jdk.compiler.graal.truffle.compiler.hotspot.TruffleEntryPointDecorator; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory; +import jdk.compiler.graal.truffle.hotspot.TruffleEntryPointDecorator; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java index 9a1fcb2426f9c..33c42d22b8e3c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes; +package jdk.compiler.graal.truffle.nodes; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java index b7f2416bb8682..0cbc6def5fd97 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes; +package jdk.compiler.graal.truffle.nodes; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java index 24eb824409ab3..a705f04be8c47 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes; +package jdk.compiler.graal.truffle.nodes; import java.util.Objects; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java index 47eedc5bcbd8d..52f76a54d1575 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes; +package jdk.compiler.graal.truffle.nodes; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; @@ -35,7 +35,7 @@ import jdk.compiler.graal.nodeinfo.NodeInfo; import jdk.compiler.graal.nodes.DeoptimizeNode; import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; +import jdk.compiler.graal.truffle.PartialEvaluator; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java index cbce066453e34..590e6aa2a4c42 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes; +package jdk.compiler.graal.truffle.nodes; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java index 1930c39a8c342..c578b4b3cb6e7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes; +package jdk.compiler.graal.truffle.nodes; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java index e39e5f1e849f7..5c2af7a0153ae 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.asserts; +package jdk.compiler.graal.truffle.nodes.asserts; import static jdk.compiler.graal.nodeinfo.InputType.State; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java index ff1d472acf846..7f6460ede9160 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java index 761618c66df80..d080cdc5b8970 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java index 4a6fdcf21726d..1cf3ccb3a6bbd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; @@ -55,7 +55,7 @@ import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode; import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.KnownTruffleTypes; import jdk.vm.ci.meta.ConstantReflectionProvider; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java index eb8c3e946cfbd..7bc3aa4219eb4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; public enum VirtualFrameAccessFlags { // Does not access the frame storage (getTag / isX) diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java index fba9a04a9935b..57bc484d60e89 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; public enum VirtualFrameAccessType { Indexed, diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java index 6dfb387e04910..fce3e762b97cc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import jdk.compiler.graal.nodes.ValueNodeInterface; -import jdk.compiler.graal.truffle.compiler.phases.FrameAccessVerificationPhase; +import jdk.compiler.graal.truffle.phases.FrameAccessVerificationPhase; /** * Interface used to update the frame verification state in {@link FrameAccessVerificationPhase}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java index 6e152eff2e6ba..e712f26c56193 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java index cf9237ef478ba..7cddde079df57 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java index 1a20f47d3a164..dc868a5e7ef54 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java index 11969a845d969..cd61d48c6dd96 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java index 5fed7bebadeaf..d4300842f382b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java index df334380022cd..6b9e5dbad7153 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java index 356124d0f47f5..8a65b3e5a3225 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java index b85c9d9dca8ce..38f39f2cc5926 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.nodes.frame; +package jdk.compiler.graal.truffle.nodes.frame; import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java index 9ea147c5d7d84..65f52d80d973d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import java.util.function.Predicate; @@ -32,7 +32,7 @@ import jdk.compiler.graal.nodes.InvokeWithExceptionNode; import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.phases.Phase; -import jdk.compiler.graal.truffle.compiler.nodes.SpeculativeExceptionAnchorNode; +import jdk.compiler.graal.truffle.nodes.SpeculativeExceptionAnchorNode; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java index 90fa7078a95aa..6a921f57d692a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import java.util.ArrayList; import java.util.Arrays; @@ -34,6 +34,11 @@ import java.util.List; import java.util.Map; +import jdk.compiler.graal.truffle.nodes.frame.NewFrameNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessFlags; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessType; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessVerificationNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameSetNode; import org.graalvm.collections.EconomicMap; import jdk.compiler.graal.core.common.util.CompilationAlarm; import jdk.compiler.graal.debug.DebugContext; @@ -55,14 +60,9 @@ import jdk.compiler.graal.phases.graph.ReentrantNodeIterator; import jdk.compiler.graal.phases.graph.ReentrantNodeIterator.LoopInfo; import jdk.compiler.graal.phases.graph.ReentrantNodeIterator.NodeIteratorClosure; -import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; -import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessFlags; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessType; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessVerificationNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSetNode; +import jdk.compiler.graal.truffle.PerformanceInformationHandler; +import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind; +import jdk.compiler.graal.truffle.TruffleTierContext; import com.oracle.truffle.compiler.TruffleCompilable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java index 8dcc553609f91..04a5e7ff61cde 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.nodes.java.MethodCallTargetNode; import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.TruffleTierContext; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java index 6bbf6c8388d1f..c37fdefa8e8c1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; import jdk.compiler.graal.debug.MethodFilter; @@ -32,7 +32,7 @@ import jdk.compiler.graal.nodes.StructuredGraph; import jdk.vm.ci.meta.JavaConstant; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.TruffleTierContext; /** * Instruments {@link IfNode}s in the graph, by adding execution counters to the true and the false diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java index 531f32db6edb7..7ccd718bd38b7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; -import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBoundaries; -import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBoundariesPerInlineSite; -import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBranches; -import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBranchesPerInlineSite; -import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentationTableSize; +import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBoundaries; +import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBoundariesPerInlineSite; +import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBranches; +import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBranchesPerInlineSite; +import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentationTableSize; import java.util.AbstractMap; import java.util.ArrayList; @@ -54,9 +54,9 @@ import jdk.compiler.graal.nodes.java.StoreIndexedNode; import jdk.compiler.graal.options.OptionValues; import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.KnownTruffleTypes; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleTierContext; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java index a6a29569ac94c..6b2c19f56fd37 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; import jdk.compiler.graal.debug.MethodFilter; @@ -31,7 +31,7 @@ import jdk.compiler.graal.nodes.FixedWithNextNode; import jdk.compiler.graal.nodes.Invoke; import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.TruffleTierContext; import com.oracle.truffle.compiler.TruffleCompilerRuntime.InlineKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java index 8c26de1452401..33ac6802c1789 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.TruffleTierContext; public class InstrumentationSuite extends PhaseSuite { @SuppressWarnings("this-escape") diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java index fb18f6df0dcb7..f0242765ba843 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; -import jdk.compiler.graal.truffle.compiler.nodes.frame.AllowMaterializeNode; +import jdk.compiler.graal.truffle.TruffleTierContext; +import jdk.compiler.graal.truffle.nodes.frame.AllowMaterializeNode; public final class MaterializeFramesPhase extends BasePhase { @Override diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java index 3baa7c543a851..4228ea3f5c713 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.core.common.GraalBailoutException; import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.nodes.util.GraphUtil; import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.truffle.compiler.nodes.asserts.NeverPartOfCompilationNode; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.nodes.asserts.NeverPartOfCompilationNode; +import jdk.compiler.graal.truffle.TruffleTierContext; public final class NeverPartOfCompilationPhase extends BasePhase { @Override diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java index 440ee442ecbf9..48898837e3edd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import org.graalvm.collections.EconomicSet; import jdk.compiler.graal.core.common.type.Stamp; @@ -51,7 +51,7 @@ import jdk.compiler.graal.phases.BasePhase; import jdk.compiler.graal.phases.common.CanonicalizerPhase; import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener; -import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode; +import jdk.compiler.graal.truffle.nodes.AnyExtendNode; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java index fc14a1ea8c858..49882b758f94f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.TruffleTierContext; public final class ReportPerformanceWarningsPhase extends BasePhase { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java index ecb96191632e5..4e1d3fbea6652 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode; import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.TruffleTierContext; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java index e39d4a1209506..f61e48bc02e28 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import java.util.ListIterator; @@ -32,7 +32,7 @@ import jdk.compiler.graal.phases.tiers.MidTierContext; import jdk.compiler.graal.phases.tiers.Suites; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.KnownTruffleTypes; public final class TruffleCompilerPhases { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java index abfa8689de072..91cbf7c34c18a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.graph.Node; import jdk.compiler.graal.loop.phases.LoopSafepointEliminationPhase; @@ -33,7 +33,7 @@ import jdk.compiler.graal.nodes.java.AbstractNewObjectNode; import jdk.compiler.graal.nodes.loop.LoopEx; import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.KnownTruffleTypes; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java index 3c5f76c321cc3..2eb46fe91aa2f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.core.common.type.ObjectStamp; import jdk.compiler.graal.core.common.type.StampFactory; @@ -43,9 +43,9 @@ import jdk.compiler.graal.nodes.spi.NodeWithState; import jdk.compiler.graal.phases.Phase; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; -import jdk.compiler.graal.truffle.compiler.TruffleCompilation; -import jdk.compiler.graal.truffle.compiler.nodes.TruffleSafepointNode; +import jdk.compiler.graal.truffle.KnownTruffleTypes; +import jdk.compiler.graal.truffle.TruffleCompilation; +import jdk.compiler.graal.truffle.nodes.TruffleSafepointNode; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java index fab7c19f6242f..8b5d4f4c216e0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.core.phases.BaseTier; import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; -import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.PostPartialEvaluationSuite; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleTierContext; +import jdk.compiler.graal.truffle.phases.inlining.AgnosticInliningPhase; public class TruffleTier extends BaseTier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java index 427662b770499..3459924f81cd5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases; +package jdk.compiler.graal.truffle.phases; import jdk.compiler.graal.graph.GraalGraphError; import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.nodes.java.MethodCallTargetNode; import jdk.compiler.graal.nodes.util.GraphUtil; import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; -import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode; +import jdk.compiler.graal.truffle.TruffleTierContext; +import jdk.compiler.graal.truffle.nodes.frame.NewFrameNode; /** * Compiler phase for verifying that the Truffle virtual frame does not escape and can therefore be diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java index eb5c43baf4c7a..d008dc114b83d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import java.util.ArrayList; import java.util.Collections; @@ -32,11 +32,11 @@ import jdk.compiler.graal.phases.BasePhase; import jdk.compiler.graal.phases.util.GraphOrder; import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; -import jdk.compiler.graal.truffle.compiler.TruffleInliningScope; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.PostPartialEvaluationSuite; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleInliningScope; +import jdk.compiler.graal.truffle.TruffleTierContext; public final class AgnosticInliningPhase extends BasePhase { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java index e09306bde051d..f63f078579a90 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import java.util.Collections; import java.util.HashMap; @@ -48,13 +48,13 @@ import jdk.compiler.graal.phases.common.inlining.InliningUtil; import jdk.compiler.graal.phases.common.inlining.InliningUtil.InlineeReturnAction; import jdk.compiler.graal.phases.contract.NodeCostUtil; -import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind; +import jdk.compiler.graal.truffle.PerformanceInformationHandler; +import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind; import com.oracle.truffle.compiler.TruffleCompilable; import com.oracle.truffle.compiler.TruffleCompilationTask; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.TruffleTierContext; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java index a9f2c761b4733..73bf339b968ae 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import jdk.compiler.graal.debug.DebugContext; import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.PostPartialEvaluationSuite; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleTierContext; import com.oracle.truffle.compiler.TruffleCompilationTask; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java index 66733c06adf42..5fbd26953851f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import java.util.Comparator; import java.util.Map; import java.util.PriorityQueue; import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; final class DefaultInliningPolicy implements InliningPolicy { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java index fd3985f6adc3f..56c741fcd8ec7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import jdk.compiler.graal.nodes.spi.CoreProviders; import jdk.compiler.graal.options.OptionValues; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java index 5e6ebc9aec754..8b2f83c0b6b39 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java @@ -22,10 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import java.util.List; +import jdk.compiler.graal.truffle.nodes.TruffleAssumption; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.UnmodifiableEconomicMap; @@ -42,13 +43,12 @@ import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; import jdk.compiler.graal.phases.common.inlining.InliningUtil; import jdk.compiler.graal.phases.contract.NodeCostUtil; -import jdk.compiler.graal.truffle.compiler.PEAgnosticInlineInvokePlugin; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; -import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; -import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption; +import jdk.compiler.graal.truffle.PEAgnosticInlineInvokePlugin; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.PostPartialEvaluationSuite; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleDebugJavaMethod; +import jdk.compiler.graal.truffle.TruffleTierContext; import com.oracle.truffle.compiler.TruffleCompilable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java index 6adcdd85c8947..78e6a64db0832 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import java.util.ArrayList; import java.util.List; import java.util.Map; import org.graalvm.collections.Pair; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; @SuppressWarnings("unused") public interface InliningPolicy { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java index 6f68e77b0f6ef..3538e541967b2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import jdk.compiler.graal.nodes.spi.CoreProviders; import jdk.compiler.graal.options.OptionValues; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java index 22665f1b94f9e..aa531d04265b4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; final class NoInliningPolicy implements InliningPolicy { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java index 8e4db31f86a87..83f0cd8083e33 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import jdk.compiler.graal.nodes.spi.CoreProviders; import jdk.compiler.graal.options.OptionValues; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java index 12d8af1eeb532..824ae68f71653 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; final class TrivialOnlyInliningPolicy implements InliningPolicy { private final OptionValues options; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java index 93019d3889672..40af0be596f8a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.phases.inlining; +package jdk.compiler.graal.truffle.phases.inlining; import jdk.compiler.graal.nodes.spi.CoreProviders; import jdk.compiler.graal.options.OptionValues; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java index db7c785269c29..1af4014777fbc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.substitutions; +package jdk.compiler.graal.truffle.substitutions; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.KnownTruffleTypes; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java index 62779462a274b..f834f6ff29435 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.substitutions; +package jdk.compiler.graal.truffle.substitutions; import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; import jdk.compiler.graal.phases.util.Providers; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java index 3672988688c18..e5ef4103ce7d2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.substitutions; +package jdk.compiler.graal.truffle.substitutions; import static java.lang.Character.toUpperCase; import static jdk.compiler.graal.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount; @@ -97,29 +97,29 @@ import jdk.compiler.graal.phases.util.Providers; import jdk.compiler.graal.replacements.nodes.arithmetic.UnsignedMulHighNode; import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup; -import jdk.compiler.graal.truffle.compiler.nodes.asserts.NeverPartOfCompilationNode; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; -import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler; -import jdk.compiler.graal.truffle.compiler.TruffleCompilation; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind; -import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod; -import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode; -import jdk.compiler.graal.truffle.compiler.nodes.IsCompilationConstantNode; -import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity; -import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption; -import jdk.compiler.graal.truffle.compiler.nodes.frame.AllowMaterializeNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.ForceMaterializeNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessFlags; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessType; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameClearNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameCopyNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameGetNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameGetTagNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameIsNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSetNode; -import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSwapNode; -import jdk.compiler.graal.truffle.compiler.phases.TruffleSafepointInsertionPhase; +import jdk.compiler.graal.truffle.nodes.asserts.NeverPartOfCompilationNode; +import jdk.compiler.graal.truffle.KnownTruffleTypes; +import jdk.compiler.graal.truffle.PerformanceInformationHandler; +import jdk.compiler.graal.truffle.TruffleCompilation; +import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind; +import jdk.compiler.graal.truffle.TruffleDebugJavaMethod; +import jdk.compiler.graal.truffle.nodes.AnyExtendNode; +import jdk.compiler.graal.truffle.nodes.IsCompilationConstantNode; +import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity; +import jdk.compiler.graal.truffle.nodes.TruffleAssumption; +import jdk.compiler.graal.truffle.nodes.frame.AllowMaterializeNode; +import jdk.compiler.graal.truffle.nodes.frame.ForceMaterializeNode; +import jdk.compiler.graal.truffle.nodes.frame.NewFrameNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessFlags; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessType; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameClearNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameCopyNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameGetNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameGetTagNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameIsNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameSetNode; +import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameSwapNode; +import jdk.compiler.graal.truffle.phases.TruffleSafepointInsertionPhase; import org.graalvm.word.LocationIdentity; import com.oracle.truffle.compiler.TruffleCompilationTask; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java index 325ce88e7d0d4..4ac42d9297795 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java +++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.compiler.substitutions; +package jdk.compiler.graal.truffle.substitutions; import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.BMP; import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.LATIN1; diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java index 3c90b07a86e25..41f5294a5efcf 100644 --- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java +++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java @@ -25,7 +25,7 @@ package com.oracle.svm.core.meta; import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity; +import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity; import org.graalvm.nativeimage.ImageSingletons; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java index 5811c92df8128..08ebb22238831 100644 --- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java +++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java @@ -88,12 +88,12 @@ import jdk.compiler.graal.serviceprovider.GlobalAtomicLong; import jdk.compiler.graal.serviceprovider.GraalServices; import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup; -import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; -import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory; -import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider; -import jdk.compiler.graal.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider; +import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilerImpl; +import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory; +import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider; +import jdk.compiler.graal.truffle.substitutions.GraphDecoderInvocationPluginProvider; import org.graalvm.jniutils.JNI; import org.graalvm.jniutils.JNIExceptionWrapper; import org.graalvm.jniutils.JNIMethodScope; diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java index cbcf666458741..7d725e836394b 100644 --- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java +++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java @@ -25,10 +25,10 @@ package com.oracle.svm.graal.hotspot.libgraal.truffle; import jdk.compiler.graal.core.common.util.MethodKey; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleElementCache; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; -import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleElementCache; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilerImpl; import com.oracle.truffle.compiler.HostMethodInfo; import com.oracle.truffle.compiler.TruffleCompilable; diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java index 88c08314d9147..1f7cdc8fb36d7 100644 --- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java +++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java @@ -26,7 +26,7 @@ import jdk.compiler.graal.debug.GraalError; import jdk.compiler.graal.serviceprovider.GlobalAtomicLong; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; import org.graalvm.jniutils.JNI.JClass; import org.graalvm.jniutils.JNI.JNIEnv; import org.graalvm.jniutils.JNI.JObject; diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java index 3e06970294d9c..14cfb16ed4cac 100644 --- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java +++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.graal.hotspot.libgraal.truffle; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; import org.graalvm.jniutils.NativeBridgeSupport; import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.hosted.Feature; diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java index f5b597d384492..2b669c1d7aa3b 100644 --- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java +++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java @@ -53,9 +53,9 @@ import jdk.compiler.graal.hotspot.CompilationContext; import jdk.compiler.graal.hotspot.HotSpotGraalServices; import jdk.compiler.graal.serviceprovider.IsolateUtil; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; -import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilationSupport; -import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilationSupport; +import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilerImpl; import org.graalvm.jniutils.JNI.JByteArray; import org.graalvm.jniutils.JNI.JClass; import org.graalvm.jniutils.JNI.JNIEnv; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java index d29ce692af5e2..e1090588bfcfa 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java @@ -63,7 +63,7 @@ import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase; import jdk.compiler.graal.phases.common.inlining.InliningUtil; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.phases.DeoptimizeOnExceptionPhase; +import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase; import jdk.compiler.graal.word.WordTypes; import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.hosted.Feature; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java index 7f0eb2d55068c..32804e0284bd1 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java @@ -129,7 +129,7 @@ import jdk.compiler.graal.phases.tiers.HighTierContext; import jdk.compiler.graal.phases.util.Providers; import jdk.compiler.graal.printer.GraalDebugHandlersFactory; -import jdk.compiler.graal.truffle.compiler.phases.DeoptimizeOnExceptionPhase; +import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase; import jdk.compiler.graal.word.WordTypes; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.BytecodePosition; diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java index a7199ec4f5ed2..3a5b31fe5afa8 100644 --- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java +++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java @@ -35,7 +35,7 @@ import jdk.compiler.graal.core.common.type.CompressibleConstant; import jdk.compiler.graal.debug.DebugContext; import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.c.type.CTypeConversion; import org.graalvm.word.Pointer; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java index 2eb9e0d9a2c2a..c1f3247d620e1 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java @@ -28,8 +28,8 @@ import jdk.compiler.graal.nodes.StructuredGraph; import jdk.compiler.graal.phases.common.CanonicalizerPhase; import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; -import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.host.HostInliningPhase; import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java index 84eae97178e07..a1a0d7f89b016 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java @@ -25,7 +25,7 @@ package com.oracle.svm.truffle; import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier; +import jdk.compiler.graal.truffle.TruffleCompilationIdentifier; import com.oracle.svm.core.graal.code.SubstrateCompilationIdentifier; import com.oracle.truffle.compiler.TruffleCompilable; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java index 7648a45da8d31..ffaf997f8876f 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java @@ -24,9 +24,9 @@ */ package com.oracle.svm.truffle; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleElementCache; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleElementCache; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java index 803999f026891..76ff2e4ff9d12 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.truffle; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java index 2cdd2dddd4e23..c0fee5f35bd0b 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java @@ -74,9 +74,9 @@ import jdk.compiler.graal.options.OptionStability; import jdk.compiler.graal.phases.tiers.Suites; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.host.InjectImmutableFrameFieldsPhase; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; -import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; import org.graalvm.home.HomeFinder; import org.graalvm.home.impl.DefaultHomeFinder; import org.graalvm.nativeimage.AnnotationAccess; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java index a5e3af90a9d41..b9305b2fd7e63 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java @@ -120,11 +120,11 @@ import jdk.compiler.graal.phases.common.CanonicalizerPhase; import jdk.compiler.graal.phases.tiers.Suites; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase; -import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment; -import jdk.compiler.graal.truffle.compiler.nodes.asserts.NeverPartOfCompilationNode; +import jdk.compiler.graal.truffle.KnownTruffleTypes; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.host.HostInliningPhase; +import jdk.compiler.graal.truffle.host.TruffleHostEnvironment; +import jdk.compiler.graal.truffle.nodes.asserts.NeverPartOfCompilationNode; import org.graalvm.nativeimage.AnnotationAccess; import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.hosted.Feature; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java index e8156ffb6cce1..0e5a9ab03a98a 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java @@ -31,11 +31,11 @@ import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.truffle.compiler.EconomyPartialEvaluatorConfiguration; -import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration; +import jdk.compiler.graal.truffle.EconomyPartialEvaluatorConfiguration; +import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleTierConfiguration; import org.graalvm.nativeimage.ImageSingletons; import com.oracle.svm.core.SubstrateOptions; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java index b07d647ee569b..e1ee0484542ef 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.truffle.api; -import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.KnownTruffleTypes; import com.oracle.graal.pointsto.meta.AnalysisType; import com.oracle.truffle.compiler.TruffleCompilerRuntime; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java index 984e5882a8a68..8938afda5748a 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java @@ -27,7 +27,7 @@ import java.lang.ref.WeakReference; import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; import org.graalvm.word.WordFactory; import com.oracle.svm.core.Uninterruptible; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java index c9306b099e446..edfd748ab2b49 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java @@ -40,10 +40,10 @@ import jdk.compiler.graal.phases.util.Providers; import jdk.compiler.graal.replacements.PEGraphDecoder; import jdk.compiler.graal.replacements.PEGraphDecoder.SpecialCallTargetCacheKey; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleTierContext; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java index de923908613d3..b61c8df16cf50 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java @@ -25,7 +25,7 @@ package com.oracle.svm.truffle.api; import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite; +import jdk.compiler.graal.truffle.PostPartialEvaluationSuite; import com.oracle.svm.core.graal.phases.DeadStoreRemovalPhase; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java index 26e5373cd28b8..40f051c8c2823 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java @@ -45,7 +45,7 @@ import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.truffle.compiler.nodes.TruffleSafepointNode; +import jdk.compiler.graal.truffle.nodes.TruffleSafepointNode; import org.graalvm.word.LocationIdentity; import com.oracle.svm.core.graal.snippets.NodeLoweringProvider; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java index 01fde99646bf1..0494c5602f91c 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java @@ -24,7 +24,7 @@ */ package com.oracle.svm.truffle.api; -import jdk.compiler.graal.truffle.compiler.AbstractTruffleCompilationSupport; +import jdk.compiler.graal.truffle.AbstractTruffleCompilationSupport; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java index 033b31b8d0531..850bbbcd92e2c 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java @@ -24,8 +24,8 @@ */ package com.oracle.svm.truffle.api; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.phases.TruffleTier; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.phases.TruffleTier; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java index abc81a56300f4..795dc9f46a1f4 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java @@ -36,14 +36,14 @@ import jdk.compiler.graal.options.OptionValues; import jdk.compiler.graal.phases.PhaseSuite; import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions; -import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration; -import jdk.compiler.graal.truffle.compiler.phases.InstrumentationSuite; -import jdk.compiler.graal.truffle.compiler.phases.TruffleTier; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.TruffleCompilationIdentifier; +import jdk.compiler.graal.truffle.TruffleCompilerConfiguration; +import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.TruffleCompilerOptions; +import jdk.compiler.graal.truffle.TruffleTierConfiguration; +import jdk.compiler.graal.truffle.phases.InstrumentationSuite; +import jdk.compiler.graal.truffle.phases.TruffleTier; import org.graalvm.nativeimage.Platform; import org.graalvm.nativeimage.Platforms; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java index 638a6d855ba1d..9d016b6365779 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java @@ -32,7 +32,7 @@ import jdk.compiler.graal.nodes.java.ExceptionObjectNode; import jdk.compiler.graal.nodes.util.GraphUtil; import jdk.compiler.graal.phases.Phase; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; +import jdk.compiler.graal.truffle.PartialEvaluator; import com.oracle.svm.hosted.phases.SubstrateGraphBuilderPhase.SubstrateBytecodeParser; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java index 94bd8f232cfcc..0ce13f18b131d 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java @@ -31,9 +31,9 @@ import jdk.compiler.graal.core.common.CompilationIdentifier; import jdk.compiler.graal.core.common.SuppressFBWarnings; import jdk.compiler.graal.nodes.PauseNode; -import jdk.compiler.graal.truffle.compiler.PartialEvaluator; -import jdk.compiler.graal.truffle.compiler.TruffleCompilation; -import jdk.compiler.graal.truffle.compiler.phases.TruffleTier; +import jdk.compiler.graal.truffle.PartialEvaluator; +import jdk.compiler.graal.truffle.TruffleCompilation; +import jdk.compiler.graal.truffle.phases.TruffleTier; import jdk.compiler.graal.word.Word; import org.graalvm.nativeimage.CurrentIsolate; import org.graalvm.nativeimage.Isolate; diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java index 0283d05d38681..4ccd05fd29142 100644 --- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java +++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java @@ -25,7 +25,7 @@ package com.oracle.svm.truffle.isolated; import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier; +import jdk.compiler.graal.truffle.TruffleCompilationIdentifier; import org.graalvm.nativeimage.c.function.CEntryPoint; import com.oracle.svm.graal.isolated.ClientHandle;