2008-08-18 Zoltan Varga <vargaz@gmail.com>

	* liveness.c (mono_analyze_liveness): Disable the liveness2 code for now
	as it crashes on the 2.0 mscorlib.

svn path=/trunk/mono/; revision=110706

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index ef0a101a9ac76484703c1da983b1f854de63fd15..da6302ea26124e8d847933ea3a4c5659e60844ba 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-18  Zoltan Varga  <vargaz@gmail.com>
 
+       * liveness.c (mono_analyze_liveness): Disable the liveness2 code for now
+       as it crashes on the 2.0 mscorlib.
+
+       * aot-compiler.c (is_shared_got_patch): Revert the last change as it seems
+       to cause crashes.
+       
        * aot-compiler.c: Use is_plt_patch () in a few additional places.
        (is_shared_got_patch): Add MONO_PATCH_INFO_METHODCONST, which is generated
        by IMT.

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 3fd5068b4cff5f1ed8b0ee694c3ab25ea6ef1053..03fd5cb5f8e7787ae892e2fd009e5504fb72c087 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -1898,7 +1898,6 @@ is_shared_got_patch (MonoJumpInfo *patch_info)
        case MONO_PATCH_INFO_LDTOKEN:
        case MONO_PATCH_INFO_TYPE_FROM_HANDLE:
        case MONO_PATCH_INFO_RVA:
-       case MONO_PATCH_INFO_METHODCONST:
                return TRUE;
        default:
                return FALSE;

diff --git a/mono/mini/liveness.c b/mono/mini/liveness.c
index 10d072d0216708d75dc823ebf908b49312694c4c..e1e3fb1cc91ce80baa43e0049f13f7d74601a8b3 100644 (file)
--- a/mono/mini/liveness.c
+++ b/mono/mini/liveness.c
@@ -631,7 +631,8 @@ mono_analyze_liveness (MonoCompile *cfg)
 
 #ifdef ENABLE_LIVENESS2
                /* This improves code size by about 5% but slows down compilation too much */
-               if (cfg->compile_aot)
+               /* FIXME: This crashes when compiling 2.0 mscorlib */
+               if (FALSE && cfg->compile_aot)
                        mono_analyze_liveness2 (cfg);
 #endif
        }