comparison src/share/vm/opto/macro.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 606acabe7b5c
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
74 ProjNode *_catchallcatchproj; 74 ProjNode *_catchallcatchproj;
75 ProjNode *_memproj_fallthrough; 75 ProjNode *_memproj_fallthrough;
76 ProjNode *_memproj_catchall; 76 ProjNode *_memproj_catchall;
77 ProjNode *_resproj; 77 ProjNode *_resproj;
78 78
79 // Additional data collected during macro expansion
80 bool _has_locks;
79 81
80 void expand_allocate(AllocateNode *alloc); 82 void expand_allocate(AllocateNode *alloc);
81 void expand_allocate_array(AllocateArrayNode *alloc); 83 void expand_allocate_array(AllocateArrayNode *alloc);
82 void expand_allocate_common(AllocateNode* alloc, 84 void expand_allocate_common(AllocateNode* alloc,
83 Node* length, 85 Node* length,
116 Node*& needgc_false, Node*& contended_phi_rawmem, 118 Node*& needgc_false, Node*& contended_phi_rawmem,
117 Node* old_eden_top, Node* new_eden_top, 119 Node* old_eden_top, Node* new_eden_top,
118 Node* length); 120 Node* length);
119 121
120 public: 122 public:
121 PhaseMacroExpand(PhaseIterGVN &igvn) : Phase(Macro_Expand), _igvn(igvn) { 123 PhaseMacroExpand(PhaseIterGVN &igvn) : Phase(Macro_Expand), _igvn(igvn), _has_locks(false) {
122 _igvn.set_delay_transform(true); 124 _igvn.set_delay_transform(true);
123 } 125 }
124 void eliminate_macro_nodes(); 126 void eliminate_macro_nodes();
125 bool expand_macro_nodes(); 127 bool expand_macro_nodes();
126 128