Merge pull request #3615 from kloun/patch-8

fix typo, "j-j"

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Hwnd.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Hwnd.cs
index 505a41a0449b6d1c23dabd6e790f4add37288d88..b926e4ed1a8052054703a59723d0aefc3887c534 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/Hwnd.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Hwnd.cs
@@ -596,7 +596,7 @@ namespace System.Windows.Forms {
 
                                if (this.title_style == TitleStyle.Normal)  {
                                        pt.Y += caption_height;
-                               } else if (this.title_style == TitleStyle.Normal)  {
+                               } else if (this.title_style == TitleStyle.Tool)  {
                                        pt.Y += tool_caption_height;
                                }
 

diff --git a/mcs/mcs/generic.cs b/mcs/mcs/generic.cs
index 48d2dc01b96c28e35cd2981830306cdbef1d0302..fdf5b81f92c38a4ef8dba73e5c202a990383eec3 100644 (file)
--- a/mcs/mcs/generic.cs
+++ b/mcs/mcs/generic.cs
@@ -3159,7 +3159,7 @@ namespace Mono.CSharp {
                                        var ga_u = u.TypeArguments;
                                        var ga_v = v.TypeArguments;
 
-                                       if (u.TypeArguments.Length != u.TypeArguments.Length)
+                                       if (u.TypeArguments.Length != v.TypeArguments.Length)
                                                return 0;
 
                                        int score = 0;

diff --git a/mono/mini/mini-arm64.c b/mono/mini/mini-arm64.c
index bc1b5021a01789137c35ed9956bea63247af10ba..e19467f8945dc90d4f2b27a41abd00b30e430501 100644 (file)
--- a/mono/mini/mini-arm64.c
+++ b/mono/mini/mini-arm64.c
@@ -934,7 +934,15 @@ arm_patch_full (MonoCompile *cfg, MonoDomain *domain, guint8 *code, guint8 *targ
 {
        switch (relocation) {
        case MONO_R_ARM64_B:
-               arm_b (code, target);
+               if (arm_is_bl_disp (code, target)) {
+                       arm_b (code, target);
+               } else {
+                       gpointer thunk;
+
+                       thunk = create_thunk (cfg, domain, code, target);
+                       g_assert (arm_is_bl_disp (code, thunk));
+                       arm_b (code, thunk);
+               }
                break;
        case MONO_R_ARM64_BCC: {
                int cond;
@@ -966,7 +974,7 @@ arm_patch_full (MonoCompile *cfg, MonoDomain *domain, guint8 *code, guint8 *targ
 
                        thunk = create_thunk (cfg, domain, code, target);
                        g_assert (arm_is_bl_disp (code, thunk));
-                       arm_bl (code, thunk);                   
+                       arm_bl (code, thunk);
                }
                break;
        default: