X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftype-checking.c;h=18a5099d977decdb86790a83a81df355b34745f9;hb=d46883ac2d6f8b4823c86bb0df149f9f1d3cf0c0;hp=bee96455b1d4ac33d6a783edb1cabd6a33846fa2;hpb=00d28f5b5087f79e210ff30a10c44fa6131560c5;p=mono.git

diff --git a/mono/mini/type-checking.c b/mono/mini/type-checking.c
index bee96455b1d..18a5099d977 100644
--- a/mono/mini/type-checking.c
+++ b/mono/mini/type-checking.c
@@ -3,8 +3,8 @@
 
 #ifndef DISABLE_JIT
 
-#include <mini.h>
-#include <ir-emit.h>
+#include "mini.h"
+#include "ir-emit.h"
 #include <mono/metadata/abi-details.h>
 
 
@@ -22,27 +22,71 @@ mini_class_check_context_used (MonoCompile *cfg, MonoClass *klass)
 
 #define is_complex_isinst(klass) (mono_class_is_interface (klass) || klass->rank || mono_class_is_nullable (klass) || mono_class_is_marshalbyref (klass) || mono_class_is_sealed (klass) || klass->byval_arg.type == MONO_TYPE_VAR || klass->byval_arg.type == MONO_TYPE_MVAR)
 
+static int
+get_castclass_cache_idx (MonoCompile *cfg)
+{
+	/* Each CASTCLASS_CACHE patch needs a unique index which identifies the call site */
+	cfg->castclass_cache_index ++;
+	return (cfg->method_index << 16) | cfg->castclass_cache_index;
+}
+
+static void
+emit_cached_check_args (MonoCompile *cfg, MonoInst *obj, MonoClass *klass, int context_used, MonoInst *args[3])
+{
+	args [0] = obj;
+
+	if (context_used) {
+		MonoInst *cache_ins;
+
+		cache_ins = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_CAST_CACHE);
+
+		/* klass - it's the second element of the cache entry*/
+		EMIT_NEW_LOAD_MEMBASE (cfg, args [1], OP_LOAD_MEMBASE, alloc_preg (cfg), cache_ins->dreg, sizeof (gpointer));
+
+		args [2] = cache_ins; /* cache */
+	} else {
+		int idx;
+
+		EMIT_NEW_CLASSCONST (cfg, args [1], klass); /* klass */
+
+		idx = get_castclass_cache_idx (cfg); /* inline cache*/
+		args [2] = mini_emit_runtime_constant (cfg, MONO_PATCH_INFO_CASTCLASS_CACHE, GINT_TO_POINTER (idx));
+	}
+}
+
 static MonoInst*
-emit_isinst_with_cache (MonoCompile *cfg, MonoClass *klass, MonoInst **args)
+emit_isinst_with_cache (MonoCompile *cfg, MonoInst *obj, MonoClass *klass, int context_used)
 {
+	MonoInst *args [3];
 	MonoMethod *mono_isinst = mono_marshal_get_isinst_with_cache ();
+
+	emit_cached_check_args (cfg, obj, klass, context_used, args);
 	return mono_emit_method_call (cfg, mono_isinst, args, NULL);
 }
 
-static int
-get_castclass_cache_idx (MonoCompile *cfg)
+static MonoInst*
+emit_castclass_with_cache_no_details (MonoCompile *cfg, MonoInst *obj, MonoClass *klass, int context_used)
 {
-	/* Each CASTCLASS_CACHE patch needs a unique index which identifies the call site */
-	cfg->castclass_cache_index ++;
-	return (cfg->method_index << 16) | cfg->castclass_cache_index;
+	MonoInst *args [3];
+	MonoMethod *mono_castclass = mono_marshal_get_castclass_with_cache ();
+	MonoInst *res;
+
+	emit_cached_check_args (cfg, obj, klass, context_used, args);
+
+	res = mono_emit_method_call (cfg, mono_castclass, args, NULL);
+
+	return res;
 }
 
 static MonoInst*
-emit_castclass_with_cache (MonoCompile *cfg, MonoClass *klass, MonoInst **args)
+emit_castclass_with_cache (MonoCompile *cfg, MonoInst *obj, MonoClass *klass, int context_used)
 {
+	MonoInst *args [3];
 	MonoMethod *mono_castclass = mono_marshal_get_castclass_with_cache ();
 	MonoInst *res;
 
+	emit_cached_check_args (cfg, obj, klass, context_used, args);
+
 	mini_save_cast_details (cfg, klass, args [0]->dreg, TRUE);
 	res = mono_emit_method_call (cfg, mono_castclass, args, NULL);
 	mini_reset_cast_details (cfg);
@@ -311,6 +355,28 @@ mini_emit_castclass (MonoCompile *cfg, int obj_reg, int klass_reg, MonoClass *kl
 	mini_emit_castclass_inst (cfg, obj_reg, klass_reg, klass, NULL, object_is_null);
 }
 
+static void
+emit_special_array_iface_check (MonoCompile *cfg, MonoInst *src, MonoClass* klass, int vtable_reg, MonoBasicBlock *true_bb, int context_used)
+{
+	MonoBasicBlock *not_an_array;
+	int rank_reg;
+
+	if (!klass->is_array_special_interface)
+		return;
+
+	rank_reg = alloc_ireg (cfg);
+
+	NEW_BBLOCK (cfg, not_an_array);
+	MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, rank_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, rank));
+	MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, rank_reg, 1);
+	MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_IBNE_UN, not_an_array);
+
+	emit_castclass_with_cache_no_details (cfg, src, klass, context_used);
+	MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, true_bb);
+
+	MONO_START_BB (cfg, not_an_array);
+
+}
 
 /*
  * Returns NULL and set the cfg exception on error.
@@ -320,31 +386,15 @@ handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context
 {
 	MonoBasicBlock *is_null_bb;
 	int obj_reg = src->dreg;
-	int vtable_reg = alloc_preg (cfg);
 	MonoInst *klass_inst = NULL;
 
 	if (MONO_INS_IS_PCONST_NULL (src))
 		return src;
 
 	if (context_used) {
-		MonoInst *args [3];
-
-		if (is_complex_isinst (klass)) {
-			MonoInst *cache_ins;
-
-			cache_ins = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_CAST_CACHE);
-
-			/* obj */
-			args [0] = src;
 
-			/* klass - it's the second element of the cache entry*/
-			EMIT_NEW_LOAD_MEMBASE (cfg, args [1], OP_LOAD_MEMBASE, alloc_preg (cfg), cache_ins->dreg, sizeof (gpointer));
-
-			/* cache */
-			args [2] = cache_ins;
-
-			return emit_castclass_with_cache (cfg, klass, args);
-		}
+		if (is_complex_isinst (klass))
+			return emit_castclass_with_cache (cfg, src, klass, context_used);
 
 		klass_inst = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS);
 	}
@@ -369,6 +419,10 @@ handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context
 
 		// iface bitmap check failed
 		MONO_START_BB (cfg, interface_fail_bb);
+
+		//Check if it's a rank zero array and emit fallback casting
+		emit_special_array_iface_check (cfg, src, klass, tmp_reg, is_null_bb, context_used);
+
 		MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, tmp_reg, MONO_STRUCT_OFFSET (MonoVTable, klass));
 
 		mini_emit_class_check (cfg, klass_reg, mono_defaults.transparent_proxy_class);
@@ -385,9 +439,22 @@ handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context
 
 		MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, is_null_bb);
 #else
+		MonoBasicBlock *interface_fail_bb = NULL;
+
 		MONO_EMIT_NEW_LOAD_MEMBASE (cfg, tmp_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable));
-		mini_emit_iface_cast (cfg, tmp_reg, klass, NULL, NULL);
-		MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, is_null_bb);
+
+		if (klass->is_array_special_interface) {
+			NEW_BBLOCK (cfg, interface_fail_bb);
+			mini_emit_iface_cast (cfg, tmp_reg, klass, interface_fail_bb, is_null_bb);
+			// iface bitmap check failed
+			MONO_START_BB (cfg, interface_fail_bb);
+
+			//Check if it's a rank zero array and emit fallback casting
+			emit_special_array_iface_check (cfg, src, klass, tmp_reg, is_null_bb, context_used);
+		} else {
+			mini_emit_iface_cast (cfg, tmp_reg, klass, NULL, NULL);
+			MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, is_null_bb);
+		}
 #endif
 	} else if (mono_class_is_marshalbyref (klass)) {
 #ifndef DISABLE_REMOTING
@@ -430,6 +497,7 @@ handle_castclass (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context
 		g_error ("Transparent proxy support is disabled while trying to JIT code that uses it");
 #endif
 	} else {
+		int vtable_reg = alloc_preg (cfg);
 		int klass_reg = alloc_preg (cfg);
 
 		MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable));
@@ -476,19 +544,8 @@ handle_isinst (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context_us
 	MonoInst *klass_inst = NULL;
 
 	if (context_used) {
-		MonoInst *args [3];
-
-		if(is_complex_isinst (klass)) {
-			MonoInst *cache_ins = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_CAST_CACHE);
-
-			args [0] = src; /* obj */
-
-			/* klass - it's the second element of the cache entry*/
-			EMIT_NEW_LOAD_MEMBASE (cfg, args [1], OP_LOAD_MEMBASE, alloc_preg (cfg), cache_ins->dreg, sizeof (gpointer));
-
-			args [2] = cache_ins; /* cache */
-			return emit_isinst_with_cache (cfg, klass, args);
-		}
+		if(is_complex_isinst (klass))
+			return emit_isinst_with_cache (cfg, src, klass, context_used);
 
 		klass_inst = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_KLASS);
 	}
@@ -508,19 +565,37 @@ handle_isinst (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context_us
 	MONO_EMIT_NEW_LOAD_MEMBASE (cfg, vtable_reg, obj_reg, MONO_STRUCT_OFFSET (MonoObject, vtable));
 
 	if (mono_class_is_interface (klass)) {
-		int tmp_reg, klass_reg;
+		MonoBasicBlock *interface_fail_bb;
+
+		NEW_BBLOCK (cfg, interface_fail_bb);
+
+		mini_emit_iface_cast (cfg, vtable_reg, klass, interface_fail_bb, is_null_bb);
+		MONO_START_BB (cfg, interface_fail_bb);
+
+		if (klass->is_array_special_interface) {
+			MonoBasicBlock *not_an_array;
+			MonoInst *move;
+			int rank_reg = alloc_ireg (cfg);
+
+			NEW_BBLOCK (cfg, not_an_array);
+			MONO_EMIT_NEW_LOAD_MEMBASE_OP (cfg, OP_LOADU1_MEMBASE, rank_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, rank));
+			MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, rank_reg, 1);
+			MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_IBNE_UN, not_an_array);
+
+			MonoInst *res_inst = emit_isinst_with_cache (cfg, src, klass, context_used);
+			EMIT_NEW_UNALU (cfg, move, OP_MOVE, res_reg, res_inst->dreg);
+			MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, end_bb);
+
+			MONO_START_BB (cfg, not_an_array);
+		}
 
 #ifndef DISABLE_REMOTING
-		MonoBasicBlock *interface_fail_bb, *call_proxy_isinst;
+		int tmp_reg, klass_reg;
+		MonoBasicBlock *call_proxy_isinst;
 
-		NEW_BBLOCK (cfg, interface_fail_bb);
 		NEW_BBLOCK (cfg, call_proxy_isinst);
-#endif
 
-#ifndef DISABLE_REMOTING
 		klass_reg = alloc_preg (cfg);
-		mini_emit_iface_cast (cfg, vtable_reg, klass, interface_fail_bb, is_null_bb);
-		MONO_START_BB (cfg, interface_fail_bb);
 		MONO_EMIT_NEW_LOAD_MEMBASE (cfg, klass_reg, vtable_reg, MONO_STRUCT_OFFSET (MonoVTable, klass));
 
 		mini_emit_class_check_branch (cfg, klass_reg, mono_defaults.transparent_proxy_class, OP_PBNE_UN, false_bb);
@@ -537,8 +612,9 @@ handle_isinst (MonoCompile *cfg, MonoClass *klass, MonoInst *src, int context_us
 		MONO_EMIT_NEW_BIALU_IMM (cfg, OP_COMPARE_IMM, -1, proxy_test_inst->dreg, 0);
 		MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_PBNE_UN, is_null_bb);
 #else
-		mini_emit_iface_cast (cfg, vtable_reg, klass, false_bb, is_null_bb);
+		MONO_EMIT_NEW_BRANCH_BLOCK (cfg, OP_BR, false_bb);
 #endif
+
 	} else if (mono_class_is_marshalbyref (klass)) {
 
 #ifndef DISABLE_REMOTING
@@ -678,31 +754,11 @@ mono_decompose_typecheck (MonoCompile *cfg, MonoBasicBlock *bb, MonoInst *ins)
 	NEW_BBLOCK (cfg, first_bb);
 	cfg->cbb = first_bb;
 
-	if (mini_class_has_reference_variant_generic_argument (cfg, klass, context_used) || klass->is_array_special_interface) {
-		MonoInst *args [3];
-		args [0] = source; /* obj */
-
-		if (context_used) {
-			MonoInst *cache_ins;
-
-			cache_ins = mini_emit_get_rgctx_klass (cfg, context_used, klass, MONO_RGCTX_INFO_CAST_CACHE);
-
-			/* klass - it's the second element of the cache entry*/
-			EMIT_NEW_LOAD_MEMBASE (cfg, args [1], OP_LOAD_MEMBASE, alloc_preg (cfg), cache_ins->dreg, sizeof (gpointer));
-
-			args [2] = cache_ins; /* cache */
-		} else {
-			int idx;
-
-			EMIT_NEW_CLASSCONST (cfg, args [1], klass); /* klass */
-
-			idx = get_castclass_cache_idx (cfg); /* inline cache*/
-			args [2] = mini_emit_runtime_constant (cfg, MONO_PATCH_INFO_CASTCLASS_CACHE, GINT_TO_POINTER (idx));
-		}
+	if (mini_class_has_reference_variant_generic_argument (cfg, klass, context_used)) {
 		if (is_isinst)
-			ret = emit_isinst_with_cache (cfg, klass, args);
+			ret = emit_isinst_with_cache (cfg, source, klass, context_used);
 		else
-			ret = emit_castclass_with_cache (cfg, klass, args);
+			ret = emit_castclass_with_cache (cfg, source, klass, context_used);
 
 	} else {
 		if (is_isinst)
@@ -746,4 +802,7 @@ mini_emit_class_check (MonoCompile *cfg, int klass_reg, MonoClass *klass)
 	mini_emit_class_check_inst (cfg, klass_reg, klass, NULL);
 }
 
-#endif
\ No newline at end of file
+#else
+
+MONO_EMPTY_SOURCE_FILE (type_checking);
+#endif