Fail loudly on SVM when frozen module cannot be loaded

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

@@ -174,7 +174,7 @@ enum FrozenStatus {
         FROZEN_NOT_FOUND,   // It wasn't in frozen modules.
         FROZEN_DISABLED,    // -X frozen_modules=off (and not essential)
         FROZEN_EXCLUDED,    // Frozen module has no code. We don't use this in our frozen modules
-        FROZEN_INVALID,     // Frozen module has empty code. We don't use this our frozen modules
+        FROZEN_INVALID,     // Frozen module has empty code
     }
 
     @Override
@@ -656,7 +656,9 @@ private static FrozenResult findFrozen(PythonContext context, TruffleString name
                         module.getOriginalName(),
                         !isAlias);
 
-        // CPython checks for invalid/empty modules here, but we don't generate those
+        if (info.code == null) {
+            return new FrozenResult(FROZEN_INVALID, info);
+        }
 
         return new FrozenResult(FROZEN_OKAY, info);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/PythonFrozenModule.java

@@ -44,7 +44,6 @@
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
 
-import java.io.IOException;
 import java.io.InputStream;
 
 import org.graalvm.nativeimage.ImageInfo;
@@ -65,11 +64,13 @@ private void initCode() {
             InputStream resourceAsStream = PythonFrozenModule.class.getResourceAsStream("Frozen" + symbol + "." + getSuffix());
             if (resourceAsStream != null) {
                 byte[] bytes = resourceAsStream.readAllBytes();
-                // TODO exception handling
                 code = MarshalModuleBuiltins.deserializeCodeUnit(null, null, bytes);
             }
-        } catch (IOException e) {
-            // fall-through
+        } catch (Exception e) {
+            // Fail loudly on SVM. On JVM, just fall back to normal import silently
+            if (ImageInfo.inImageBuildtimeCode()) {
+                throw new IllegalStateException("Failed to load frozen module");
+            }
         }
     }