--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp Fri May 09 08:34:22 2014 -0700
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp Fri May 09 16:50:54 2014 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -794,7 +794,7 @@
bool GenCollectedHeap::is_in_young(oop p) {
bool result = ((HeapWord*)p) < _gens[_n_gens - 1]->reserved().start();
assert(result == _gens[0]->is_in_reserved(p),
- err_msg("incorrect test - result=%d, p=" PTR_FORMAT, result, (void*)p));
+ err_msg("incorrect test - result=%d, p=" INTPTR_FORMAT, result, p2i((void*)p)));
return result;
}
@@ -1067,7 +1067,7 @@
for (int i = _n_gens-1; i >= 0; i--) {
Generation* g = _gens[i];
if (!silent) {
- gclog_or_tty->print(g->name());
+ gclog_or_tty->print("%s", g->name());
gclog_or_tty->print(" ");
}
g->verify();
@@ -1270,7 +1270,7 @@
// back a time later than 'now'.
jlong retVal = now - tolgc_cl.time();
if (retVal < 0) {
- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, retVal);)
+ NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
return 0;
}
return retVal;