From f556d064e0ee8e631f4d7e4e2964805b96150b32 Mon Sep 17 00:00:00 2001 From: Yi Yang Date: Wed, 28 Jul 2021 15:18:03 +0800 Subject: [PATCH 1/2] typo --- src/hotspot/share/opto/compile.cpp | 2 +- src/hotspot/share/opto/phasetype.hpp | 4 ++-- .../share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp index 09191f4563ae5..b509814e78727 100644 --- a/src/hotspot/share/opto/compile.cpp +++ b/src/hotspot/share/opto/compile.cpp @@ -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()"); diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp index c2615abd66613..d43dfd0695f93 100644 --- a/src/hotspot/share/opto/phasetype.hpp +++ b/src/hotspot/share/opto/phasetype.hpp @@ -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"; diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java index e0eb10942df94..6c7d649bd5cfe 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java @@ -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"), From 8599d930000b968583c7e35df45265e111b91a3c Mon Sep 17 00:00:00 2001 From: Yi Yang Date: Wed, 28 Jul 2021 16:00:36 +0800 Subject: [PATCH 2/2] update copyright year --- src/hotspot/share/opto/phasetype.hpp | 2 +- .../share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp index d43dfd0695f93..2aa55a655537f 100644 --- a/src/hotspot/share/opto/phasetype.hpp +++ b/src/hotspot/share/opto/phasetype.hpp @@ -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 diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java index 6c7d649bd5cfe..a745d682069d4 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java @@ -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