cleanup

Author: teshull

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

@@ -250,7 +250,7 @@ private static FrameInfoQueryResult decodeUncompressedFrameInfo(boolean isDeoptE
                 return result;
             }
 
-            assert !(!state.isFirstFrame && isDeoptEntry) : "Deoptimization entry must not have inlined frames";
+            assert state.isFirstFrame || !isDeoptEntry : "Deoptimization entry must not have inlined frames";
 
             cur.encodedBci = encodedBci;
             cur.isDeoptEntry = isDeoptEntry;
@@ -281,17 +281,15 @@ private static FrameInfoQueryResult decodeUncompressedFrameInfo(boolean isDeoptE
                 cur.valueInfos = decodeValues(valueInfoAllocator, curValueInfosLength, readBuffer, CodeInfoAccess.getFrameInfoObjectConstants(info));
             }
 
-            if (state.isFirstFrame) {
+            if (state.isFirstFrame && needLocalValues) {
                 /* This is the first frame, i.e., the top frame that will be returned. */
-                if (needLocalValues) {
-                    int numVirtualObjects = readBuffer.getUVInt();
-                    virtualObjects = valueInfoAllocator.newValueInfoArrayArray(numVirtualObjects);
-                    for (int i = 0; i < numVirtualObjects; i++) {
-                        int numValues = readBuffer.getUVInt();
-                        ValueInfo[] decodedValues = decodeValues(valueInfoAllocator, numValues, readBuffer, CodeInfoAccess.getFrameInfoObjectConstants(info));
-                        if (virtualObjects != null) {
-                            virtualObjects[i] = decodedValues;
-                        }
+                int numVirtualObjects = readBuffer.getUVInt();
+                virtualObjects = valueInfoAllocator.newValueInfoArrayArray(numVirtualObjects);
+                for (int i = 0; i < numVirtualObjects; i++) {
+                    int numValues = readBuffer.getUVInt();
+                    ValueInfo[] decodedValues = decodeValues(valueInfoAllocator, numValues, readBuffer, CodeInfoAccess.getFrameInfoObjectConstants(info));
+                    if (virtualObjects != null) {
+                        virtualObjects[i] = decodedValues;
                     }
                 }
             }

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

@@ -824,12 +824,12 @@ public static long encodeBci(int bci, boolean duringCall, boolean rethrowExcepti
 
     /**
      * The source line number also encodes whether the is it the end of or a frame slice or not. The
-     * original value is shifted to guarantee all source line numbers are greater than 0.
+     * original value is incremented to guarantee all source line numbers are greater than 0.
      */
     private static int encodeCompressedSourceLineNumber(int sourceLineNumber, boolean isSliceEnd) {
-        int shiftedLineNumber = sourceLineNumber + FrameInfoDecoder.COMPRESSED_SOURCE_LINE_ADDEND;
-        VMError.guarantee(shiftedLineNumber > 0);
-        return isSliceEnd ? -(shiftedLineNumber) : (shiftedLineNumber);
+        int lineNumberWithAddend = sourceLineNumber + FrameInfoDecoder.COMPRESSED_SOURCE_LINE_ADDEND;
+        VMError.guarantee(lineNumberWithAddend > 0);
+        return isSliceEnd ? -(lineNumberWithAddend) : (lineNumberWithAddend);
     }
 
     void verifyEncoding(CodeInfo info) {