src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java

rev 56282 : [mq]: graal

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 84,94 ****
                  }
              }
  
              if (node instanceof DeoptimizingNode.DeoptDuring) {
                  DeoptimizingNode.DeoptDuring deopt = (DeoptimizingNode.DeoptDuring) node;
!                 if (deopt.canDeoptimize()) {
                      GraalError.guarantee(currentState != null, "no FrameState at DeoptimizingNode %s", deopt);
                      deopt.computeStateDuring(currentState);
                  }
              }
  
--- 84,94 ----
                  }
              }
  
              if (node instanceof DeoptimizingNode.DeoptDuring) {
                  DeoptimizingNode.DeoptDuring deopt = (DeoptimizingNode.DeoptDuring) node;
!                 if (deopt.canDeoptimize() && deopt.stateDuring() == null) {
                      GraalError.guarantee(currentState != null, "no FrameState at DeoptimizingNode %s", deopt);
                      deopt.computeStateDuring(currentState);
                  }
              }