Fix castStr.execute could be null.

chumer · chumer · commit 136213fa159b · 2020-05-15T13:34:25.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java
@@ -1761,10 +1761,13 @@ public String toDisplayString(boolean allowSideEffects,
             }
             toStrAttr = readStr.execute(builtins, names);
             result = castStr.execute(callNode.execute(toStrAttr, this));
-            return result;
-        } else {
-            return toStringImpl();
+            // reusing the same condition profile here as it effectively
+            // has the same effect.
+            if (conditionProfile.profile(result != null)) {
+                return result;
+            }
         }
+        return toStringImpl();
     }
 
     @TruffleBoundary

Original file line number	Diff line number	Diff line change
`@@ -1761,10 +1761,13 @@ public String toDisplayString(boolean allowSideEffects,`
`1761`	`1761`	`}`
`1762`	`1762`	`toStrAttr = readStr.execute(builtins, names);`
`1763`	`1763`	`result = castStr.execute(callNode.execute(toStrAttr, this));`
`1764`		`- return result;`
`1765`		`- } else {`
`1766`		`- return toStringImpl();`
	`1764`	`+ // reusing the same condition profile here as it effectively`
	`1765`	`+ // has the same effect.`
	`1766`	`+ if (conditionProfile.profile(result != null)) {`
	`1767`	`+ return result;`
	`1768`	`+ }`
`1767`	`1769`	`}`
	`1770`	`+ return toStringImpl();`
`1768`	`1771`	`}`
`1769`	`1772`
`1770`	`1773`	`@TruffleBoundary`