Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/opto/buildOopMap.cpp	Thu Jun 14 09:15:08 2018 -0700
     1.2 +++ b/src/share/vm/opto/buildOopMap.cpp	Thu Jun 14 18:23:12 2018 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -629,7 +629,7 @@
    1.11      // last block as his only undone child, we can move the OopFlow from the
    1.12      // pred to this block.  Otherwise we have to grab a new OopFlow.
    1.13      OopFlow *flow = NULL;       // Flag for finding optimized flow
    1.14 -    Block *pred = (Block*)0xdeadbeef;
    1.15 +    Block *pred = (Block*)((intptr_t)0xdeadbeef);
    1.16      // Scan this block's preds to find a done predecessor
    1.17      for (uint j = 1; j < b->num_preds(); j++) {
    1.18        Block* p = _cfg->get_block_for_node(b->pred(j));

     2.1 --- a/src/share/vm/opto/compile.cpp	Thu Jun 14 09:15:08 2018 -0700
     2.2 +++ b/src/share/vm/opto/compile.cpp	Thu Jun 14 18:23:12 2018 +0000
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -2392,8 +2392,8 @@
    2.11    print_method(PHASE_FINAL_CODE);
    2.12  
    2.13    // He's dead, Jim.
    2.14 -  _cfg     = (PhaseCFG*)0xdeadbeef;
    2.15 -  _regalloc = (PhaseChaitin*)0xdeadbeef;
    2.16 +  _cfg     = (PhaseCFG*)((intptr_t)0xdeadbeef);
    2.17 +  _regalloc = (PhaseChaitin*)((intptr_t)0xdeadbeef);
    2.18  }
    2.19  
    2.20  

     3.1 --- a/src/share/vm/opto/gcm.cpp	Thu Jun 14 09:15:08 2018 -0700
     3.2 +++ b/src/share/vm/opto/gcm.cpp	Thu Jun 14 18:23:12 2018 +0000
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -1375,7 +1375,7 @@
    3.11    }
    3.12  #endif
    3.13    // Dead.
    3.14 -  _node_latency = (GrowableArray<uint> *)0xdeadbeef;
    3.15 +  _node_latency = (GrowableArray<uint> *)((intptr_t)0xdeadbeef);
    3.16  }
    3.17  
    3.18  bool PhaseCFG::do_global_code_motion() {

     4.1 --- a/src/share/vm/opto/idealGraphPrinter.cpp	Thu Jun 14 09:15:08 2018 -0700
     4.2 +++ b/src/share/vm/opto/idealGraphPrinter.cpp	Thu Jun 14 18:23:12 2018 +0000
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -612,7 +612,7 @@
    4.11      }
    4.12  #endif
    4.13  
    4.14 -    if (_chaitin && _chaitin != (PhaseChaitin *)0xdeadbeef) {
    4.15 +    if (_chaitin && _chaitin != (PhaseChaitin *)((intptr_t)0xdeadbeef)) {
    4.16        buffer[0] = 0;
    4.17        _chaitin->dump_register(node, buffer);
    4.18        print_prop("reg", buffer);

     5.1 --- a/src/share/vm/opto/output.cpp	Thu Jun 14 09:15:08 2018 -0700
     5.2 +++ b/src/share/vm/opto/output.cpp	Thu Jun 14 18:23:12 2018 +0000
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -2687,7 +2687,7 @@
    5.11    }
    5.12  
    5.13    Node *kill = def;             // Rename 'def' to more descriptive 'kill'
    5.14 -  debug_only( def = (Node*)0xdeadbeef; )
    5.15 +  debug_only( def = (Node*)((intptr_t)0xdeadbeef); )
    5.16  
    5.17    // After some number of kills there _may_ be a later def
    5.18    Node *later_def = NULL;

     6.1 --- a/src/share/vm/opto/split_if.cpp	Thu Jun 14 09:15:08 2018 -0700
     6.2 +++ b/src/share/vm/opto/split_if.cpp	Thu Jun 14 18:23:12 2018 +0000
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -255,7 +255,7 @@
    6.11  Node *PhaseIdealLoop::spinup( Node *iff_dom, Node *new_false, Node *new_true, Node *use_blk, Node *def, small_cache *cache ) {
    6.12    if (use_blk->is_top())        // Handle dead uses
    6.13      return use_blk;
    6.14 -  Node *prior_n = (Node*)0xdeadbeef;
    6.15 +  Node *prior_n = (Node*)((intptr_t)0xdeadbeef);
    6.16    Node *n = use_blk;            // Get path input
    6.17    assert( use_blk != iff_dom, "" );
    6.18    // Here's the "spinup" the dominator tree loop.  Do a cache-check
    6.19 @@ -302,7 +302,7 @@
    6.20    }
    6.21  
    6.22    // Update cache everywhere
    6.23 -  prior_n = (Node*)0xdeadbeef;  // Reset IDOM walk
    6.24 +  prior_n = (Node*)((intptr_t)0xdeadbeef);  // Reset IDOM walk
    6.25    n = use_blk;                  // Get path input
    6.26    // Spin-up the idom tree again, basically doing path-compression.
    6.27    // Insert cache entries along the way, so that if we ever hit this

     7.1 --- a/src/share/vm/utilities/globalDefinitions.hpp	Thu Jun 14 09:15:08 2018 -0700
     7.2 +++ b/src/share/vm/utilities/globalDefinitions.hpp	Thu Jun 14 18:23:12 2018 +0000
     7.3 @@ -1038,8 +1038,8 @@
     7.4  // Special constants for debugging
     7.5  
     7.6  const jint     badInt           = -3;                       // generic "bad int" value
     7.7 -const long     badAddressVal    = -2;                       // generic "bad address" value
     7.8 -const long     badOopVal        = -1;                       // generic "bad oop" value
     7.9 +const intptr_t badAddressVal    = -2;                       // generic "bad address" value
    7.10 +const intptr_t badOopVal        = -1;                       // generic "bad oop" value
    7.11  const intptr_t badHeapOopVal    = (intptr_t) CONST64(0x2BAD4B0BBAADBABE); // value used to zap heap after GC
    7.12  const int      badHandleValue   = 0xBC;                     // value used to zap vm handle area
    7.13  const int      badResourceValue = 0xAB;                     // value used to zap resource area