File openjdk-6-src-b17-initialized-after.patch of Package java-1_6_0-openjdk
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/referenceProcessor.hpp
@@ -232,18 +232,18 @@ class ReferenceProcessor : public CHeapO
// constructor
ReferenceProcessor():
_span((HeapWord*)NULL, (HeapWord*)NULL),
- _discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL),
- _discoveredFinalRefs(NULL), _discoveredPhantomRefs(NULL),
_discovering_refs(false),
_discovery_is_atomic(true),
- _enqueuing_is_done(false),
_discovery_is_mt(false),
_discovered_list_needs_barrier(false),
_bs(NULL),
+ _enqueuing_is_done(false),
+ _processing_is_mt(false),
+ _next_id(0),
_is_alive_non_header(NULL),
_num_q(0),
- _processing_is_mt(false),
- _next_id(0)
+ _discoveredSoftRefs(NULL), _discoveredWeakRefs(NULL),
+ _discoveredFinalRefs(NULL), _discoveredPhantomRefs(NULL)
{}
ReferenceProcessor(MemRegion span, bool atomic_discovery,
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
@@ -343,8 +343,8 @@ class CMSKeepAliveClosure: public OopClo
bool cpc):
_collector(collector),
_span(span),
- _bit_map(bit_map),
_mark_stack(mark_stack),
+ _bit_map(bit_map),
_concurrent_precleaning(cpc) {
assert(!_span.is_empty(), "Empty span could spell trouble");
}
@@ -369,8 +369,8 @@ class CMSInnerParMarkAndPushClosure: pub
OopTaskQueue* work_queue):
_collector(collector),
_span(span),
- _bit_map(bit_map),
- _work_queue(work_queue) { }
+ _work_queue(work_queue),
+ _bit_map(bit_map) { }
virtual void do_oop(oop* p);
virtual void do_oop(narrowOop* p);
inline void do_oop_nv(oop* p) { CMSInnerParMarkAndPushClosure::do_oop_work(p); }
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/code/dependencies.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/code/dependencies.hpp
@@ -411,15 +411,15 @@ class Dependencies: public ResourceObj {
public:
DepStream(Dependencies* deps)
- : _deps(deps),
- _code(NULL),
+ : _code(NULL),
+ _deps(deps),
_bytes(deps->content_bytes())
{
initial_asserts(deps->size_in_bytes());
}
DepStream(nmethod* code)
- : _deps(NULL),
- _code(code),
+ :_code(code),
+ _deps(NULL),
_bytes(code->dependencies_begin())
{
initial_asserts(code->dependencies_size());
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
@@ -156,7 +156,7 @@ class FilterIntoCSClosure: public OopClo
public:
FilterIntoCSClosure( DirtyCardToOopClosure* dcto_cl,
G1CollectedHeap* g1, OopClosure* oc) :
- _dcto_cl(dcto_cl), _g1(g1), _oc(oc)
+ _g1(g1), _oc(oc), _dcto_cl(dcto_cl)
{}
inline void do_oop_nv(oop* p);
inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
@@ -193,7 +193,7 @@ public:
FilterAndMarkInHeapRegionAndIntoCSClosure(G1CollectedHeap* g1,
OopsInHeapRegionClosure* oc,
ConcurrentMark* cm)
- : _g1(g1), _oc(oc), _cm(cm) { }
+ : _g1(g1), _cm(cm), _oc(oc) { }
inline void do_oop_nv(oop* p);
inline void do_oop_nv(narrowOop* p) { guarantee(false, "NYI"); }
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/oops/constantPoolOop.hpp
@@ -494,7 +494,7 @@ class SymbolHashMapEntry : public CHeapO
void set_value(u2 value) { _value = value; }
SymbolHashMapEntry(unsigned int hash, symbolOop symbol, u2 value)
- : _hash(hash), _symbol(symbol), _value(value), _next(NULL) {}
+ : _hash(hash), _next(NULL), _symbol(symbol), _value(value) {}
}; // End SymbolHashMapEntry class
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/generation.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/generation.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/generation.hpp
@@ -660,7 +660,8 @@ class OneContigSpaceCardGeneration: publ
int level, GenRemSet* remset,
ContiguousSpace* space) :
CardGeneration(rs, initial_byte_size, level, remset),
- _the_space(space), _min_heap_delta_bytes(min_heap_delta_bytes)
+ _min_heap_delta_bytes(min_heap_delta_bytes),
+ _the_space(space)
{}
inline bool is_in(const void* p) const;
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/watermark.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/watermark.hpp
@@ -40,8 +40,8 @@ class WaterMark VALUE_OBJ_CLASS_SPEC {
void set_point(HeapWord* p) { _point = p; }
// Constructors
- WaterMark(Space* s, HeapWord* p) : _space(s), _point(p) {};
- WaterMark() : _space(NULL), _point(NULL) {};
+ WaterMark(Space* s, HeapWord* p) : _point(p), _space(s) {};
+ WaterMark() : _point(NULL), _space(NULL) {};
};
inline bool operator==(const WaterMark& x, const WaterMark& y) {
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/collectorPolicy.hpp
@@ -70,11 +70,11 @@ class CollectorPolicy : public CHeapObj
size_t _max_alignment;
CollectorPolicy() :
- _min_alignment(1),
- _max_alignment(1),
_initial_heap_byte_size(0),
_max_heap_byte_size(0),
- _min_heap_byte_size(0)
+ _min_heap_byte_size(0),
+ _min_alignment(1),
+ _max_alignment(1)
{}
public:
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/gc_implementation/shared/generationCounters.hpp
@@ -44,7 +44,7 @@ class GenerationCounters: public CHeapOb
// This constructor is only meant for use with the PSGenerationCounters
// constructor. The need for such an constructor should be eliminated
// when VirtualSpace and PSVirtualSpace are unified.
- GenerationCounters() : _name_space(NULL), _current_size(NULL), _virtual_space(NULL) {}
+ GenerationCounters() : _current_size(NULL), _virtual_space(NULL), _name_space(NULL) {}
public:
GenerationCounters(const char* name, int ordinal, int spaces,
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/space.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/memory/space.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/memory/space.hpp
@@ -324,7 +324,7 @@ public:
DirtyCardToOopClosure(Space* sp, OopClosure* cl,
CardTableModRefBS::PrecisionStyle precision,
HeapWord* boundary) :
- _sp(sp), _cl(cl), _precision(precision), _boundary(boundary),
+ _cl(cl), _sp(sp), _precision(precision), _boundary(boundary),
_min_done(NULL) {
NOT_PRODUCT(_last_bottom = NULL);
NOT_PRODUCT(_last_explicit_min_done = NULL);
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/runtime/vm_operations.hpp
@@ -303,8 +303,8 @@ class VM_FindDeadlocks: public VM_Operat
outputStream* _out;
public:
- VM_FindDeadlocks(bool concurrent_locks) : _concurrent_locks(concurrent_locks), _out(NULL), _deadlocks(NULL) {};
- VM_FindDeadlocks(outputStream* st) : _concurrent_locks(true), _out(st), _deadlocks(NULL) {};
+ VM_FindDeadlocks(bool concurrent_locks) : _concurrent_locks(concurrent_locks), _deadlocks(NULL), _out(NULL) {};
+ VM_FindDeadlocks(outputStream* st) : _concurrent_locks(true), _deadlocks(NULL), _out(st) {};
~VM_FindDeadlocks();
DeadlockCycle* result() { return _deadlocks; };
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/callnode.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/callnode.hpp
@@ -296,8 +296,8 @@ public:
// A plain safepoint advertises no memory effects (NULL):
const TypePtr* adr_type = NULL)
: MultiNode( edges ),
- _jvms(jvms),
_oop_map(NULL),
+ _jvms(jvms),
_adr_type(adr_type)
{
init_class_id(Class_SafePoint);
@@ -527,7 +527,7 @@ public:
const int _bci; // Byte Code Index of call byte code
CallJavaNode(const TypeFunc* tf , address addr, ciMethod* method, int bci)
: CallNode(tf, addr, TypePtr::BOTTOM),
- _method(method), _bci(bci), _optimized_virtual(false)
+ _optimized_virtual(false), _method(method), _bci(bci)
{
init_class_id(Class_CallJava);
}
@@ -802,8 +802,8 @@ protected:
public:
AbstractLockNode(const TypeFunc *tf)
: CallNode(tf, NULL, TypeRawPtr::BOTTOM),
- _coarsened(false),
- _eliminate(false)
+ _eliminate(false),
+ _coarsened(false)
{
#ifndef PRODUCT
_counter = NULL;
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/type.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/type.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/type.hpp
@@ -560,7 +560,7 @@ class TypePtr : public Type {
public:
enum PTR { TopPTR, AnyNull, Constant, Null, NotNull, BotPTR, lastPTR };
protected:
- TypePtr( TYPES t, PTR ptr, int offset ) : Type(t), _ptr(ptr), _offset(offset) {}
+ TypePtr( TYPES t, PTR ptr, int offset ) : Type(t), _offset(offset), _ptr(ptr) {}
virtual bool eq( const Type *t ) const;
virtual int hash() const; // Type specific hashing
static const PTR ptr_meet[lastPTR][lastPTR];
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/machnode.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/machnode.hpp
@@ -776,7 +776,7 @@ public:
uint _block_num;
- labelOper() : _block_num(0), _label(0) {}
+ labelOper() : _label(0), _block_num(0) {}
labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {}
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/runtime.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/runtime.hpp
@@ -64,8 +64,8 @@ private:
NamedCounter(const char *n, CounterTag tag = NoTag):
_name(n),
_count(0),
- _next(NULL),
- _tag(tag) {}
+ _tag(tag),
+ _next(NULL) { }
const char * name() const { return _name; }
int count() const { return _count; }
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/block.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/block.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/block.hpp
@@ -47,7 +47,7 @@ protected:
public:
Arena *_arena; // Arena to allocate in
- Block_Array(Arena *a) : _arena(a), _size(OptoBlockListSize) {
+ Block_Array(Arena *a) : _size(OptoBlockListSize), _arena(a) {
debug_only(_limit=0);
_blocks = NEW_ARENA_ARRAY( a, Block *, OptoBlockListSize );
for( int i = 0; i < OptoBlockListSize; i++ ) {
@@ -575,7 +575,7 @@ class CFGEdge : public ResourceObj {
CFGEdge(Block *from, Block *to, float freq, int from_pct, int to_pct) :
_from(from), _to(to), _freq(freq),
- _from_pct(from_pct), _to_pct(to_pct), _state(open) {
+ _state(open), _from_pct(from_pct), _to_pct(to_pct) {
_infrequent = from_infrequent() || to_infrequent();
}
@@ -623,11 +623,11 @@ class Trace : public ResourceObj {
public:
Trace(Block *b, Block **next_list, Block **prev_list) :
- _first(b),
- _last(b),
+ _id(b->_pre_order),
_next_list(next_list),
_prev_list(prev_list),
- _id(b->_pre_order) {
+ _first(b),
+ _last(b) {
set_next(b, NULL);
set_prev(b, NULL);
};
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/loopnode.hpp
@@ -298,9 +298,9 @@ public:
: _parent(0), _next(0), _child(0),
_head(head), _tail(tail),
_phase(phase),
+ _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0),
_required_safept(NULL),
- _allow_optimizations(true),
- _nest(0), _irreducible(0), _has_call(0), _has_sfpt(0), _rce_candidate(0)
+ _allow_optimizations(true)
{ }
// Is 'l' a member of 'this'?
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/opto/subnode.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/opto/subnode.hpp
@@ -278,7 +278,7 @@ class BoolNode : public Node {
virtual uint size_of() const;
public:
const BoolTest _test;
- BoolNode( Node *cc, BoolTest::mask t): _test(t), Node(0,cc) {
+ BoolNode( Node *cc, BoolTest::mask t): Node(0,cc),_test(t) {
init_class_id(Class_Bool);
}
// Convert an arbitrary int value to a Bool or other suitable predicate.
Index: icedtea6-1.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
===================================================================
--- icedtea6-1.7.orig/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
+++ icedtea6-1.7/openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.hpp
@@ -139,7 +139,7 @@ class ImplicitExceptionTable VALUE_OBJ_C
implicit_null_entry *adr( uint idx ) const { return &_data[2*idx]; }
ReallocMark _nesting; // assertion check for reallocations
public:
- ImplicitExceptionTable( ) : _data(0), _size(0), _len(0) { }
+ ImplicitExceptionTable( ) : _size(0), _len(0), _data(0) { }
// (run-time) construction from nmethod
ImplicitExceptionTable( const nmethod *nm );
