Merge pull request eclipse-omr#2769 from amicic/master

Remove deferredVMAccessRelease
wasmjit-omr · Jul 20, 2018 · 3d7cabd · 3d7cabd
2 parents 65a5628 + 7d533a4
commit 3d7cabd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/example/glue/EnvironmentDelegate.cpp b/example/glue/EnvironmentDelegate.cpp
@@ -141,7 +141,7 @@ MM_EnvironmentDelegate::releaseExclusiveVMAccess()
  * @see assumeExclusiveVMAccess(uintptr_t)
  */
 uintptr_t
-MM_EnvironmentDelegate::relinquishExclusiveVMAccess(bool *deferredVMAccessRelease)
+MM_EnvironmentDelegate::relinquishExclusiveVMAccess()
 {
 	uintptr_t relinquishedExclusiveCount = _env->getOmrVMThread()->exclusiveCount;
 	_env->getOmrVMThread()->exclusiveCount = 0;

diff --git a/example/glue/EnvironmentDelegate.hpp b/example/glue/EnvironmentDelegate.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2017 IBM Corp. and others
+ * Copyright (c) 2017, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -213,7 +213,7 @@ class MM_EnvironmentDelegate
 	 * @return the exclusive count of the current thread before relinquishing
 	 * @see assumeExclusiveVMAccess(uintptr_t)
 	 */
-	uintptr_t relinquishExclusiveVMAccess(bool *deferredVMAccessRelease);
+	uintptr_t relinquishExclusiveVMAccess();
 
 	/**
 	 * Assume exclusive access from a collaborating thread (i.e. main-to-master or master-to-main).

diff --git a/gc/base/EnvironmentBase.cpp b/gc/base/EnvironmentBase.cpp
@@ -487,9 +487,9 @@ MM_EnvironmentBase::unwindExclusiveVMAccessForGC()
 }
 
 uintptr_t
-MM_EnvironmentBase::relinquishExclusiveVMAccess(bool *deferredVMAccessRelease)
+MM_EnvironmentBase::relinquishExclusiveVMAccess()
 {
-	return _delegate.relinquishExclusiveVMAccess(deferredVMAccessRelease);
+	return _delegate.relinquishExclusiveVMAccess();
 }
 
 void

diff --git a/gc/base/EnvironmentBase.hpp b/gc/base/EnvironmentBase.hpp
@@ -441,10 +441,9 @@ class MM_EnvironmentBase : public MM_BaseVirtual
 
 	/**
 	 * Give up exclusive access in preparation for transferring it to a collaborating thread (i.e. main-to-master or master-to-main)
-	 * @deferredVMAccessRelease Set to true if caller wants to defer releasing VM access (for the calling thread) at a later point (to be done explicitly by the caller). The method may set it back to false, if unable to obey the request.
 	 * @return the exclusive count of the current thread before relinquishing 
 	 */
-	uintptr_t relinquishExclusiveVMAccess(bool *deferredVMAccessRelease = NULL);
+	uintptr_t relinquishExclusiveVMAccess();
 
 	/**
 	 * Assume exclusive access from a collaborating thread i.e. main-to-master or master-to-main)