Fix expression evaluation when toString() returns null

Fixes tunnelvisionlabs#29
sharwell · Feb 21, 2015 · ffdf127 · ffdf127
1 parent 9ecc977
commit ffdf127
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/Tvl.Java.DebugInterface.Client/ObjectReference.cs b/Tvl.Java.DebugInterface.Client/ObjectReference.cs
@@ -118,6 +118,10 @@ public IStrongValueHandle<IValue> InvokeMethod(IThreadReference thread, IMethod
                 throw new NotImplementedException();
             }
 
+            Value returnValueMirror = VirtualMachine.GetMirrorOf(returnValue);
+            if (returnValueMirror == null)
+                return null;
+
             return new StrongValueHandle<Value>(VirtualMachine.GetMirrorOf(returnValue));
         }
 

diff --git a/Tvl.VisualStudio.Language.Java/Debugger/JavaDebugProperty.cs b/Tvl.VisualStudio.Language.Java/Debugger/JavaDebugProperty.cs
@@ -629,6 +629,32 @@ public int GetPropertyInfo(enum_DEBUGPROP_INFO_FLAGS dwFields, uint dwRadix, uin
                                                 displayValue = stringReference.GetValue();
                                         }
                                     }
+
+                                    if (displayValue == null)
+                                    {
+                                        IClassType objectClass = classType;
+                                        while (true)
+                                        {
+                                            IClassType parentClass = objectClass.GetSuperclass();
+                                            if (parentClass != null)
+                                                objectClass = parentClass;
+                                            else
+                                                break;
+                                        }
+
+                                        IMethod objectToStringMethod = objectClass.GetConcreteMethod("toString", "()Ljava/lang/String;");
+
+                                        // fall back to a non-virtual call
+                                        using (IStrongValueHandle<IValue> result = objectReference.InvokeMethod(null, objectToStringMethod, InvokeOptions.NonVirtual | InvokeOptions.SingleThreaded))
+                                        {
+                                            if (result != null)
+                                            {
+                                                stringReference = result.Value as IStringReference;
+                                                if (stringReference != null)
+                                                    displayValue = stringReference.GetValue();
+                                            }
+                                        }
+                                    }
                                 }
 
                                 pPropertyInfo[0].bstrValue = "{" + displayValue + "}";