Avoid unconditional transferToInterpreterAndDeopt in AbstractImportNode

Author: steve-s

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

@@ -457,6 +457,7 @@ protected static byte[] singleByte() {
         @Specialization
         TruffleString resolveName(VirtualFrame frame, TruffleString name, Object globals, int level,
                         @Bind Node inliningTarget,
+                        @Cached PConstructAndRaiseNode constructAndRaiseNode,
                         @Cached GetDictFromGlobalsNode getDictNode,
                         @Cached PyDictGetItem getPackageOrNameNode,
                         @Cached PyDictGetItem getSpecNode,
@@ -549,15 +550,15 @@ TruffleString resolveName(VirtualFrame frame, TruffleString name, Object globals
                 if (path == null) {
                     int dotIdx = indexOfCodePointNode.execute(pkgString, '.', 0, codePointLengthNode.execute(pkgString, TS_ENCODING), TS_ENCODING);
                     if (dotIdx < 0) {
-                        throw noParentError(frame);
+                        throw noParentError(frame, constructAndRaiseNode);
                     }
                     pkgString = substringNode.execute(pkgString, 0, dotIdx, TS_ENCODING, true);
                 }
             }
 
             int lastDotIdx = codePointLengthNode.execute(pkgString, TS_ENCODING);
             if (lastDotIdx == 0) {
-                throw noParentError(frame);
+                throw noParentError(frame, constructAndRaiseNode);
             }
 
             for (int levelUp = 1; levelUp < level; levelUp += 1) {
@@ -579,8 +580,8 @@ TruffleString resolveName(VirtualFrame frame, TruffleString name, Object globals
             return toStringNode.execute(sb);
         }
 
-        private static RuntimeException noParentError(VirtualFrame frame) {
-            throw PConstructAndRaiseNode.getUncached().raiseImportError(frame, ATTEMPTED_RELATIVE_IMPORT_BEYOND_TOPLEVEL);
+        private static RuntimeException noParentError(VirtualFrame frame, PConstructAndRaiseNode raiseNode) {
+            throw raiseNode.raiseImportError(frame, ATTEMPTED_RELATIVE_IMPORT_BEYOND_TOPLEVEL);
         }
     }