src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/MidTier.java

rev 52509 : [mq]: graal

*** 22,31 ****
--- 22,34 ----
   */
  
  
  package org.graalvm.compiler.core.phases;
  
+ import static org.graalvm.compiler.core.common.SpeculativeExecutionAttacksMitigations.GuardTargets;
+ import static org.graalvm.compiler.core.common.SpeculativeExecutionAttacksMitigations.NonDeoptGuardTargets;
+ import static org.graalvm.compiler.core.common.SpeculativeExecutionAttacksMitigations.Options.MitigateSpeculativeExecutionAttacks;
  import static org.graalvm.compiler.core.common.GraalOptions.ConditionalElimination;
  import static org.graalvm.compiler.core.common.GraalOptions.ImmutableCode;
  import static org.graalvm.compiler.core.common.GraalOptions.OptDeoptimizationGrouping;
  import static org.graalvm.compiler.core.common.GraalOptions.OptFloatingReads;
  import static org.graalvm.compiler.core.common.GraalOptions.OptLoopTransform;
*** 45,54 ****
--- 48,58 ----
  import org.graalvm.compiler.phases.common.DeoptimizationGroupingPhase;
  import org.graalvm.compiler.phases.common.FloatingReadPhase;
  import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
  import org.graalvm.compiler.phases.common.GuardLoweringPhase;
  import org.graalvm.compiler.phases.common.IncrementalCanonicalizerPhase;
+ import org.graalvm.compiler.phases.common.InsertGuardFencesPhase;
  import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
  import org.graalvm.compiler.phases.common.LockEliminationPhase;
  import org.graalvm.compiler.phases.common.LoopSafepointInsertionPhase;
  import org.graalvm.compiler.phases.common.LoweringPhase;
  import org.graalvm.compiler.phases.common.VerifyHeapAtReturnPhase;
*** 76,85 ****
--- 80,93 ----
  
          appendPhase(new LoopSafepointInsertionPhase());
  
          appendPhase(new GuardLoweringPhase());
  
+         if (MitigateSpeculativeExecutionAttacks.getValue(options) == GuardTargets || MitigateSpeculativeExecutionAttacks.getValue(options) == NonDeoptGuardTargets) {
+             appendPhase(new InsertGuardFencesPhase());
+         }
+ 
          if (VerifyHeapAtReturn.getValue(options)) {
              appendPhase(new VerifyHeapAtReturnPhase());
          }
  
          appendPhase(new LoweringPhase(canonicalizer, LoweringTool.StandardLoweringStage.MID_TIER));