undo rename that added __ to fields

Author: lambdageek

src/mono/mono/metadata/class-internals.h

@@ -588,8 +588,10 @@ typedef struct {
 	// have both of them to be non-NULL.
 	const char *name;
 	gconstpointer func;
-	gconstpointer wrapper__;
-	gconstpointer trampoline__;
+	// use CAS to write
+	gconstpointer wrapper;
+	// use CAS to write
+	gconstpointer trampoline;
 	MonoMethodSignature *sig;
 	const char *c_symbol;
 	MonoMethod *wrapper_method;

src/mono/mono/metadata/icall.c

@@ -7220,7 +7220,8 @@ mono_register_jit_icall_info (MonoJitICallInfo *info, gconstpointer func, const
 	// Fill in wrapper ahead of time, to just be func, to avoid
 	// later initializing it to anything else. So therefore, no wrapper.
 	if (avoid_wrapper) {
-		info->wrapper__ = func;
+		// not using CAS, because its idempotent
+		info->wrapper = func;
 	} else {
 		// Leave it alone in case of a race.
 	}

src/mono/mono/mini/aot-compiler.c

@@ -6960,7 +6960,7 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui
 					}
 				} else if (patch_info->type == MONO_PATCH_INFO_JIT_ICALL_ID) {
 					MonoJitICallInfo * const info = mono_find_jit_icall_info (patch_info->data.jit_icall_id);
-					if (!got_only && info->func == info->wrapper__) {
+					if (!got_only && info->func == info->wrapper) {
 						const char * sym = NULL;
 						if (patch_info->data.jit_icall_id == MONO_JIT_ICALL_mono_dummy_runtime_init_callback) {
 							g_assert (acfg->aot_opts.static_link && acfg->aot_opts.runtime_init_callback != NULL);
@@ -10612,7 +10612,7 @@ mono_aot_get_direct_call_symbol (MonoJumpInfoType type, gconstpointer data)
 			sym = lookup_direct_pinvoke_symbol_name_aot (llvm_acfg, method);
 	} else if (type == MONO_PATCH_INFO_JIT_ICALL_ID && (direct_calls || (MonoJitICallId)(gsize)data == MONO_JIT_ICALL_mono_dummy_runtime_init_callback)) {
 		MonoJitICallInfo const * const info = mono_find_jit_icall_info ((MonoJitICallId)(gsize)data);
-		if (info->func == info->wrapper__) {
+		if (info->func == info->wrapper) {
 			if ((MonoJitICallId)(gsize)data == MONO_JIT_ICALL_mono_dummy_runtime_init_callback) {
 				sym = llvm_acfg->aot_opts.runtime_init_callback;
 			} else {

src/mono/mono/mini/mini-amd64.c

@@ -3170,7 +3170,7 @@ emit_call (MonoCompile *cfg, MonoCallInst *call, guint8 *code, MonoJitICallId ji
 					patch.type = MONO_PATCH_INFO_JIT_ICALL_ID;
 					patch.target = GUINT_TO_POINTER (jit_icall_id);
 
-					if (info->func == info->wrapper__) {
+					if (info->func == info->wrapper) {
 						/* No wrapper */
 						if ((((guint64)info->func) >> 32) == 0)
 							near_call = TRUE;

src/mono/mono/mini/mini-llvm.c

@@ -2172,7 +2172,7 @@ get_callee_llvmonly (EmitContext *ctx, LLVMTypeRef llvm_sig, MonoJumpInfoType ty
 		if (type == MONO_PATCH_INFO_JIT_ICALL_ID) {
 			MonoJitICallInfo * const info = mono_find_jit_icall_info ((MonoJitICallId)(gsize)data);
 			g_assert (info);
-			if (info->func != info->wrapper__) {
+			if (info->func != info->wrapper) {
 				type = MONO_PATCH_INFO_METHOD;
 				data = mono_icall_get_wrapper_method (info);
 				callee_name = mono_aot_get_mangled_method_name ((MonoMethod*)data);
@@ -2215,7 +2215,7 @@ get_callee_llvmonly (EmitContext *ctx, LLVMTypeRef llvm_sig, MonoJumpInfoType ty
 	if (ctx->module->assembly->image == mono_get_corlib () && type == MONO_PATCH_INFO_JIT_ICALL_ID) {
 		MonoJitICallInfo * const info = mono_find_jit_icall_info ((MonoJitICallId)(gsize)data);
 
-		if (info->func != info->wrapper__) {
+		if (info->func != info->wrapper) {
 			type = MONO_PATCH_INFO_METHOD;
 			data = mono_icall_get_wrapper_method (info);
 		}

src/mono/mono/mini/mini-runtime.c

@@ -654,28 +654,28 @@ mono_icall_get_wrapper_full (MonoJitICallInfo* callinfo, gboolean do_compile)
 	MonoMethod *wrapper;
 	gconstpointer addr, trampoline;
 
-	if (callinfo->wrapper__)
-		return callinfo->wrapper__;
+	if (callinfo->wrapper)
+		return callinfo->wrapper;
 
 	wrapper = mono_icall_get_wrapper_method (callinfo);
 
 	if (do_compile) {
 		addr = mono_compile_method_checked (wrapper, error);
 		mono_error_assert_ok (error);
 		mono_memory_barrier ();
-		callinfo->wrapper__ = addr;
-		return addr;
+		mono_atomic_cas_ptr ((volatile gpointer*)&callinfo->wrapper, (gpointer)addr, NULL);
+		return (gconstpointer)mono_atomic_load_ptr((volatile gpointer*)&callinfo->wrapper);
 	} else {
-		if (callinfo->trampoline__)
-			return callinfo->trampoline__;
+		if (callinfo->trampoline)
+			return callinfo->trampoline;
 		trampoline = mono_create_jit_trampoline (wrapper, error);
 		mono_error_assert_ok (error);
 		trampoline = mono_create_ftnptr ((gpointer)trampoline);
 
 
-		mono_atomic_cas_ptr ((volatile gpointer*)&callinfo->trampoline__, (void*)trampoline, NULL);
+		mono_atomic_cas_ptr ((volatile gpointer*)&callinfo->trampoline, (gpointer)trampoline, NULL);
 
-		return (gconstpointer)mono_atomic_load_ptr ((volatile gpointer*)&callinfo->trampoline__);
+		return (gconstpointer)mono_atomic_load_ptr ((volatile gpointer*)&callinfo->trampoline);
 	}
 }
 
@@ -2853,8 +2853,8 @@ mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, gboolean jit_
 	p = mono_create_ftnptr (code);
 
 	if (callinfo) {
-		mono_atomic_cas_ptr ((volatile void*)&callinfo->wrapper__, p, NULL);
-		p = mono_atomic_load_ptr((volatile gpointer*)&callinfo->wrapper__);
+		mono_atomic_cas_ptr ((volatile void*)&callinfo->wrapper, p, NULL);
+		p = mono_atomic_load_ptr((volatile gpointer*)&callinfo->wrapper);
 	}
 
 	return p;