[mono/mono] [2 commits] 64c326af: Move mono_get_optimizations_for_method to mini.c, since driver.c is only included in binaries, not libraries.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/bc4e870d2b6b...8ff7f5748c0c

   Commit: 64c326af717a785136283078f542f1a5f97af67d
   Author: Rolf Bjarne Kvinge <[email protected]> (rolfbjarne)
     Date: 2013-10-24 14:07:43 GMT
      URL: https://github.com/mono/mono/commit/64c326af717a785136283078f542f1a5f97af67d

Move mono_get_optimizations_for_method to mini.c, since driver.c is only included in binaries, not libraries.

Changed paths:
  M mono/mini/driver.c
  M mono/mini/mini.c
  M mono/mini/mini.h

Modified: mono/mini/driver.c
===================================================================
@@ -342,33 +342,6 @@
 }
 #endif
 
-static gboolean do_single_method_regression = FALSE;
-static guint32 single_method_regression_opt;
-static MonoMethod *current_single_method = NULL;
-static GSList *single_method_list = NULL;
-static GHashTable *single_method_hash = NULL;
-
-guint32
-mono_get_optimizations_for_method (MonoMethod *method, guint32 default_opt)
-{
-	g_assert (method);
-
-	if (!do_single_method_regression)
-		return default_opt;
-	if (!current_single_method) {
-		if (!single_method_hash)
-			single_method_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
-		if (!g_hash_table_lookup (single_method_hash, method)) {
-			g_hash_table_insert (single_method_hash, method, method);
-			single_method_list = g_slist_prepend (single_method_list, method);
-		}
-		return default_opt;
-	}
-	if (method == current_single_method)
-		return single_method_regression_opt;
-	return default_opt;
-}
-
 static void
 mini_regression_step (MonoImage *image, int verbose, int *total_run, int *total,
 		guint32 opt_flags,

Modified: mono/mini/mini.c
===================================================================
@@ -6306,6 +6306,33 @@ void *mono_global_codeman_reserve (int size)
 	return NULL;
 }
 
+gboolean do_single_method_regression = FALSE;
+guint32 single_method_regression_opt = 0;
+MonoMethod *current_single_method = NULL;
+GSList *single_method_list = NULL;
+GHashTable *single_method_hash = NULL;
+
+guint32
+mono_get_optimizations_for_method (MonoMethod *method, guint32 default_opt)
+{
+	g_assert (method);
+
+	if (!do_single_method_regression)
+		return default_opt;
+	if (!current_single_method) {
+		if (!single_method_hash)
+			single_method_hash = g_hash_table_new (g_direct_hash, g_direct_equal);
+		if (!g_hash_table_lookup (single_method_hash, method)) {
+			g_hash_table_insert (single_method_hash, method, method);
+			single_method_list = g_slist_prepend (single_method_list, method);
+		}
+		return default_opt;
+	}
+	if (method == current_single_method)
+		return single_method_regression_opt;
+	return default_opt;
+}
+
 gpointer
 mono_jit_find_compiled_method (MonoDomain *domain, MonoMethod *method)
 {

Modified: mono/mini/mini.h
===================================================================
@@ -526,6 +526,11 @@ enum {
 extern const char *mono_build_date;
 extern gboolean mono_do_signal_chaining;
 extern gboolean mono_use_llvm;
+extern gboolean do_single_method_regression;
+extern guint32 single_method_regression_opt;
+extern MonoMethod *current_single_method;
+extern GSList *single_method_list;
+extern GHashTable *single_method_hash;
 
 #define INS_INFO(opcode) (&ins_info [((opcode) - OP_START - 1) * 4])
 

   Commit: 8ff7f5748c0c87e1cca4750fe947dae95dda1f97
   Author: Rolf Bjarne Kvinge <[email protected]> (rolfbjarne)
     Date: 2013-10-24 14:07:53 GMT
      URL: https://github.com/mono/mono/commit/8ff7f5748c0c87e1cca4750fe947dae95dda1f97

Add OrderedDictionary to the mobile profile.

Requested in support case #49635.

Changed paths:
  M mcs/class/System/mobile_System.dll.sources

Modified: mcs/class/System/mobile_System.dll.sources
===================================================================
@@ -20,6 +20,8 @@ System.Collections.Specialized/HybridDictionary.cs
 System.Collections.Specialized/ListDictionary.cs
 System.Collections.Specialized/NameObjectCollectionBase.cs
 System.Collections.Specialized/NameValueCollection.cs
+System.Collections.Specialized/IOrderedDictionary.cs
+System.Collections.Specialized/OrderedDictionary.cs
 System.Collections.Specialized/ProcessStringDictionary.cs
 System.Collections.Specialized/StringCollection.cs
 System.Collections.Specialized/StringDictionary.cs


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches