*** old/src/share/vm/opto/phaseX.cpp	Mon Aug  4 14:31:50 2014
--- new/src/share/vm/opto/phaseX.cpp	Mon Aug  4 14:31:50 2014

*** 613,623 ****
--- 613,623 ----
  
  //--------------------------uncached_makecon-----------------------------------
  // Make an idealized constant - one of ConINode, ConPNode, etc.
  ConNode* PhaseValues::uncached_makecon(const Type *t) {
    assert(t->singleton(), "must be a constant");
-   ConNode* x = ConNode::make(C, t);
    ConNode* k = (ConNode*)hash_find_insert(x); // Value numbering
    if (k == NULL) {
      set_type(x, t);             // Missed, provide type mapping
      GrowableArray<Node_Notes*>* nna = C->node_note_array();
      if (nna != NULL) {

*** 1626,1636 ****
--- 1626,1636 ----
    if( t->singleton() ) {
      Node *nn = n;               // Default is to return the original constant
      if( t == Type::TOP ) {
        // cache my top node on the Compile instance
        if( C->cached_top_node() == NULL || C->cached_top_node()->in(0) == NULL ) {
-         C->set_cached_top_node( ConNode::make(C, Type::TOP) );
          set_type(C->top(), Type::TOP);
        }
        nn = C->top();
      }
      if( !n->is_Con() ) {

*** 1752,1762 ****
--- 1752,1762 ----
        Node     *n = block->get_node(instruction_index);
        if( n->is_Mach() ) {
          MachNode *m = n->as_Mach();
          int deleted_count = 0;
          // check for peephole opportunities
-         MachNode *m2 = m->peephole( block, instruction_index, _regalloc, deleted_count, C );
          if( m2 != NULL ) {
  #ifndef PRODUCT
            if( PrintOptoPeephole ) {
              // Print method, first time only
              if( C->method() && method_name_not_printed ) {