From 272745b374533b8ddec31df6ae88388049c19738 Mon Sep 17 00:00:00 2001 From: bobpengxie Date: Tue, 6 Sep 2022 09:39:17 +0000 Subject: [PATCH] 8293340: Remove unused _code in {Zero,Template}InterpreterGenerator Reviewed-by: jiefu, shade --- src/hotspot/cpu/zero/zeroInterpreter_zero.cpp | 2 +- src/hotspot/share/interpreter/abstractInterpreter.cpp | 2 +- src/hotspot/share/interpreter/abstractInterpreter.hpp | 2 +- src/hotspot/share/interpreter/templateInterpreter.cpp | 2 +- .../share/interpreter/templateInterpreterGenerator.cpp | 2 +- .../share/interpreter/templateInterpreterGenerator.hpp | 2 +- .../share/interpreter/zero/zeroInterpreterGenerator.cpp | 4 ++-- .../share/interpreter/zero/zeroInterpreterGenerator.hpp | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp index fc1ee735237e4..e8f8b8e38b9c9 100644 --- a/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp +++ b/src/hotspot/cpu/zero/zeroInterpreter_zero.cpp @@ -65,7 +65,7 @@ void ZeroInterpreter::initialize_code() { // generate interpreter { ResourceMark rm; TraceTime timer("Interpreter generation", TRACETIME_LOG(Info, startuptime)); - ZeroInterpreterGenerator g(_code); + ZeroInterpreterGenerator g; if (PrintInterpreter) print(); } } diff --git a/src/hotspot/share/interpreter/abstractInterpreter.cpp b/src/hotspot/share/interpreter/abstractInterpreter.cpp index 6552e74e20313..c2428dd0cb79c 100644 --- a/src/hotspot/share/interpreter/abstractInterpreter.cpp +++ b/src/hotspot/share/interpreter/abstractInterpreter.cpp @@ -96,7 +96,7 @@ address AbstractInterpreter::_native_abi_to_tosca [AbstractInterpreter::nu //------------------------------------------------------------------------------------------------------------------------ // Generation of complete interpreter -AbstractInterpreterGenerator::AbstractInterpreterGenerator(StubQueue* _code) { +AbstractInterpreterGenerator::AbstractInterpreterGenerator() { _masm = NULL; } diff --git a/src/hotspot/share/interpreter/abstractInterpreter.hpp b/src/hotspot/share/interpreter/abstractInterpreter.hpp index 9e691dce48622..a4ba7b521eb35 100644 --- a/src/hotspot/share/interpreter/abstractInterpreter.hpp +++ b/src/hotspot/share/interpreter/abstractInterpreter.hpp @@ -295,7 +295,7 @@ class AbstractInterpreterGenerator: public StackObj { InterpreterMacroAssembler* _masm; public: - AbstractInterpreterGenerator(StubQueue* _code); + AbstractInterpreterGenerator(); }; #endif // SHARE_INTERPRETER_ABSTRACTINTERPRETER_HPP diff --git a/src/hotspot/share/interpreter/templateInterpreter.cpp b/src/hotspot/share/interpreter/templateInterpreter.cpp index 0eb6cfb99ba98..c6dd4d66501d5 100644 --- a/src/hotspot/share/interpreter/templateInterpreter.cpp +++ b/src/hotspot/share/interpreter/templateInterpreter.cpp @@ -63,7 +63,7 @@ void TemplateInterpreter::initialize_code() { // generate interpreter { ResourceMark rm; TraceTime timer("Interpreter generation", TRACETIME_LOG(Info, startuptime)); - TemplateInterpreterGenerator g(_code); + TemplateInterpreterGenerator g; // Free the unused memory not occupied by the interpreter and the stubs _code->deallocate_unused_tail(); } diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp index 1cf9f4b0c71c0..fe7d930eac77f 100644 --- a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp +++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp @@ -34,7 +34,7 @@ #define __ Disassembler::hook(__FILE__, __LINE__, _masm)-> -TemplateInterpreterGenerator::TemplateInterpreterGenerator(StubQueue* _code): AbstractInterpreterGenerator(_code) { +TemplateInterpreterGenerator::TemplateInterpreterGenerator(): AbstractInterpreterGenerator() { _unimplemented_bytecode = NULL; _illegal_bytecode_sequence = NULL; generate_all(); diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp index 9e8b250edd426..e57a6ff657d9a 100644 --- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp +++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp @@ -127,7 +127,7 @@ class TemplateInterpreterGenerator: public AbstractInterpreterGenerator { #endif // PPC public: - TemplateInterpreterGenerator(StubQueue* _code); + TemplateInterpreterGenerator(); }; #endif // !ZERO diff --git a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp index 70f8efbde2c25..4915c16a95560 100644 --- a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp +++ b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -32,7 +32,7 @@ #include "oops/method.hpp" #include "zeroInterpreterGenerator.hpp" -ZeroInterpreterGenerator::ZeroInterpreterGenerator(StubQueue* _code): AbstractInterpreterGenerator(_code) { +ZeroInterpreterGenerator::ZeroInterpreterGenerator(): AbstractInterpreterGenerator() { generate_all(); } diff --git a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp index a1329ba562aba..8c745e519498f 100644 --- a/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp +++ b/src/hotspot/share/interpreter/zero/zeroInterpreterGenerator.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -49,7 +49,7 @@ class ZeroInterpreterGenerator: public AbstractInterpreterGenerator { address generate_Reference_get_entry(); public: - ZeroInterpreterGenerator(StubQueue* _code); + ZeroInterpreterGenerator(); protected: MacroAssembler* assembler() const {