[GR-53338] [GR-53789] Revert changes to gate predicates.

PullRequest: graal/17655
oracle · May 7, 2024 · 481625b · 481625b
2 parents 0c7497f + 470d5b4
commit 481625b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/ci/ci_common/common.jsonnet b/ci/ci_common/common.jsonnet
@@ -42,9 +42,6 @@ common + common.frequencies + {
           "<graal>/.devcontainer/**",
           "<graal>/.github/**",
           "<graal>/vm/ce-release-artifacts.json"
-        ],
-        includes+: ["<graal>/tools/profiling.md",
-          "<graal>/truffle/docs/Options.md"
         ]
       }
     } else {}

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
@@ -769,7 +769,7 @@ private void layoutStaticFields() {
         int nextObjectField = 0;
 
         @SuppressWarnings("unchecked")
-        List<HostedField>[] fieldsOfTypes = (List<HostedField>[]) new ArrayList<?>[hUniverse.getTypes().size()];
+        List<HostedField>[] fieldsOfTypes = (List<HostedField>[]) new ArrayList<?>[DynamicHubSupport.singleton().getMaxTypeId()];
 
         for (HostedField field : fields) {
             if (skipStaticField(field)) {
@@ -816,7 +816,7 @@ private void layoutStaticFields() {
 
     @SuppressWarnings("unchecked")
     private void collectDeclaredMethods() {
-        List<HostedMethod>[] methodsOfType = (ArrayList<HostedMethod>[]) new ArrayList<?>[hUniverse.getTypes().size()];
+        List<HostedMethod>[] methodsOfType = (ArrayList<HostedMethod>[]) new ArrayList<?>[DynamicHubSupport.singleton().getMaxTypeId()];
         for (HostedMethod method : hUniverse.methods.values()) {
             int typeId = method.getDeclaringClass().getTypeID();
             List<HostedMethod> list = methodsOfType[typeId];