Skip to content

Commit 1a5e6c9

Browse files
Jason Tatton (AWS)Paul Hohensee
authored andcommitted
8253101: Clean up CallStaticJavaNode EA flags
Reviewed-by: kvn
1 parent a7595b2 commit 1a5e6c9

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

src/hotspot/share/opto/callnode.hpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -716,24 +716,16 @@ class CallStaticJavaNode : public CallJavaNode {
716716
init_flags(Flag_is_macro);
717717
C->add_macro_node(this);
718718
}
719-
_is_scalar_replaceable = false;
720-
_is_non_escaping = false;
721719
}
722720
CallStaticJavaNode(const TypeFunc* tf, address addr, const char* name, int bci,
723721
const TypePtr* adr_type)
724722
: CallJavaNode(tf, addr, NULL, bci) {
725723
init_class_id(Class_CallStaticJava);
726724
// This node calls a runtime stub, which often has narrow memory effects.
727725
_adr_type = adr_type;
728-
_is_scalar_replaceable = false;
729-
_is_non_escaping = false;
730726
_name = name;
731727
}
732728

733-
// Result of Escape Analysis
734-
bool _is_scalar_replaceable;
735-
bool _is_non_escaping;
736-
737729
// If this is an uncommon trap, return the request code, else zero.
738730
int uncommon_trap_request() const;
739731
static int extract_uncommon_trap_request(const Node* call);

src/hotspot/share/opto/escape.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,6 @@ bool ConnectionGraph::compute_escape() {
246246
if (n->is_Allocate()) {
247247
n->as_Allocate()->_is_non_escaping = noescape;
248248
}
249-
if (n->is_CallStaticJava()) {
250-
n->as_CallStaticJava()->_is_non_escaping = noescape;
251-
}
252249
if (noescape && ptn->scalar_replaceable()) {
253250
adjust_scalar_replaceable_state(ptn);
254251
if (ptn->scalar_replaceable()) {
@@ -3068,11 +3065,6 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist,
30683065
// so it could be eliminated if it has no uses.
30693066
alloc->as_Allocate()->_is_scalar_replaceable = true;
30703067
}
3071-
if (alloc->is_CallStaticJava()) {
3072-
// Set the scalar_replaceable flag for boxing method
3073-
// so it could be eliminated if it has no uses.
3074-
alloc->as_CallStaticJava()->_is_scalar_replaceable = true;
3075-
}
30763068
continue;
30773069
}
30783070
if (!n->is_CheckCastPP()) { // not unique CheckCastPP.
@@ -3121,11 +3113,6 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist,
31213113
// so it could be eliminated.
31223114
alloc->as_Allocate()->_is_scalar_replaceable = true;
31233115
}
3124-
if (alloc->is_CallStaticJava()) {
3125-
// Set the scalar_replaceable flag for boxing method
3126-
// so it could be eliminated.
3127-
alloc->as_CallStaticJava()->_is_scalar_replaceable = true;
3128-
}
31293116
set_escape_state(ptnode_adr(n->_idx), es); // CheckCastPP escape state
31303117
// in order for an object to be scalar-replaceable, it must be:
31313118
// - a direct allocation (not a call returning an object)

0 commit comments

Comments
 (0)