Skip to content
Permalink
Browse files
8270901: Typo PHASE_CPP in CompilerPhaseType 
Reviewed-by: jiefu
  • Loading branch information
Yi Yang committed Jul 28, 2021
1 parent d7b5cb6 commit 072fe486c952184811f5bff3504ca72deb66e445
Showing 3 changed files with 6 additions and 6 deletions.
2 src/hotspot/share/opto/compile.cpp
View file
@@ -2221,7 +2221,7 @@ void Compile::Optimize() {
TracePhase tp("ccp", &timers[_t_ccp]);
ccp.do_transform();
}
print_method(PHASE_CPP1, 2);
print_method(PHASE_CCP1, 2);

assert( true, "Break here to ccp.dump_old2new_map()");

6 src/hotspot/share/opto/phasetype.hpp
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2021, 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
@@ -44,7 +44,7 @@ enum CompilerPhaseType {
PHASE_PHASEIDEALLOOP1,
PHASE_PHASEIDEALLOOP2,
PHASE_PHASEIDEALLOOP3,
PHASE_CPP1,
PHASE_CCP1,
PHASE_ITER_GVN2,
PHASE_PHASEIDEALLOOP_ITERATIONS,
PHASE_OPTIMIZE_FINISHED,
@@ -95,7 +95,7 @@ class CompilerPhaseTypeHelper {
case PHASE_PHASEIDEALLOOP1: return "PhaseIdealLoop 1";
case PHASE_PHASEIDEALLOOP2: return "PhaseIdealLoop 2";
case PHASE_PHASEIDEALLOOP3: return "PhaseIdealLoop 3";
case PHASE_CPP1: return "PhaseCPP 1";
case PHASE_CCP1: return "PhaseCCP 1";
case PHASE_ITER_GVN2: return "Iter GVN 2";
case PHASE_PHASEIDEALLOOP_ITERATIONS: return "PhaseIdealLoop iterations";
case PHASE_OPTIMIZE_FINISHED: return "Optimize finished";
4 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2021, 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
@@ -38,7 +38,7 @@ public enum CompilerPhaseType {
PHASE_PHASEIDEALLOOP1 ("PhaseIdealLoop 1"),
PHASE_PHASEIDEALLOOP2 ("PhaseIdealLoop 2"),
PHASE_PHASEIDEALLOOP3 ("PhaseIdealLoop 3"),
PHASE_CPP1 ("PhaseCPP 1"),
PHASE_CCP1 ("PhaseCCP 1"),
PHASE_ITER_GVN2 ("Iter GVN 2"),
PHASE_PHASEIDEALLOOP_ITERATIONS ("PhaseIdealLoop iterations"),
PHASE_OPTIMIZE_FINISHED ("Optimize finished"),

11 comments on commit 072fe48

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 072fe48 Jul 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@kelthuzadx
Copy link
Member

@kelthuzadx kelthuzadx commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17

@kelthuzadx
Copy link
Member

@kelthuzadx kelthuzadx commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11

@openjdk
Copy link

@openjdk openjdk bot commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kelthuzadx The target repository jdk17 is not a valid target for backports.
List of valid target repositories: openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk12u, openjdk/jdk13u, openjdk/jdk13u-dev, openjdk/jdk14u, openjdk/jdk15u, openjdk/jdk15u-dev, openjdk/jdk16u, openjdk/jdk17u.
Supplying the organization/group prefix is optional.

@openjdk
Copy link

@openjdk openjdk bot commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kelthuzadx The target repository jdk11 is not a valid target for backports.
List of valid target repositories: openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk12u, openjdk/jdk13u, openjdk/jdk13u-dev, openjdk/jdk14u, openjdk/jdk15u, openjdk/jdk15u-dev, openjdk/jdk16u, openjdk/jdk17u.
Supplying the organization/group prefix is optional.

@kelthuzadx
Copy link
Member

@kelthuzadx kelthuzadx commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u

@kelthuzadx
Copy link
Member

@kelthuzadx kelthuzadx commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kelthuzadx The target repository jdk11-dev is not a valid target for backports.
List of valid target repositories: openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk12u, openjdk/jdk13u, openjdk/jdk13u-dev, openjdk/jdk14u, openjdk/jdk15u, openjdk/jdk15u-dev, openjdk/jdk16u, openjdk/jdk17u.
Supplying the organization/group prefix is optional.

@openjdk
Copy link

@openjdk openjdk bot commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kelthuzadx @kelthuzadx the backport was successfully created on the branch kelthuzadx-backport-072fe486 in my personal fork of openjdk/jdk17u. To create a pull request with this backport targeting openjdk/jdk17u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 072fe486 from the openjdk/jdk repository.

The commit being backported was authored by Yi Yang on 28 Jul 2021 and was reviewed by Jie Fu.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u:

$ git fetch https://github.com/openjdk-bots/jdk17u kelthuzadx-backport-072fe486:kelthuzadx-backport-072fe486
$ git checkout kelthuzadx-backport-072fe486
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u kelthuzadx-backport-072fe486

@kelthuzadx
Copy link
Member

@kelthuzadx kelthuzadx commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 072fe48 Nov 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kelthuzadx Could not automatically backport 072fe486 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/hotspot/share/opto/phasetype.hpp

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b kelthuzadx-backport-072fe486
$ git fetch --no-tags https://git.openjdk.java.net/jdk 072fe486c952184811f5bff3504ca72deb66e445
$ git cherry-pick --no-commit 072fe486c952184811f5bff3504ca72deb66e445
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 072fe486c952184811f5bff3504ca72deb66e445'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 072fe486c952184811f5bff3504ca72deb66e445.

Please sign in to comment.