[mono][interp] Fix concurrency issues with publishing transfomed imethod

src/mono/mono/metadata/domain.c

@@ -22,7 +22,6 @@
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-logger-internals.h>
-#include <mono/utils/mono-membar.h>
 #include <mono/utils/mono-counters.h>
 #include <mono/utils/hazard-pointer.h>
 #include <mono/utils/mono-tls.h>

src/mono/mono/metadata/icall.c

@@ -38,7 +38,6 @@
 #endif
 
 #include "mono/metadata/icall-internals.h"
-#include "mono/utils/mono-membar.h"
 #include <mono/metadata/object.h>
 #include <mono/metadata/threads.h>
 #include <mono/metadata/threads-types.h>

src/mono/mono/metadata/jit-info.c

@@ -23,7 +23,7 @@
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-logger-internals.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/hazard-pointer.h>
 #include <mono/utils/mono-tls.h>
 #include <mono/utils/mono-mmap.h>

src/mono/mono/metadata/loader.c

@@ -46,7 +46,7 @@
 #include <mono/metadata/jit-info.h>
 #include <mono/utils/mono-logger-internals.h>
 #include <mono/utils/mono-dl.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-counters.h>
 #include <mono/utils/mono-error-internals.h>
 #include <mono/utils/mono-tls.h>

src/mono/mono/metadata/property-bag.c

@@ -9,7 +9,7 @@
  */
 #include <mono/metadata/property-bag.h>
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 
 /*
  * mono_property_bag_get:

src/mono/mono/metadata/reflection.c

@@ -13,7 +13,7 @@
  * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 #include <config.h>
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 #include "mono/metadata/assembly-internals.h"
 #include "mono/metadata/reflection-internals.h"
 #include "mono/metadata/tabledefs.h"

src/mono/mono/metadata/string-icalls.c

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 #include <mono/metadata/string-icalls.h>
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/appdomain.h>

src/mono/mono/metadata/threads-types.h

@@ -19,7 +19,7 @@
 #include <mono/metadata/object.h>
 #include "mono/metadata/handle.h"
 #include "mono/utils/mono-compiler.h"
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 #include "mono/utils/mono-threads.h"
 #include "mono/metadata/class-internals.h"
 #include <mono/metadata/icalls.h>

src/mono/mono/metadata/threads.c

@@ -36,7 +36,7 @@
 #include <mono/utils/monobitset.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-mmap.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-time.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/mono-threads-coop.h>

src/mono/mono/mini/interp/interp.c

@@ -27,7 +27,7 @@
 #include <mono/utils/mono-logger-internals.h>
 #include <mono/utils/mono-tls-inline.h>
 #include <mono/utils/mono-threads.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
@@ -3606,6 +3606,8 @@ method_entry (ThreadContext *context, InterpFrame *frame,
 			frame->stack = (stackval*)context->stack_pointer;
 			return slow;
 		}
+	} else {
+		mono_memory_read_barrier ();
 	}
 
 	return slow;

src/mono/mono/mini/mini-trampolines.c

@@ -14,7 +14,7 @@
 #include <mono/metadata/tabledefs.h>
 #include <mono/utils/mono-counters.h>
 #include <mono/utils/mono-error-internals.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-threads-coop.h>
 #include <mono/utils/unlocked.h>

src/mono/mono/profiler/log.c

@@ -38,7 +38,7 @@
 #include <mono/utils/mono-coop-mutex.h>
 #include <mono/utils/mono-logger-internals.h>
 #include <mono/utils/mono-linked-list-set.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-mmap.h>
 #include <mono/utils/mono-os-mutex.h>
 #include <mono/utils/mono-os-semaphore.h>

src/mono/mono/sgen/sgen-fin-weak-hash.c

@@ -23,7 +23,7 @@
 #include "mono/sgen/sgen-pointer-queue.h"
 #include "mono/sgen/sgen-client.h"
 #include "mono/sgen/gc-internal-agnostic.h"
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 #include "mono/utils/atomic.h"
 #include "mono/utils/unlocked.h"
 

src/mono/mono/sgen/sgen-gchandles.c

@@ -13,7 +13,7 @@
 #include "mono/sgen/sgen-gc.h"
 #include "mono/sgen/sgen-client.h"
 #include "mono/sgen/sgen-array-list.h"
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 
 #ifdef HEAVY_STATISTICS
 static volatile guint32 stat_gc_handles_allocated = 0;

src/mono/mono/sgen/sgen-nursery-allocator.c

@@ -55,7 +55,7 @@
 #include "mono/sgen/sgen-memory-governor.h"
 #include "mono/sgen/sgen-pinning.h"
 #include "mono/sgen/sgen-client.h"
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 
 /* Enable it so nursery allocation diagnostic data is collected */
 //#define NALLOC_DEBUG 1

src/mono/mono/sgen/sgen-protocol.c

@@ -18,7 +18,7 @@
 #include "sgen-memory-governor.h"
 #include "sgen-workers.h"
 #include "sgen-client.h"
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 #include "mono/utils/mono-proclib.h"
 
 #include <errno.h>

src/mono/mono/sgen/sgen-workers.c

@@ -18,7 +18,7 @@
 #include "mono/sgen/sgen-gc.h"
 #include "mono/sgen/sgen-workers.h"
 #include "mono/sgen/sgen-thread-pool.h"
-#include "mono/utils/mono-membar.h"
+#include "mono/utils/mono-memory-model.h"
 #include "mono/sgen/sgen-client.h"
 
 #ifndef DISABLE_SGEN_MAJOR_MARKSWEEP_CONC

src/mono/mono/utils/CMakeLists.txt

@@ -101,7 +101,6 @@ set(utils_common_sources
     mono-forward-internal.h
     mono-machine.h
     mono-math.h
-    mono-membar.h
     mono-path.h
     mono-poll.h
     mono-uri.h

src/mono/mono/utils/atomic.h

@@ -15,7 +15,7 @@
 
 #include "config.h"
 #include <glib.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-compiler.h>
 
 /*

src/mono/mono/utils/hazard-pointer.c

@@ -11,7 +11,6 @@
 #include <string.h>
 
 #include <mono/utils/hazard-pointer.h>
-#include <mono/utils/mono-membar.h>
 #include <mono/utils/mono-memory-model.h>
 #include <mono/utils/monobitset.h>
 #include <mono/utils/lock-free-array-queue.h>

src/mono/mono/utils/hazard-pointer.h

@@ -10,7 +10,7 @@
 
 #include <glib.h>
 #include <mono/utils/mono-compiler.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/mono-publib.h>
 
 #define HAZARD_POINTER_COUNT 3

src/mono/mono/utils/lock-free-alloc.c

@@ -73,7 +73,7 @@
 #else
 #include <mono/utils/mono-mmap.h>
 #endif
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/hazard-pointer.h>
 #include <mono/utils/lock-free-queue.h>
 

src/mono/mono/utils/lock-free-array-queue.c

@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #ifdef SGEN_WITHOUT_MONO
 #include <mono/sgen/sgen-gc.h>
 #include <mono/sgen/sgen-client.h>

src/mono/mono/utils/lock-free-queue.c

@@ -52,7 +52,7 @@
 #include <unistd.h>
 #endif
 
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 #include <mono/utils/hazard-pointer.h>
 #include <mono/utils/atomic.h>
 

src/mono/mono/utils/mono-linked-list-set.h

@@ -12,7 +12,7 @@
 #define __MONO_SPLIT_ORDERED_LIST_H__
 
 #include <mono/utils/hazard-pointer.h>
-#include <mono/utils/mono-membar.h>
+#include <mono/utils/mono-memory-model.h>
 
 typedef struct _MonoLinkedListSetNode MonoLinkedListSetNode;