With AOT, the storage class of the parent shape is not loaded by a `G…

…eneratorClassLoader`.
xjjdlut · May 17, 2021 · c1492ad · c1492ad
1 parent d1fa8c7
commit c1492ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...le.espresso.staticobject/src/com/oracle/truffle/espresso/staticobject/ShapeGenerator.java b/...le.espresso.staticobject/src/com/oracle/truffle/espresso/staticobject/ShapeGenerator.java
@@ -43,10 +43,9 @@ abstract class ShapeGenerator<T> {
 
     abstract StaticShape<T> generateShape(StaticShape<T> parentShape, Collection<StaticProperty> staticProperties);
 
-    static <T> ShapeGenerator<T> getShapeGenerator(StaticShape<T> parentShape) {
+    static <T> ShapeGenerator<T> getShapeGenerator(GeneratorClassLoader gcl, StaticShape<T> parentShape) {
         Class<?> parentStorageClass = parentShape.getStorageClass();
         Class<?> storageSuperclass = ARRAY_BASED_STORAGE ? parentStorageClass.getSuperclass() : parentStorageClass;
-        GeneratorClassLoader gcl = (GeneratorClassLoader) parentStorageClass.getClassLoader();
         return getShapeGenerator(gcl, storageSuperclass, parentShape.getFactoryInterface());
     }
 

diff --git a/...uffle.espresso.staticobject/src/com/oracle/truffle/espresso/staticobject/StaticShape.java b/...uffle.espresso.staticobject/src/com/oracle/truffle/espresso/staticobject/StaticShape.java
@@ -114,7 +114,8 @@ public StaticShape<DefaultStaticObject.Factory> build() {
 
         public <T> StaticShape<T> build(StaticShape<T> parentShape) {
             Objects.requireNonNull(parentShape);
-            ShapeGenerator<T> sg = ShapeGenerator.getShapeGenerator(parentShape);
+            GeneratorClassLoader gcl = getOrCreateClassLoader(parentShape.getStorageClass());
+            ShapeGenerator<T> sg = ShapeGenerator.getShapeGenerator(gcl, parentShape);
             return build(sg, parentShape);
         }