commit 444fcf2ecc5335f2bc14661e7d9c3463e30e43ff
author Jinseong Jeon <jsjeon@google.com> Fri Jun 08 21:45:00 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 08 21:45:00 2018 +0000
tree eb88929f893a738587df54a5981a0620837b0160
parent 9ec29c0286f059545b83ec20c9902669f1cd0bad
parent aa0df7d8f4b19e00eebc818f400ead224f617398

Merge "DexEncodedMethod.Builder: Also copy classFileVersion"

src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
index 5f0fb83..f8e82fb 100644
--- a/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
+++ b/src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
@@ -791,6 +791,7 @@
     private Code code;
     private CompilationState compilationState = CompilationState.NOT_PROCESSED;
     private OptimizationInfo optimizationInfo = DefaultOptimizationInfo.DEFAULT;
+    private final int classFileVersion;
 
     private Builder(DexEncodedMethod from) {
       // Copy all the mutable state of a DexEncodedMethod here.
@@ -801,6 +802,7 @@
       code = from.code;
       compilationState = from.compilationState;
       optimizationInfo = from.optimizationInfo.copy();
+      classFileVersion = from.classFileVersion;
     }
 
     public void setMethod(DexMethod method) {
@@ -817,7 +819,8 @@
       assert annotations != null;
       assert parameterAnnotations != null;
       DexEncodedMethod result =
-          new DexEncodedMethod(method, accessFlags, annotations, parameterAnnotations, code);
+          new DexEncodedMethod(
+              method, accessFlags, annotations, parameterAnnotations, code, classFileVersion);
       result.compilationState = compilationState;
       result.optimizationInfo = optimizationInfo;
       return result;