1.1 --- a/src/share/vm/runtime/safepoint.cpp Wed Oct 16 10:52:41 2013 +0200
1.2 +++ b/src/share/vm/runtime/safepoint.cpp Tue Nov 05 17:38:04 2013 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, 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 @@ -519,8 +519,8 @@
1.11 }
1.12
1.13 {
1.14 - TraceTime t4("sweeping nmethods", TraceSafepointCleanupTime);
1.15 - NMethodSweeper::scan_stacks();
1.16 + TraceTime t4("mark nmethods", TraceSafepointCleanupTime);
1.17 + NMethodSweeper::mark_active_nmethods();
1.18 }
1.19
1.20 if (SymbolTable::needs_rehashing()) {
1.21 @@ -745,14 +745,14 @@
1.22 #endif
1.23
1.24 static void print_ptrs(intptr_t oldptr, intptr_t newptr, bool wasoop) {
1.25 - bool is_oop = newptr ? ((oop)newptr)->is_oop() : false;
1.26 + bool is_oop = newptr ? (cast_to_oop(newptr))->is_oop() : false;
1.27 tty->print_cr(PTR_FORMAT PTR_PAD " %s %c " PTR_FORMAT PTR_PAD " %s %s",
1.28 oldptr, wasoop?"oop":" ", oldptr == newptr ? ' ' : '!',
1.29 newptr, is_oop?"oop":" ", (wasoop && !is_oop) ? "STALE" : ((wasoop==false&&is_oop==false&&oldptr !=newptr)?"STOMP":" "));
1.30 }
1.31
1.32 static void print_longs(jlong oldptr, jlong newptr, bool wasoop) {
1.33 - bool is_oop = newptr ? ((oop)(intptr_t)newptr)->is_oop() : false;
1.34 + bool is_oop = newptr ? (cast_to_oop(newptr))->is_oop() : false;
1.35 tty->print_cr(PTR64_FORMAT " %s %c " PTR64_FORMAT " %s %s",
1.36 oldptr, wasoop?"oop":" ", oldptr == newptr ? ' ' : '!',
1.37 newptr, is_oop?"oop":" ", (wasoop && !is_oop) ? "STALE" : ((wasoop==false&&is_oop==false&&oldptr !=newptr)?"STOMP":" "));
