--- a/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/cpu/ppc/vm/sharedRuntime_ppc.cpp Thu Jan 14 13:26:19 2016 +0100
@@ -1474,7 +1474,7 @@
}
}
-// Check GC_locker::needs_gc and enter the runtime if it's true. This
+// Check GCLocker::needs_gc and enter the runtime if it's true. This
// keeps a new JNI critical region from starting until a GC has been
// forced. Save down any oops in registers and describe them in an
// OopMap.
@@ -1486,9 +1486,9 @@
VMRegPair* in_regs,
BasicType* in_sig_bt,
Register tmp_reg ) {
- __ block_comment("check GC_locker::needs_gc");
+ __ block_comment("check GCLocker::needs_gc");
Label cont;
- __ lbz(tmp_reg, (RegisterOrConstant)(intptr_t)GC_locker::needs_gc_address());
+ __ lbz(tmp_reg, (RegisterOrConstant)(intptr_t)GCLocker::needs_gc_address());
__ cmplwi(CCR0, tmp_reg, 0);
__ beq(CCR0, cont);
@@ -1687,14 +1687,14 @@
// GetPrimtiveArrayCritical and disallow the use of any other JNI
// functions. The wrapper is expected to unpack the arguments before
// passing them to the callee and perform checks before and after the
-// native call to ensure that they GC_locker
+// native call to ensure that they GCLocker
// lock_critical/unlock_critical semantics are followed. Some other
// parts of JNI setup are skipped like the tear down of the JNI handle
// block and the check for pending exceptions it's impossible for them
// to be thrown.
//
// They are roughly structured like this:
-// if (GC_locker::needs_gc())
+// if (GCLocker::needs_gc())
// SharedRuntime::block_for_jni_critical();
// tranistion to thread_in_native
// unpack arrray arguments and call native entry point