Print this page
rev 7082 : 8068881: SIGBUS in C2 compiled method weblogic.wsee.jaxws.framework.jaxrpc.EnvironmentFactory$SimulatedWsdlDefinitions.<init>
Summary: Use MachMerge to hook together defs of the same multidef value in a block
Reviewed-by: kvn, vlivanov

Split Split Close
Expand all
Collapse all
          --- old/hotspot/src/share/vm/opto/node.hpp
          +++ new/hotspot/src/share/vm/opto/node.hpp
↓ open down ↓ 90 lines elided ↑ open up ↑
  91   91  class MachConstantNode;
  92   92  class MachGotoNode;
  93   93  class MachIfNode;
  94   94  class MachNode;
  95   95  class MachNullCheckNode;
  96   96  class MachProjNode;
  97   97  class MachReturnNode;
  98   98  class MachSafePointNode;
  99   99  class MachSpillCopyNode;
 100  100  class MachTempNode;
      101 +class MachMergeNode;
 101  102  class Matcher;
 102  103  class MemBarNode;
 103  104  class MemBarStoreStoreNode;
 104  105  class MemNode;
 105  106  class MergeMemNode;
 106  107  class MulNode;
 107  108  class MultiNode;
 108  109  class MultiBranchNode;
 109  110  class NeverBranchNode;
 110  111  class Node;
↓ open down ↓ 473 lines elided ↑ open up ↑
 584  585              DEFINE_CLASS_ID(MachCallRuntime,      MachCall, 1)
 585  586                DEFINE_CLASS_ID(MachCallLeaf,         MachCallRuntime, 0)
 586  587        DEFINE_CLASS_ID(MachBranch, Mach, 1)
 587  588          DEFINE_CLASS_ID(MachIf,         MachBranch, 0)
 588  589          DEFINE_CLASS_ID(MachGoto,       MachBranch, 1)
 589  590          DEFINE_CLASS_ID(MachNullCheck,  MachBranch, 2)
 590  591        DEFINE_CLASS_ID(MachSpillCopy,    Mach, 2)
 591  592        DEFINE_CLASS_ID(MachTemp,         Mach, 3)
 592  593        DEFINE_CLASS_ID(MachConstantBase, Mach, 4)
 593  594        DEFINE_CLASS_ID(MachConstant,     Mach, 5)
      595 +      DEFINE_CLASS_ID(MachMerge,        Mach, 6)
 594  596  
 595  597      DEFINE_CLASS_ID(Type,  Node, 2)
 596  598        DEFINE_CLASS_ID(Phi,   Type, 0)
 597  599        DEFINE_CLASS_ID(ConstraintCast, Type, 1)
 598  600        DEFINE_CLASS_ID(CheckCastPP, Type, 2)
 599  601        DEFINE_CLASS_ID(CMove, Type, 3)
 600  602        DEFINE_CLASS_ID(SafePointScalarObject, Type, 4)
 601  603        DEFINE_CLASS_ID(DecodeNarrowPtr, Type, 5)
 602  604          DEFINE_CLASS_ID(DecodeN, DecodeNarrowPtr, 0)
 603  605          DEFINE_CLASS_ID(DecodeNKlass, DecodeNarrowPtr, 1)
↓ open down ↓ 150 lines elided ↑ open up ↑
 754  756    DEFINE_CLASS_QUERY(MachConstantBase)
 755  757    DEFINE_CLASS_QUERY(MachConstant)
 756  758    DEFINE_CLASS_QUERY(MachGoto)
 757  759    DEFINE_CLASS_QUERY(MachIf)
 758  760    DEFINE_CLASS_QUERY(MachNullCheck)
 759  761    DEFINE_CLASS_QUERY(MachProj)
 760  762    DEFINE_CLASS_QUERY(MachReturn)
 761  763    DEFINE_CLASS_QUERY(MachSafePoint)
 762  764    DEFINE_CLASS_QUERY(MachSpillCopy)
 763  765    DEFINE_CLASS_QUERY(MachTemp)
      766 +  DEFINE_CLASS_QUERY(MachMerge)
 764  767    DEFINE_CLASS_QUERY(Mem)
 765  768    DEFINE_CLASS_QUERY(MemBar)
 766  769    DEFINE_CLASS_QUERY(MemBarStoreStore)
 767  770    DEFINE_CLASS_QUERY(MergeMem)
 768  771    DEFINE_CLASS_QUERY(Mul)
 769  772    DEFINE_CLASS_QUERY(Multi)
 770  773    DEFINE_CLASS_QUERY(MultiBranch)
 771  774    DEFINE_CLASS_QUERY(Parm)
 772  775    DEFINE_CLASS_QUERY(PCTable)
 773  776    DEFINE_CLASS_QUERY(Phi)
↓ open down ↓ 823 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX