Index: vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h =================================================================== --- vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h (revision 448201) +++ vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h (working copy) @@ -70,7 +70,7 @@ static bool matches(Constraint co, Constraint ci, uint32 opndRoles, bool allowAliases); static const OpcodeGroup* findOpcodeGroup(const FindInfo& fi); static bool matches(const OpcodeGroup* og, const FindInfo& fi, bool any); - static bool Encoder::isOpndAllowed(const Encoder::OpcodeGroup * og, uint32 i, Constraint co, bool isExtended, bool any); + static bool isOpndAllowed(const Encoder::OpcodeGroup * og, uint32 i, Constraint co, bool isExtended, bool any); /** * Retunrs an empty opcode group. Index: vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp =================================================================== --- vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp (revision 448201) +++ vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp (working copy) @@ -54,7 +54,7 @@ const Encoder::OpcodeGroup Encoder::dummyOpcodeGroup; const Encoder::MemOpndConstraints Encoder::memOpndConstraints[16]= { - { + {{ #ifdef _EM64T_ Constraint(OpndKind_GPReg, OpndSize_64), Constraint(OpndKind_GPReg, OpndSize_64), @@ -63,7 +63,7 @@ Constraint(OpndKind_GPReg, OpndSize_32), #endif Constraint(OpndKind_Imm, OpndSize_32), - Constraint(OpndKind_Imm, OpndSize_32) }, + Constraint(OpndKind_Imm, OpndSize_32) }}, // others contain null constraints, to be fixed later }; Index: vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp =================================================================== --- vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp (revision 448201) +++ vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp (working copy) @@ -68,9 +68,9 @@ void registerDirectCall(Inst * inst); void registerInlineInfoOffsets( void ); - void CodeEmitter::orderNodesAndMarkInlinees(StlList& container, + void orderNodesAndMarkInlinees(StlList& container, Node * node, bool isForward); - void CodeEmitter::reportCompiledInlinees(); + void reportCompiledInlinees(); //------------------------------------------------------------------------------------ class ConstantAreaLayout Index: vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h =================================================================== --- vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h (revision 448201) +++ vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h (working copy) @@ -242,7 +242,7 @@ /** Creates an EmptyPseudoInst instruction to fill BB, which shoud not be cosidered as an empty one. */ - Inst* IRManager::newEmptyPseudoInst(); + Inst* newEmptyPseudoInst(); /** Creates an MethodEntryPseudoInst pseudo instruction representing the inlined method entry/end markers. */ Index: vm/jitrino/src/codegenerator/CodeGenIntfc.h =================================================================== --- vm/jitrino/src/codegenerator/CodeGenIntfc.h (revision 448201) +++ vm/jitrino/src/codegenerator/CodeGenIntfc.h (working copy) @@ -530,11 +530,13 @@ class MethodCodeSelector { public: MethodCodeSelector() {} + virtual ~MethodCodeSelector() {} class Callback { public: virtual void genVars(uint32 numLocals,VarCodeSelector&) = 0; virtual void setMethodDesc(MethodDesc * desc) = 0; virtual void genCFG(uint32 numNodes,CFGCodeSelector&,bool useProfile) = 0; + virtual ~Callback() {} }; virtual void selectCode(Callback&) = 0; }; Index: vm/jitrino/src/jet/cg.h =================================================================== --- vm/jitrino/src/jet/cg.h (revision 448201) +++ vm/jitrino/src/jet/cg.h (working copy) @@ -194,7 +194,7 @@ * @param jt - field type. * @param fld - field handle. */ - void CodeGen::gen_access_watchpoint(JavaByteCodes opcode, jtype jt, Field_Handle fld); + void gen_access_watchpoint(JavaByteCodes opcode, jtype jt, Field_Handle fld); /** * @brief Restore all scratch registers and operand stack state Index: vm/jitrino/src/jet/cg_meth.cpp =================================================================== --- vm/jitrino/src/jet/cg_meth.cpp (revision 448201) +++ vm/jitrino/src/jet/cg_meth.cpp (working copy) @@ -442,7 +442,7 @@ Opnd scratch(jt, m_base, voff(m_stack.scratch())); mov(scratch, Opnd(jt, ar)); - jt = jt = flt32 ? i32 : i64; + jt = jt == flt32 ? i32 : i64; var = scratch.as_type(jt); } else { Index: vm/jitrino/src/jet/jet.cpp =================================================================== --- vm/jitrino/src/jet/jet.cpp (revision 448201) +++ vm/jitrino/src/jet/jet.cpp (working copy) @@ -286,8 +286,8 @@ }, #endif // ~JIT_STATS //------------------------------------------------------------------------- - " \n" // " \n" +// " \n" }; static void print_id(void); Index: vm/jitrino/src/optimizer/reassociate.h =================================================================== --- vm/jitrino/src/optimizer/reassociate.h (revision 448201) +++ vm/jitrino/src/optimizer/reassociate.h (working copy) @@ -44,6 +44,7 @@ class CSEHashTable; class Type; class LoopTree; +class Simplifier; struct OpndWithPriority { OpndWithPriority(Opnd *op, uint32 priority0, Index: vm/jitrino/src/optimizer/optpass.h =================================================================== --- vm/jitrino/src/optimizer/optpass.h (revision 448201) +++ vm/jitrino/src/optimizer/optpass.h (working copy) @@ -94,8 +94,8 @@ class classname : public OptPass { \ protected: \ void _run(IRManager& irm); \ - const char* classname::getName() { return fullname; } \ - const char* classname::getTagName() { return #tagname; } \ + const char* getName() { return fullname; } \ + const char* getTagName() { return #tagname; } \ }; \ ActionFactory tagname##_(#tagname); Index: vm/jitrino/src/shared/Dlink.h =================================================================== --- vm/jitrino/src/shared/Dlink.h (revision 448201) +++ vm/jitrino/src/shared/Dlink.h (working copy) @@ -33,6 +33,7 @@ Dlink() { _next = _prev = this; } + virtual ~Dlink() {} // // routines for manipulating double linked list // =================================================================== --- vm/jitrino/src/shared/Stl.h (revision 448885) +++ vm/jitrino/src/shared/Stl.h (working copy) @@ -364,7 +364,7 @@ /** * A MemoryManager-based STL map container. **/ -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlMap : public ::std::map { typedef ::std::map Map; @@ -378,7 +378,7 @@ /** * A MemoryManager-based STL multimap container. **/ -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlMultiMap : public ::std::multimap { typedef ::std::multimap MultiMap; @@ -482,7 +482,7 @@ * A MemoryManager-based STL hash_map container. **/ #if !defined (__SGI_STL_PORT) -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMap : public ::std::map { typedef ::std::map HashMap; @@ -495,7 +495,7 @@ }; #else -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMap : public ::std::hash_map { typedef ::std::hash_map HashMap; @@ -514,7 +514,7 @@ * A MemoryManager-based STL hash_map container. **/ #if !defined (__SGI_STL_PORT) -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMultiMap : public ::std::multimap { typedef ::std::multimap HashMultiMap; @@ -526,7 +526,7 @@ bool has(const KeyT& k) const { return (find(k) != StlHashMultiMap::end()); }; }; #else -template, class Allocator = StlMMAllocator > +template, class Allocator = StlMMAllocator > > class StlHashMultiMap : public ::std::hash_multimap { typedef ::std::hash_multimap HashMultiMap;