jdk-sandbox: comparison src/hotspot/share/opto/escape.cpp

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 /*
-* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2005, 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.
 uint n_idx = n->_idx;
 PointsToNode* n_ptn = ptnode_adr(n_idx);
 if (n_ptn != NULL)
 return; // No need to redefine PointsTo node during first iteration.
+int opcode = n->Opcode();
+bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->escape_add_to_con_graph(this, igvn, delayed_worklist, n, opcode);
+if (gc_handled) {
+return; // Ignore node if already handled by GC.
+}
 if (n->is_Call()) {
 // Arguments to allocation and locking don't escape.
 if (n->is_AbstractLock()) {
 // Put Lock and Unlock nodes on IGVN worklist to process them during
 // first IGVN optimization when escape information is still available.
 // Put this check here to process call arguments since some call nodes
 // point to phantom_obj.
 if (n_ptn == phantom_obj || n_ptn == null_obj)
 return; // Skip predefined nodes.
-int opcode = n->Opcode();
-bool gc_handled = BarrierSet::barrier_set()->barrier_set_c2()->escape_add_to_con_graph(this, igvn, delayed_worklist, n, opcode);
-if (gc_handled) {
-return; // Ignore node if already handled by GC.
-}
 switch (opcode) {
 case Op_AddP: {
 Node* base = get_addp_base(n);
 PointsToNode* ptn_base = ptnode_adr(base->_idx);
 // Field nodes are created for all field types. They are used in
 strcmp(call->as_CallLeaf()->_name, "updateBytesAdler32") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "aescrypt_encryptBlock") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "aescrypt_decryptBlock") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "cipherBlockChaining_encryptAESCrypt") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "cipherBlockChaining_decryptAESCrypt") == 0 ||
+strcmp(call->as_CallLeaf()->_name, "electronicCodeBook_encryptAESCrypt") == 0 ||
+strcmp(call->as_CallLeaf()->_name, "electronicCodeBook_decryptAESCrypt") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "counterMode_AESCrypt") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "ghash_processBlocks") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "encodeBlock") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "sha1_implCompress") == 0 ||
 strcmp(call->as_CallLeaf()->_name, "sha1_implCompressMB") == 0 ||
 BarrierSet::barrier_set()->barrier_set_c2()->escape_has_out_with_unsafe_object(n)) {
 bt = T_OBJECT;
 }
 }
 }
-return (bt == T_OBJECT || bt == T_NARROWOOP || bt == T_ARRAY);
+// Note: T_NARROWOOP is not classed as a real reference type
+return (is_reference_type(bt) || bt == T_NARROWOOP);
 }
 // Returns unique pointed java object or NULL.
 JavaObjectNode* ConnectionGraph::unique_java_object(Node *n) {
 assert(!_collecting, "should not call when contructed graph");
 uint idx = n->_idx;
 if (idx >= nodes_size()) {
 return NULL;
 }
 PointsToNode* ptn = ptnode_adr(idx);
+if (ptn == NULL) {
+return NULL;
+}
 if (ptn->is_JavaObject()) {
 return ptn->as_JavaObject();
 }
 assert(ptn->is_LocalVar(), "sanity");
 // Check all java objects it points to.
 uint idx = n->_idx;
 if (idx >= nodes_size()) {
 return false;
 }
 PointsToNode* ptn = ptnode_adr(idx);
+if (ptn == NULL) {
+return false; // not in congraph (e.g. ConI)
+}
 PointsToNode::EscapeState es = ptn->escape_state();
 // If we have already computed a value, return it.
 if (es >= PointsToNode::GlobalEscape)
 return false;
 if (ptn->is_JavaObject()) {
 Node* uncast_base = base->uncast();
 int opcode = uncast_base->Opcode();
 assert(opcode == Op_ConP || opcode == Op_ThreadLocal ||
 opcode == Op_CastX2P || uncast_base->is_DecodeNarrowPtr() ||
 (uncast_base->is_Mem() && (uncast_base->bottom_type()->isa_rawptr() != NULL)) ||
-(uncast_base->is_Proj() && uncast_base->in(0)->is_Allocate()) ||
+(uncast_base->is_Proj() && uncast_base->in(0)->is_Allocate()), "sanity");
-BarrierSet::barrier_set()->barrier_set_c2()->escape_is_barrier_node(uncast_base), "sanity");
 }
 }
 return base;
 }
 if (!split_AddP(n, base)) continue; // wrong type from dead path
 } else if (n->is_Phi() ||
 n->is_CheckCastPP() ||
 n->is_EncodeP() ||
 n->is_DecodeN() ||
-BarrierSet::barrier_set()->barrier_set_c2()->escape_is_barrier_node(n) ||
 (n->is_ConstraintCast() && n->Opcode() == Op_CastPP)) {
 if (visited.test_set(n->_idx)) {
 assert(n->is_Phi(), "loops only through Phi's");
 continue;  // already processed
 }
 alloc_worklist.append_if_missing(use);
 } else if (use->is_Phi() ||
 use->is_CheckCastPP() ||
 use->is_EncodeNarrowPtr() ||
 use->is_DecodeNarrowPtr() ||
-BarrierSet::barrier_set()->barrier_set_c2()->escape_is_barrier_node(use) ||
 (use->is_ConstraintCast() && use->Opcode() == Op_CastPP)) {
 alloc_worklist.append_if_missing(use);
 #ifdef ASSERT
 } else if (use->is_Mem()) {
 assert(use->in(MemNode::Address) != n, "EA: missing allocation reference path");

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 53875	7a6fb8a48434
child 58679	9c3209ff7550