Merge "Reland: Fix bug making us not inline when a simple class without clinit had static fields with nothing setting them"
diff --git a/src/cf_segments/java/com/android/tools/r8/cf_segments/Metrics.java b/src/cf_segments/java/com/android/tools/r8/cf_segments/Metrics.java
index 57786e1..8a08fde 100644
--- a/src/cf_segments/java/com/android/tools/r8/cf_segments/Metrics.java
+++ b/src/cf_segments/java/com/android/tools/r8/cf_segments/Metrics.java
@@ -63,7 +63,7 @@
public final SegmentInfo maxLocals = new SegmentInfo("MaxLocal", false);
public final SegmentInfo maxStacks = new SegmentInfo("MaxStack", false);
public final SegmentInfo methodInfo = new SegmentInfo("Method");
- public final SegmentInfo size = new SegmentInfo("Size").increment(1, 0);
+ public final SegmentInfo size = new SegmentInfo("Total").increment(1, 0);
public final SegmentInfo stores = new SegmentInfo("Stores", false);
public final SegmentInfo stackMapTable = new SegmentInfo("StackMapTable");
public final SegmentInfo stackmapTableOtherEntries = new SegmentInfo("StackMapTableOtherEntries");
diff --git a/third_party/cf_segments.tar.gz.sha1 b/third_party/cf_segments.tar.gz.sha1
index e4d4bec..7d32955 100644
--- a/third_party/cf_segments.tar.gz.sha1
+++ b/third_party/cf_segments.tar.gz.sha1
@@ -1 +1 @@
-2172e0b42550dd144958f9ead6d0310a68b43d65
\ No newline at end of file
+cd6068354ebd74e098011517576f09a375b324a3
\ No newline at end of file
