equal
deleted
inserted
replaced
1817 assert(!HAS_PENDING_EXCEPTION, "Should have no exception here"); |
1817 assert(!HAS_PENDING_EXCEPTION, "Should have no exception here"); |
1818 JRT_BLOCK_END |
1818 JRT_BLOCK_END |
1819 JRT_END |
1819 JRT_END |
1820 |
1820 |
1821 // Handles the uncommon cases of monitor unlocking in compiled code |
1821 // Handles the uncommon cases of monitor unlocking in compiled code |
1822 JRT_LEAF(void, SharedRuntime::complete_monitor_unlocking_C(oopDesc* _obj, BasicLock* lock)) |
1822 JRT_LEAF(void, SharedRuntime::complete_monitor_unlocking_C(oopDesc* _obj, BasicLock* lock, JavaThread * THREAD)) |
1823 oop obj(_obj); |
1823 oop obj(_obj); |
1824 Thread* THREAD = JavaThread::current(); |
1824 assert(JavaThread::current() == THREAD, "invariant"); |
1825 // I'm not convinced we need the code contained by MIGHT_HAVE_PENDING anymore |
1825 // I'm not convinced we need the code contained by MIGHT_HAVE_PENDING anymore |
1826 // testing was unable to ever fire the assert that guarded it so I have removed it. |
1826 // testing was unable to ever fire the assert that guarded it so I have removed it. |
1827 assert(!HAS_PENDING_EXCEPTION, "Do we need code below anymore?"); |
1827 assert(!HAS_PENDING_EXCEPTION, "Do we need code below anymore?"); |
1828 #undef MIGHT_HAVE_PENDING |
1828 #undef MIGHT_HAVE_PENDING |
1829 #ifdef MIGHT_HAVE_PENDING |
1829 #ifdef MIGHT_HAVE_PENDING |