--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Wed Feb 15 22:19:13 2017 -0500
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Thu Feb 16 10:41:19 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -5129,36 +5129,6 @@
}
-void MacroAssembler::resolve_jobject(Register value,
- Register thread,
- Register tmp) {
- assert_different_registers(value, thread, tmp);
- Label done, not_weak;
- testptr(value, value);
- jcc(Assembler::zero, done); // Use NULL as-is.
- testptr(value, JNIHandles::weak_tag_mask); // Test for jweak tag.
- jcc(Assembler::zero, not_weak);
- // Resolve jweak.
- movptr(value, Address(value, -JNIHandles::weak_tag_value));
- verify_oop(value);
-#if INCLUDE_ALL_GCS
- if (UseG1GC) {
- g1_write_barrier_pre(noreg /* obj */,
- value /* pre_val */,
- thread /* thread */,
- tmp /* tmp */,
- true /* tosca_live */,
- true /* expand_call */);
- }
-#endif // INCLUDE_ALL_GCS
- jmp(done);
- bind(not_weak);
- // Resolve (untagged) jobject.
- movptr(value, Address(value, 0));
- verify_oop(value);
- bind(done);
-}
-
//////////////////////////////////////////////////////////////////////////////////
#if INCLUDE_ALL_GCS