src/hotspot/share/interpreter/bytecodeInterpreter.cpp

rev 49290 : [mq]: JDK-8199735.01.patch

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2018, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 686,706 ****
              // Try to revoke bias.
              markOop header = rcvr->klass()->prototype_header();
              if (hash != markOopDesc::no_hash) {
                header = header->copy_set_hash(hash);
              }
!             if (Atomic::cmpxchg(header, rcvr->mark_addr(), mark) == mark) {
                if (PrintBiasedLockingStatistics)
                  (*BiasedLocking::revoked_lock_entry_count_addr())++;
              }
            } else if ((anticipated_bias_locking_value & epoch_mask_in_place) != 0) {
              // Try to rebias.
              markOop new_header = (markOop) ( (intptr_t) rcvr->klass()->prototype_header() | thread_ident);
              if (hash != markOopDesc::no_hash) {
                new_header = new_header->copy_set_hash(hash);
              }
!             if (Atomic::cmpxchg(new_header, rcvr->mark_addr(), mark) == mark) {
                if (PrintBiasedLockingStatistics) {
                  (* BiasedLocking::rebiased_lock_entry_count_addr())++;
                }
              } else {
                CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
--- 686,706 ----
              // Try to revoke bias.
              markOop header = rcvr->klass()->prototype_header();
              if (hash != markOopDesc::no_hash) {
                header = header->copy_set_hash(hash);
              }
!             if (rcvr->cas_set_mark(header, mark) == mark) {
                if (PrintBiasedLockingStatistics)
                  (*BiasedLocking::revoked_lock_entry_count_addr())++;
              }
            } else if ((anticipated_bias_locking_value & epoch_mask_in_place) != 0) {
              // Try to rebias.
              markOop new_header = (markOop) ( (intptr_t) rcvr->klass()->prototype_header() | thread_ident);
              if (hash != markOopDesc::no_hash) {
                new_header = new_header->copy_set_hash(hash);
              }
!             if (rcvr->cas_set_mark(new_header, mark) == mark) {
                if (PrintBiasedLockingStatistics) {
                  (* BiasedLocking::rebiased_lock_entry_count_addr())++;
                }
              } else {
                CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
*** 715,725 ****
                header = header->copy_set_hash(hash);
              }
              markOop new_header = (markOop) ((uintptr_t) header | thread_ident);
              // Debugging hint.
              DEBUG_ONLY(mon->lock()->set_displaced_header((markOop) (uintptr_t) 0xdeaddead);)
!             if (Atomic::cmpxchg(new_header, rcvr->mark_addr(), header) == header) {
                if (PrintBiasedLockingStatistics) {
                  (* BiasedLocking::anonymously_biased_lock_entry_count_addr())++;
                }
              } else {
                CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
--- 715,725 ----
                header = header->copy_set_hash(hash);
              }
              markOop new_header = (markOop) ((uintptr_t) header | thread_ident);
              // Debugging hint.
              DEBUG_ONLY(mon->lock()->set_displaced_header((markOop) (uintptr_t) 0xdeaddead);)
!             if (rcvr->cas_set_mark(new_header, header) == header) {
                if (PrintBiasedLockingStatistics) {
                  (* BiasedLocking::anonymously_biased_lock_entry_count_addr())++;
                }
              } else {
                CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
*** 731,741 ****
          // Traditional lightweight locking.
          if (!success) {
            markOop displaced = rcvr->mark()->set_unlocked();
            mon->lock()->set_displaced_header(displaced);
            bool call_vm = UseHeavyMonitors;
!           if (call_vm || Atomic::cmpxchg((markOop)mon, rcvr->mark_addr(), displaced) != displaced) {
              // Is it simple recursive case?
              if (!call_vm && THREAD->is_lock_owned((address) displaced->clear_lock_bits())) {
                mon->lock()->set_displaced_header(NULL);
              } else {
                CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
--- 731,741 ----
          // Traditional lightweight locking.
          if (!success) {
            markOop displaced = rcvr->mark()->set_unlocked();
            mon->lock()->set_displaced_header(displaced);
            bool call_vm = UseHeavyMonitors;
!           if (call_vm || rcvr->cas_set_mark((markOop)mon, displaced) != displaced) {
              // Is it simple recursive case?
              if (!call_vm && THREAD->is_lock_owned((address) displaced->clear_lock_bits())) {
                mon->lock()->set_displaced_header(NULL);
              } else {
                CALL_VM(InterpreterRuntime::monitorenter(THREAD, mon), handle_exception);
*** 872,893 ****
            // try revoke bias
            markOop header = lockee->klass()->prototype_header();
            if (hash != markOopDesc::no_hash) {
              header = header->copy_set_hash(hash);
            }
!           if (Atomic::cmpxchg(header, lockee->mark_addr(), mark) == mark) {
              if (PrintBiasedLockingStatistics) {
                (*BiasedLocking::revoked_lock_entry_count_addr())++;
              }
            }
          } else if ((anticipated_bias_locking_value & epoch_mask_in_place) !=0) {
            // try rebias
            markOop new_header = (markOop) ( (intptr_t) lockee->klass()->prototype_header() | thread_ident);
            if (hash != markOopDesc::no_hash) {
                  new_header = new_header->copy_set_hash(hash);
            }
!           if (Atomic::cmpxchg(new_header, lockee->mark_addr(), mark) == mark) {
              if (PrintBiasedLockingStatistics) {
                (* BiasedLocking::rebiased_lock_entry_count_addr())++;
              }
            } else {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
--- 872,893 ----
            // try revoke bias
            markOop header = lockee->klass()->prototype_header();
            if (hash != markOopDesc::no_hash) {
              header = header->copy_set_hash(hash);
            }
!           if (lockee->cas_set_mark(header, mark) == mark) {
              if (PrintBiasedLockingStatistics) {
                (*BiasedLocking::revoked_lock_entry_count_addr())++;
              }
            }
          } else if ((anticipated_bias_locking_value & epoch_mask_in_place) !=0) {
            // try rebias
            markOop new_header = (markOop) ( (intptr_t) lockee->klass()->prototype_header() | thread_ident);
            if (hash != markOopDesc::no_hash) {
                  new_header = new_header->copy_set_hash(hash);
            }
!           if (lockee->cas_set_mark(new_header, mark) == mark) {
              if (PrintBiasedLockingStatistics) {
                (* BiasedLocking::rebiased_lock_entry_count_addr())++;
              }
            } else {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
*** 901,911 ****
              header = header->copy_set_hash(hash);
            }
            markOop new_header = (markOop) ((uintptr_t) header | thread_ident);
            // debugging hint
            DEBUG_ONLY(entry->lock()->set_displaced_header((markOop) (uintptr_t) 0xdeaddead);)
!           if (Atomic::cmpxchg(new_header, lockee->mark_addr(), header) == header) {
              if (PrintBiasedLockingStatistics) {
                (* BiasedLocking::anonymously_biased_lock_entry_count_addr())++;
              }
            } else {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
--- 901,911 ----
              header = header->copy_set_hash(hash);
            }
            markOop new_header = (markOop) ((uintptr_t) header | thread_ident);
            // debugging hint
            DEBUG_ONLY(entry->lock()->set_displaced_header((markOop) (uintptr_t) 0xdeaddead);)
!           if (lockee->cas_set_mark(new_header, header) == header) {
              if (PrintBiasedLockingStatistics) {
                (* BiasedLocking::anonymously_biased_lock_entry_count_addr())++;
              }
            } else {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
*** 917,927 ****
        // traditional lightweight locking
        if (!success) {
          markOop displaced = lockee->mark()->set_unlocked();
          entry->lock()->set_displaced_header(displaced);
          bool call_vm = UseHeavyMonitors;
!         if (call_vm || Atomic::cmpxchg((markOop)entry, lockee->mark_addr(), displaced) != displaced) {
            // Is it simple recursive case?
            if (!call_vm && THREAD->is_lock_owned((address) displaced->clear_lock_bits())) {
              entry->lock()->set_displaced_header(NULL);
            } else {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
--- 917,927 ----
        // traditional lightweight locking
        if (!success) {
          markOop displaced = lockee->mark()->set_unlocked();
          entry->lock()->set_displaced_header(displaced);
          bool call_vm = UseHeavyMonitors;
!         if (call_vm || lockee->cas_set_mark((markOop)entry, displaced) != displaced) {
            // Is it simple recursive case?
            if (!call_vm && THREAD->is_lock_owned((address) displaced->clear_lock_bits())) {
              entry->lock()->set_displaced_header(NULL);
            } else {
              CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
*** 1813,1834 ****
                // try revoke bias
                markOop header = lockee->klass()->prototype_header();
                if (hash != markOopDesc::no_hash) {
                  header = header->copy_set_hash(hash);
                }
!               if (Atomic::cmpxchg(header, lockee->mark_addr(), mark) == mark) {
                  if (PrintBiasedLockingStatistics)
                    (*BiasedLocking::revoked_lock_entry_count_addr())++;
                }
              }
              else if ((anticipated_bias_locking_value & epoch_mask_in_place) !=0) {
                // try rebias
                markOop new_header = (markOop) ( (intptr_t) lockee->klass()->prototype_header() | thread_ident);
                if (hash != markOopDesc::no_hash) {
                  new_header = new_header->copy_set_hash(hash);
                }
!               if (Atomic::cmpxchg(new_header, lockee->mark_addr(), mark) == mark) {
                  if (PrintBiasedLockingStatistics)
                    (* BiasedLocking::rebiased_lock_entry_count_addr())++;
                }
                else {
                  CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
--- 1813,1834 ----
                // try revoke bias
                markOop header = lockee->klass()->prototype_header();
                if (hash != markOopDesc::no_hash) {
                  header = header->copy_set_hash(hash);
                }
!               if (lockee->cas_set_mark(header, mark) == mark) {
                  if (PrintBiasedLockingStatistics)
                    (*BiasedLocking::revoked_lock_entry_count_addr())++;
                }
              }
              else if ((anticipated_bias_locking_value & epoch_mask_in_place) !=0) {
                // try rebias
                markOop new_header = (markOop) ( (intptr_t) lockee->klass()->prototype_header() | thread_ident);
                if (hash != markOopDesc::no_hash) {
                  new_header = new_header->copy_set_hash(hash);
                }
!               if (lockee->cas_set_mark(new_header, mark) == mark) {
                  if (PrintBiasedLockingStatistics)
                    (* BiasedLocking::rebiased_lock_entry_count_addr())++;
                }
                else {
                  CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
*** 1844,1854 ****
                  header = header->copy_set_hash(hash);
                }
                markOop new_header = (markOop) ((uintptr_t) header | thread_ident);
                // debugging hint
                DEBUG_ONLY(entry->lock()->set_displaced_header((markOop) (uintptr_t) 0xdeaddead);)
!               if (Atomic::cmpxchg(new_header, lockee->mark_addr(), header) == header) {
                  if (PrintBiasedLockingStatistics)
                    (* BiasedLocking::anonymously_biased_lock_entry_count_addr())++;
                }
                else {
                  CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
--- 1844,1854 ----
                  header = header->copy_set_hash(hash);
                }
                markOop new_header = (markOop) ((uintptr_t) header | thread_ident);
                // debugging hint
                DEBUG_ONLY(entry->lock()->set_displaced_header((markOop) (uintptr_t) 0xdeaddead);)
!               if (lockee->cas_set_mark(new_header, header) == header) {
                  if (PrintBiasedLockingStatistics)
                    (* BiasedLocking::anonymously_biased_lock_entry_count_addr())++;
                }
                else {
                  CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
*** 1860,1870 ****
            // traditional lightweight locking
            if (!success) {
              markOop displaced = lockee->mark()->set_unlocked();
              entry->lock()->set_displaced_header(displaced);
              bool call_vm = UseHeavyMonitors;
!             if (call_vm || Atomic::cmpxchg((markOop)entry, lockee->mark_addr(), displaced) != displaced) {
                // Is it simple recursive case?
                if (!call_vm && THREAD->is_lock_owned((address) displaced->clear_lock_bits())) {
                  entry->lock()->set_displaced_header(NULL);
                } else {
                  CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);
--- 1860,1870 ----
            // traditional lightweight locking
            if (!success) {
              markOop displaced = lockee->mark()->set_unlocked();
              entry->lock()->set_displaced_header(displaced);
              bool call_vm = UseHeavyMonitors;
!             if (call_vm || lockee->cas_set_mark((markOop)entry, displaced) != displaced) {
                // Is it simple recursive case?
                if (!call_vm && THREAD->is_lock_owned((address) displaced->clear_lock_bits())) {
                  entry->lock()->set_displaced_header(NULL);
                } else {
                  CALL_VM(InterpreterRuntime::monitorenter(THREAD, entry), handle_exception);