commit d4f8813fa10e667e304416eaf3cd52a6b347ac79
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 20 09:26:58 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 20 09:26:58 2018 +0000
tree 92cdf39bd32a30e9ffd02e34567084e569bc3c61
parent 70b75857bc9f0cf789a7a70d96208530ecb4946f
parent fc529cfe8f4dd09a8c01071705c7156be49604a6

Merge "Set class file version in VerticalClassMerger"

src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index 67a7eff..08722c3 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -707,7 +707,8 @@
           ParameterAnnotationsList.empty(),
           new SynthesizedCode(
               new ForwardMethodSourceCode(holder, proto, holder, invocationTarget, Type.DIRECT),
-              registry -> registry.registerInvokeDirect(invocationTarget)));
+              registry -> registry.registerInvokeDirect(invocationTarget)),
+          signature.hasClassFileVersion() ? signature.getClassFileVersion() : -1);
     }
 
     // Returns the method that shadows the given method, or null if method is not shadowed.