Record more activity in buildRuntimeMetadata().

Author: fniephaus

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java

@@ -295,7 +295,7 @@ void addFrameSlice(FrameData data, List<CompressedFrameData> slice) {
             sliceFrequency.addObject(frameSliceIndex);
         }
 
-        void encodeCompressedData(UnsafeArrayTypeWriter encodingBuffer, Encoders encoders) {
+        void encodeCompressedData(Runnable recordActivity, UnsafeArrayTypeWriter encodingBuffer, Encoders encoders) {
             assert !sealed : "already sealed";
             sealed = true;
 
@@ -332,6 +332,7 @@ void encodeCompressedData(UnsafeArrayTypeWriter encodingBuffer, Encoders encoder
                     uniqueSuccessorIndex = NO_SUCCESSOR_INDEX_MARKER;
                 }
                 encodeCompressedFrame(encodingBuffer, encoders, frame, uniqueSuccessorIndex);
+                recordActivity.run();
             }
 
             /*
@@ -901,7 +902,7 @@ private static void afterInstallation(CodeInfo info) {
 
     private NonmovableArray<Byte> encodeFrameDatas(Runnable recordActivity) {
         UnsafeArrayTypeWriter encodingBuffer = UnsafeArrayTypeWriter.create(ByteArrayReader.supportsUnalignedMemoryAccess());
-        frameMetadata.encodeCompressedData(encodingBuffer, encoders);
+        frameMetadata.encodeCompressedData(recordActivity, encodingBuffer, encoders);
         for (FrameData data : allDebugInfos) {
             if (data.frameSliceIndex == UNCOMPRESSED_FRAME_SLICE_INDEX) {
                 data.encodedFrameInfoIndex = encodingBuffer.getBytesWritten();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java

@@ -435,6 +435,8 @@ protected void buildRuntimeMetadata(DebugContext debug, SnippetReflectionProvide
             }
         }
 
+        watchdog.recordActivity();
+
         if (SubstrateOptions.IncludeMethodData.getValue()) {
             for (HostedField field : hUniverse.getFields()) {
                 if (field.isAccessed() && !field.getWrapped().isInBaseLayer() && !includedFields.contains(field.getWrapped())) {