1.1 --- a/src/share/vm/opto/memnode.cpp Fri Feb 27 08:34:19 2009 -0800
1.2 +++ b/src/share/vm/opto/memnode.cpp Fri Feb 27 13:27:09 2009 -0800
1.3 @@ -100,12 +100,12 @@
1.4 while (prev != result) {
1.5 prev = result;
1.6 if (result == start_mem)
1.7 - break; // hit one of our sentinals
1.8 + break; // hit one of our sentinels
1.9 // skip over a call which does not affect this memory slice
1.10 if (result->is_Proj() && result->as_Proj()->_con == TypeFunc::Memory) {
1.11 Node *proj_in = result->in(0);
1.12 if (proj_in->is_Allocate() && proj_in->_idx == instance_id) {
1.13 - break; // hit one of our sentinals
1.14 + break; // hit one of our sentinels
1.15 } else if (proj_in->is_Call()) {
1.16 CallNode *call = proj_in->as_Call();
1.17 if (!call->may_modify(t_adr, phase)) {
1.18 @@ -198,7 +198,7 @@
1.19 // If not, we can update the input infinitely along a MergeMem cycle
1.20 // Equivalent code in PhiNode::Ideal
1.21 Node* m = phase->transform(mmem);
1.22 - // If tranformed to a MergeMem, get the desired slice
1.23 + // If transformed to a MergeMem, get the desired slice
1.24 // Otherwise the returned node represents memory for every slice
1.25 mem = (m->is_MergeMem())? m->as_MergeMem()->memory_at(alias_idx) : m;
1.26 // Update input if it is progress over what we have now
1.27 @@ -970,7 +970,7 @@
1.28 }
1.29
1.30 // Search for an existing data phi which was generated before for the same
1.31 - // instance's field to avoid infinite genertion of phis in a loop.
1.32 + // instance's field to avoid infinite generation of phis in a loop.
1.33 Node *region = mem->in(0);
1.34 if (is_instance_field_load_with_local_phi(region)) {
1.35 const TypePtr *addr_t = in(MemNode::Address)->bottom_type()->isa_ptr();
1.36 @@ -1254,7 +1254,7 @@
1.37 // (This tweaking with igvn only works because x is a new node.)
1.38 igvn->set_type(x, t);
1.39 // If x is a TypeNode, capture any more-precise type permanently into Node
1.40 - // othewise it will be not updated during igvn->transform since
1.41 + // otherwise it will be not updated during igvn->transform since
1.42 // igvn->type(x) is set to x->Value() already.
1.43 x->raise_bottom_type(t);
1.44 Node *y = x->Identity(igvn);
1.45 @@ -2591,7 +2591,7 @@
1.46 // capturing of nearby memory operations.
1.47 //
1.48 // During macro-expansion, all captured initializations which store
1.49 -// constant values of 32 bits or smaller are coalesced (if advantagous)
1.50 +// constant values of 32 bits or smaller are coalesced (if advantageous)
1.51 // into larger 'tiles' 32 or 64 bits. This allows an object to be
1.52 // initialized in fewer memory operations. Memory words which are
1.53 // covered by neither tiles nor non-constant stores are pre-zeroed
1.54 @@ -3678,7 +3678,7 @@
1.55 else if (old_mmem != NULL) {
1.56 new_mem = old_mmem->memory_at(i);
1.57 }
1.58 - // else preceeding memory was not a MergeMem
1.59 + // else preceding memory was not a MergeMem
1.60
1.61 // replace equivalent phis (unfortunately, they do not GVN together)
1.62 if (new_mem != NULL && new_mem != new_base &&
