提交 277c9802 编写于 作者: K kevinw

8196884: VS2017 Multiple Type Cast Conversion Compilation Errors

Summary: Change the type of symbolic constant badAddressVal and introduce specific casts to fix multiple type cast conversion compilation errors.
Reviewed-by: lfoltan, coleenp, kbarrett
上级 078f7fba
/* /*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -629,7 +629,7 @@ void Compile::BuildOopMaps() { ...@@ -629,7 +629,7 @@ void Compile::BuildOopMaps() {
// last block as his only undone child, we can move the OopFlow from the // last block as his only undone child, we can move the OopFlow from the
// pred to this block. Otherwise we have to grab a new OopFlow. // pred to this block. Otherwise we have to grab a new OopFlow.
OopFlow *flow = NULL; // Flag for finding optimized flow OopFlow *flow = NULL; // Flag for finding optimized flow
Block *pred = (Block*)0xdeadbeef; Block *pred = (Block*)((intptr_t)0xdeadbeef);
// Scan this block's preds to find a done predecessor // Scan this block's preds to find a done predecessor
for (uint j = 1; j < b->num_preds(); j++) { for (uint j = 1; j < b->num_preds(); j++) {
Block* p = _cfg->get_block_for_node(b->pred(j)); Block* p = _cfg->get_block_for_node(b->pred(j));
......
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -2392,8 +2392,8 @@ void Compile::Code_Gen() { ...@@ -2392,8 +2392,8 @@ void Compile::Code_Gen() {
print_method(PHASE_FINAL_CODE); print_method(PHASE_FINAL_CODE);
// He's dead, Jim. // He's dead, Jim.
_cfg = (PhaseCFG*)0xdeadbeef; _cfg = (PhaseCFG*)((intptr_t)0xdeadbeef);
_regalloc = (PhaseChaitin*)0xdeadbeef; _regalloc = (PhaseChaitin*)((intptr_t)0xdeadbeef);
} }
......
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -1375,7 +1375,7 @@ void PhaseCFG::global_code_motion() { ...@@ -1375,7 +1375,7 @@ void PhaseCFG::global_code_motion() {
} }
#endif #endif
// Dead. // Dead.
_node_latency = (GrowableArray<uint> *)0xdeadbeef; _node_latency = (GrowableArray<uint> *)((intptr_t)0xdeadbeef);
} }
bool PhaseCFG::do_global_code_motion() { bool PhaseCFG::do_global_code_motion() {
......
/* /*
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -612,7 +612,7 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) { ...@@ -612,7 +612,7 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) {
} }
#endif #endif
if (_chaitin && _chaitin != (PhaseChaitin *)0xdeadbeef) { if (_chaitin && _chaitin != (PhaseChaitin *)((intptr_t)0xdeadbeef)) {
buffer[0] = 0; buffer[0] = 0;
_chaitin->dump_register(node, buffer); _chaitin->dump_register(node, buffer);
print_prop("reg", buffer); print_prop("reg", buffer);
......
/* /*
* Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -2687,7 +2687,7 @@ void Scheduling::anti_do_def( Block *b, Node *def, OptoReg::Name def_reg, int is ...@@ -2687,7 +2687,7 @@ void Scheduling::anti_do_def( Block *b, Node *def, OptoReg::Name def_reg, int is
} }
Node *kill = def; // Rename 'def' to more descriptive 'kill' Node *kill = def; // Rename 'def' to more descriptive 'kill'
debug_only( def = (Node*)0xdeadbeef; ) debug_only( def = (Node*)((intptr_t)0xdeadbeef); )
// After some number of kills there _may_ be a later def // After some number of kills there _may_ be a later def
Node *later_def = NULL; Node *later_def = NULL;
......
/* /*
* Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -255,7 +255,7 @@ struct small_cache : public Dict { ...@@ -255,7 +255,7 @@ struct small_cache : public Dict {
Node *PhaseIdealLoop::spinup( Node *iff_dom, Node *new_false, Node *new_true, Node *use_blk, Node *def, small_cache *cache ) { Node *PhaseIdealLoop::spinup( Node *iff_dom, Node *new_false, Node *new_true, Node *use_blk, Node *def, small_cache *cache ) {
if (use_blk->is_top()) // Handle dead uses if (use_blk->is_top()) // Handle dead uses
return use_blk; return use_blk;
Node *prior_n = (Node*)0xdeadbeef; Node *prior_n = (Node*)((intptr_t)0xdeadbeef);
Node *n = use_blk; // Get path input Node *n = use_blk; // Get path input
assert( use_blk != iff_dom, "" ); assert( use_blk != iff_dom, "" );
// Here's the "spinup" the dominator tree loop. Do a cache-check // Here's the "spinup" the dominator tree loop. Do a cache-check
...@@ -302,7 +302,7 @@ Node *PhaseIdealLoop::spinup( Node *iff_dom, Node *new_false, Node *new_true, No ...@@ -302,7 +302,7 @@ Node *PhaseIdealLoop::spinup( Node *iff_dom, Node *new_false, Node *new_true, No
} }
// Update cache everywhere // Update cache everywhere
prior_n = (Node*)0xdeadbeef; // Reset IDOM walk prior_n = (Node*)((intptr_t)0xdeadbeef); // Reset IDOM walk
n = use_blk; // Get path input n = use_blk; // Get path input
// Spin-up the idom tree again, basically doing path-compression. // Spin-up the idom tree again, basically doing path-compression.
// Insert cache entries along the way, so that if we ever hit this // Insert cache entries along the way, so that if we ever hit this
......
...@@ -1038,8 +1038,8 @@ extern void basic_fatal(const char* msg); ...@@ -1038,8 +1038,8 @@ extern void basic_fatal(const char* msg);
// Special constants for debugging // Special constants for debugging
const jint badInt = -3; // generic "bad int" value const jint badInt = -3; // generic "bad int" value
const long badAddressVal = -2; // generic "bad address" value const intptr_t badAddressVal = -2; // generic "bad address" value
const long badOopVal = -1; // generic "bad oop" value const intptr_t badOopVal = -1; // generic "bad oop" value
const intptr_t badHeapOopVal = (intptr_t) CONST64(0x2BAD4B0BBAADBABE); // value used to zap heap after GC const intptr_t badHeapOopVal = (intptr_t) CONST64(0x2BAD4B0BBAADBABE); // value used to zap heap after GC
const int badHandleValue = 0xBC; // value used to zap vm handle area const int badHandleValue = 0xBC; // value used to zap vm handle area
const int badResourceValue = 0xAB; // value used to zap resource area const int badResourceValue = 0xAB; // value used to zap resource area
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册