Avoid caching resolved types from different pools

xtclang · Jul 31, 2024 · a719702 · a719702
1 parent 4275508
commit a719702
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/javatools/src/main/java/org/xvm/asm/constants/ParameterizedTypeConstant.java b/javatools/src/main/java/org/xvm/asm/constants/ParameterizedTypeConstant.java
@@ -280,9 +280,10 @@ public TypeConstant resolveTypedefs()
  @Override
  public TypeConstant resolveGenerics(ConstantPool pool, GenericTypeResolver resolver)
  {
- // don't cache results for non-constant (e.g. Frame) resolvers
+ // don't cache results for non-constant (e.g. Frame) or "foreign type" resolvers
  boolean fCache;
- if (resolver instanceof TypeConstant typeResolver && pool == getConstantPool())
+ if (resolver instanceof TypeConstant typeResolver && pool == this.getConstantPool() &&
+ pool == typeResolver.getConstantPool())
  {
  fCache = true;
  typeResolver = typeResolver.removeAccess();