Mercurial > hg > truffle
diff src/share/vm/prims/jvmtiImpl.hpp @ 6854:fb19af007ffc
7189254: Change makefiles for more flexibility to override defaults
Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles.
Reviewed-by: dholmes, coleenp
author | jprovino |
---|---|
date | Wed, 10 Oct 2012 14:35:58 -0400 |
parents | da91efe96a93 |
children | 8b46b0196eb0 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiImpl.hpp Fri Oct 05 13:37:08 2012 -0700 +++ b/src/share/vm/prims/jvmtiImpl.hpp Wed Oct 10 14:35:58 2012 -0400 @@ -481,15 +481,15 @@ // Factory methods static JvmtiDeferredEvent compiled_method_load_event(nmethod* nm) - KERNEL_RETURN_(JvmtiDeferredEvent()); + NOT_JVMTI_RETURN_(JvmtiDeferredEvent()); static JvmtiDeferredEvent compiled_method_unload_event(nmethod* nm, - jmethodID id, const void* code) KERNEL_RETURN_(JvmtiDeferredEvent()); + jmethodID id, const void* code) NOT_JVMTI_RETURN_(JvmtiDeferredEvent()); static JvmtiDeferredEvent dynamic_code_generated_event( const char* name, const void* begin, const void* end) - KERNEL_RETURN_(JvmtiDeferredEvent()); + NOT_JVMTI_RETURN_(JvmtiDeferredEvent()); // Actually posts the event. - void post() KERNEL_RETURN; + void post() NOT_JVMTI_RETURN; }; /** @@ -520,13 +520,13 @@ static volatile QueueNode* _pending_list; // Uses CAS for read/update // Transfers events from the _pending_list to the _queue. - static void process_pending_events() KERNEL_RETURN; + static void process_pending_events() NOT_JVMTI_RETURN; public: // Must be holding Service_lock when calling these - static bool has_events() KERNEL_RETURN_(false); - static void enqueue(const JvmtiDeferredEvent& event) KERNEL_RETURN; - static JvmtiDeferredEvent dequeue() KERNEL_RETURN_(JvmtiDeferredEvent()); + static bool has_events() NOT_JVMTI_RETURN_(false); + static void enqueue(const JvmtiDeferredEvent& event) NOT_JVMTI_RETURN; + static JvmtiDeferredEvent dequeue() NOT_JVMTI_RETURN_(JvmtiDeferredEvent()); // Used to enqueue events without using a lock, for times (such as during // safepoint) when we can't or don't want to lock the Service_lock. @@ -534,7 +534,7 @@ // Events will be held off to the side until there's a call to // dequeue(), enqueue(), or process_pending_events() (all of which require // the holding of the Service_lock), and will be enqueued at that time. - static void add_pending_event(const JvmtiDeferredEvent&) KERNEL_RETURN; + static void add_pending_event(const JvmtiDeferredEvent&) NOT_JVMTI_RETURN; }; // Utility macro that checks for NULL pointers: