Post rebase fixes.

Author: tzezula

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java

@@ -83,6 +83,8 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.SpeculationLog.SpeculationReason;
 
+import static jdk.graal.compiler.annotation.AnnotationValueSupport.getDeclaredAnnotationValues;
+
 /**
  * Class performing the partial evaluation starting from the root node of an AST.
  */
@@ -202,22 +204,21 @@ public static ConstantFieldInfo computeConstantFieldInfo(ResolvedJavaField field
     }
 
     public static PartialEvaluationMethodInfo computePartialEvaluationMethodInfo(ResolvedJavaMethod method,
-                    Collection<AnnotationValue> annotationValues,
+                    Map<ResolvedJavaType, AnnotationValue> declaredAnnotationValues,
                     KnownTruffleTypes types) {
-        AnnotationValue truffleBoundary = getAnnotationValue(types.CompilerDirectives_TruffleBoundary, annotationValues);
-        AnnotationValue truffleCallBoundary = getAnnotationValue(types.TruffleCallBoundary, annotationValues);
-        boolean specialization = hasAnnotationValue(types.Specialization, annotationValues);
+        AnnotationValue truffleBoundary = declaredAnnotationValues.get(types.CompilerDirectives_TruffleBoundary);
+        AnnotationValue truffleCallBoundary = declaredAnnotationValues.get(types.TruffleCallBoundary);
+        boolean specialization = declaredAnnotationValues.get(types.Specialization) != null;
+        AnnotationValue explodeLoop = declaredAnnotationValues.get(types.ExplodeLoop);
 
-        return new PartialEvaluationMethodInfo(getLoopExplosionKind(annotationValues, types),
+        return new PartialEvaluationMethodInfo(getLoopExplosionKind(explodeLoop),
                         getInlineKind(truffleBoundary, truffleCallBoundary, method, true, types),
                         getInlineKind(truffleBoundary, truffleCallBoundary, method, false, types),
                         method.canBeInlined(),
                         specialization);
     }
 
-    private static LoopExplosionKind getLoopExplosionKind(Collection<AnnotationValue> annotationValues,
-                    KnownTruffleTypes types) {
-        AnnotationValue value = getAnnotationValue(types.ExplodeLoop, annotationValues);
+    private static LoopExplosionKind getLoopExplosionKind(AnnotationValue value) {
         if (value == null) {
             return LoopExplosionKind.NONE;
         }

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotPartialEvaluator.java

@@ -179,7 +179,7 @@ protected Object createKey(ResolvedJavaMethod method) {
 
         @Override
         protected PartialEvaluationMethodInfo computeValue(ResolvedJavaMethod method) {
-            Collection<AnnotationValue> declaredAnnotationValues = AnnotationValueSupport.getDeclaredAnnotationValues(method).values();
+            Map<ResolvedJavaType, AnnotationValue> declaredAnnotationValues = AnnotationValueSupport.getDeclaredAnnotationValues(method);
             PartialEvaluationMethodInfo methodInfo = computePartialEvaluationMethodInfo(method, declaredAnnotationValues, getTypes());
             /*
              * We can canonicalize the instances to reduce space required in the cache. There are

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleUniverseFactory.java

@@ -91,7 +91,7 @@ public SubstrateField createField(AnalysisField aField, HostedStringDeduplicatio
     static PartialEvaluationMethodInfo createPartialEvaluationMethodInfo(TruffleCompilerRuntime runtime, ResolvedJavaMethod method,
                     KnownTruffleTypes types) {
         SubstrateAnnotationExtractor extractor = (SubstrateAnnotationExtractor) ImageSingletons.lookup(AnnotationExtractor.class);
-        List<AnnotationValue> annotations = extractor.getDeclaredAnnotationValues((Annotated) method);
+        Map<ResolvedJavaType, AnnotationValue> annotations = extractor.getDeclaredAnnotationValues((Annotated) method);
         var info = PartialEvaluator.computePartialEvaluationMethodInfo(method, annotations, types);
         if (Uninterruptible.Utils.isUninterruptible(method)) {
             Uninterruptible uninterruptibleAnnotation = Uninterruptible.Utils.getAnnotation(method);

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java

@@ -539,6 +539,13 @@ private static UnmodifiableEconomicMap<String, Class<?>> initLookupTypes(Iterabl
                 throw new NoClassDefFoundError(className);
             }
         }
+        String className = "jdk.internal.event.Event";
+        try {
+            Class<?> c = Class.forName(className);
+            m.put(className, c);
+        } catch (ClassNotFoundException e) {
+            throw new NoClassDefFoundError(className);
+        }
         return m;
     }