jdk-sandbox: comparison hotspot/src/share/vm/c1/c1

equal deleted inserted replaced

-:8df0cc9da41e
+:996ce936543f
 void BlockListBuilder::mark_loops() {
 ResourceMark rm;
 _active = BitMap(BlockBegin::number_of_blocks());         _active.clear();
 _visited = BitMap(BlockBegin::number_of_blocks());        _visited.clear();
-_loop_map = intArray(BlockBegin::number_of_blocks(), 0);
+_loop_map = intArray(BlockBegin::number_of_blocks(), BlockBegin::number_of_blocks(), 0);
 _next_loop_index = 0;
 _next_block_number = _blocks.length();
 // recursively iterate the control flow graph
 mark_loops(_bci2block->at(0), false);
 ValueStack* state_before = copy_state_if_bb(is_bb);;
 append(new If(ipop(), If::eql, true, key, tsux, fsux, state_before, is_bb));
 } else {
 // collect successors & keys
 BlockList* sux = new BlockList(l + 1, NULL);
-intArray* keys = new intArray(l, 0);
+intArray* keys = new intArray(l, l, 0);
 int i;
 bool has_bb = false;
 for (i = 0; i < l; i++) {
 LookupswitchPair pair = sw.pair_at(i);
 if (pair.offset() < 0) has_bb = true;
 append(new Return(x));
 }
 Value GraphBuilder::make_constant(ciConstant field_value, ciField* field) {
+if (!field_value.is_valid())  return NULL;
 BasicType field_type = field_value.basic_type();
 ValueType* value = as_ValueType(field_value);
 // Attach dimension info to stable arrays.
 if (FoldStableValues &&
 const int offset = !needs_patching ? field->offset() : -1;
 switch (code) {
 case Bytecodes::_getstatic: {
 // check for compile-time constants, i.e., initialized static final fields
 Value constant = NULL;
-if (field->is_constant() && !PatchALot) {
+if (field->is_static_constant() && !PatchALot) {
 ciConstant field_value = field->constant_value();
-// Stable static fields are checked for non-default values in ciField::initialize_from().
 assert(!field->is_stable() || !field_value.is_null_or_zero(),
 "stable static w/ default value shouldn't be a constant");
 constant = make_constant(field_value, field);
 }
 if (constant != NULL) {
 case Bytecodes::_getfield: {
 // Check for compile-time constants, i.e., trusted final non-static fields.
 Value constant = NULL;
 obj = apop();
 ObjectType* obj_type = obj->type()->as_ObjectType();
-if (obj_type->is_constant() && !PatchALot) {
+if (field->is_constant() && obj_type->is_constant() && !PatchALot) {
 ciObject* const_oop = obj_type->constant_value();
 if (!const_oop->is_null_object() && const_oop->is_loaded()) {
-if (field->is_constant()) {
+ciConstant field_value = field->constant_value_of(const_oop);
-ciConstant field_value = field->constant_value_of(const_oop);
+if (field_value.is_valid()) {
-if (FoldStableValues && field->is_stable() && field_value.is_null_or_zero()) {
+constant = make_constant(field_value, field);
-// Stable field with default value can't be constant.
+// For CallSite objects add a dependency for invalidation of the optimization.
-constant = NULL;
+if (field->is_call_site_target()) {
-} else {
-constant = make_constant(field_value, field);
-}
-} else {
-// For CallSite objects treat the target field as a compile time constant.
-if (const_oop->is_call_site()) {
 ciCallSite* call_site = const_oop->as_call_site();
-if (field->is_call_site_target()) {
+if (!call_site->is_constant_call_site()) {
-ciMethodHandle* target = call_site->get_target();
+ciMethodHandle* target = field_value.as_object()->as_method_handle();
-if (target != NULL) {  // just in case
+dependency_recorder()->assert_call_site_target_value(call_site, target);
-ciConstant field_val(T_OBJECT, target);
-constant = new Constant(as_ValueType(field_val));
-// Add a dependence for invalidation of the optimization.
-if (!call_site->is_constant_call_site()) {
-dependency_recorder()->assert_call_site_target_value(call_site, target);
-}
-}
 }
 }
 }
 }
 }
 void GraphBuilder::check_args_for_profiling(Values* obj_args, int expected) {
 #ifdef ASSERT
 bool ignored_will_link;
 ciSignature* declared_signature = NULL;
 ciMethod* real_target = method()->get_method_at_bci(bci(), ignored_will_link, &declared_signature);
-assert(expected == obj_args->length() || real_target->is_method_handle_intrinsic(), "missed on arg?");
+assert(expected == obj_args->max_length() || real_target->is_method_handle_intrinsic(), "missed on arg?");
 #endif
 }
 // Collect arguments that we want to profile in a list
 Values* GraphBuilder::collect_args_for_profiling(Values* args, ciMethod* target, bool may_have_receiver) {
 int start = 0;
 Values* obj_args = args_list_for_profiling(target, start, may_have_receiver);
 if (obj_args == NULL) {
 return NULL;
 }
-int s = obj_args->size();
+int s = obj_args->max_length();
 // if called through method handle invoke, some arguments may have been popped
 for (int i = start, j = 0; j < s && i < args->length(); i++) {
 if (args->at(i)->type()->is_object_kind()) {
 obj_args->push(args->at(i));
 j++;
 void GraphBuilder::new_multi_array(int dimensions) {
 bool will_link;
 ciKlass* klass = stream()->get_klass(will_link);
 ValueStack* state_before = !klass->is_loaded() || PatchALot ? copy_state_before() : copy_state_exhandling();
-Values* dims = new Values(dimensions, NULL);
+Values* dims = new Values(dimensions, dimensions, NULL);
 // fill in all dimensions
 int i = dimensions;
 while (i-- > 0) dims->at_put(i, ipop());
 // create array
 NewArray* n = new NewMultiArray(klass, dims, state_before);
 if (profile_calls()) {
 int start = 0;
 Values* obj_args = args_list_for_profiling(callee, start, has_receiver);
 if (obj_args != NULL) {
-int s = obj_args->size();
+int s = obj_args->max_length();
 // if called through method handle invoke, some arguments may have been popped
-for (int i = args_base+start, j = 0; j < obj_args->size() && i < state()->stack_size(); ) {
+for (int i = args_base+start, j = 0; j < obj_args->max_length() && i < state()->stack_size(); ) {
 Value v = state()->stack_at_inc(i);
 if (v->type()->is_object_kind()) {
 obj_args->push(v);
 j++;
 }
 data->set_jsr_return_address_local(-1);
 // Must clone bci2block list as we will be mutating it in order to
 // properly clone all blocks in jsr region as well as exception
 // handlers containing rets
 BlockList* new_bci2block = new BlockList(bci2block()->length());
-new_bci2block->push_all(bci2block());
+new_bci2block->appendAll(bci2block());
 data->set_bci2block(new_bci2block);
 data->set_scope(scope());
 data->setup_jsr_xhandlers();
 data->set_continuation(continuation());
 data->set_jsr_continuation(jsr_continuation);

changeset 38033	996ce936543f
parent 37267	ad8c0e8de29f
parent 38031	e0b822facc03
child 38060	954c9575f653
child 38132	ba888a4f352a