Raise correct exception when sys.displayhook is lost

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt

@@ -35,3 +35,4 @@
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook_err
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_original_unraisablehook_wrong_type
 *graalpython.lib-python.3.test.test_sys.SysModuleTest.test_sys_flags
+*graalpython.lib-python.3.test.test_sys.DisplayHookTest.test_lost_displayhook

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -335,6 +335,7 @@ public abstract class ErrorMessages {
     public static final String LOCAL_VAR_REFERENCED_BEFORE_ASSIGMENT = "local variable '%s' referenced before assignment";
     public static final String LOCALS_MUST_BE_MAPPING = "%s() locals must be a mapping or None, not %p";
     public static final String LOST_SYSBREAKPOINTHOOK = "lost sys.breakpointhook";
+    public static final String LOST_SYSDISPLAYHOOK = "lost sys.displayhook";
     public static final String LENGTH_SHOULD_NOT_BE_NEG = "length should not be negative";
     public static final String MATH_DOMAIN_ERROR = "math domain error";
     public static final String MATH_RANGE_ERROR = "math range error";

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/PrintExpressionNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -43,19 +43,26 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.DISPLAYHOOK;
 
 import com.oracle.graal.python.PythonLanguage;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.nodes.ErrorMessages;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
+import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.TruffleLanguage.ContextReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 public class PrintExpressionNode extends ExpressionNode {
     @CompilationFinal private ContextReference<PythonContext> contextRef;
+    @Child IsBuiltinClassProfile exceptionTypeProfile;
+    @Child PRaiseNode raiseNode;
     @Child GetAttributeNode getAttribute = GetAttributeNode.create(DISPLAYHOOK);
     @Child CallNode callNode = CallNode.create();
     @Child ExpressionNode valueNode;
@@ -72,12 +79,37 @@ public Object execute(VirtualFrame frame) {
             contextRef = lookupContextReference(PythonLanguage.class);
         }
         PythonModule sysModule = contextRef.get().getCore().lookupBuiltinModule("sys");
-        Object displayhook = getAttribute.executeObject(frame, sysModule);
+        Object displayhook;
+        try {
+            displayhook = getAttribute.executeObject(frame, sysModule);
+        } catch (PException ex) {
+            if (ensureExceptionTypeProfile().profileException(ex, PythonBuiltinClassType.AttributeError)) {
+                throw ensureRaiseNode().raise(PythonBuiltinClassType.RuntimeError, ErrorMessages.LOST_SYSDISPLAYHOOK);
+            } else {
+                throw ex;
+            }
+        }
         callNode.execute(frame, displayhook, value);
         return PNone.NONE;
     }
 
     public static PrintExpressionNode create(ExpressionNode valueNode) {
         return new PrintExpressionNode(valueNode);
     }
+
+    public IsBuiltinClassProfile ensureExceptionTypeProfile() {
+        if (exceptionTypeProfile == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            exceptionTypeProfile = insert(IsBuiltinClassProfile.create());
+        }
+        return exceptionTypeProfile;
+    }
+
+    public PRaiseNode ensureRaiseNode() {
+        if (raiseNode == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            raiseNode = insert(PRaiseNode.create());
+        }
+        return raiseNode;
+    }
 }