diff options
| author | Brian Carlstrom <bdc@google.com> | 2015-01-08 08:24:06 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2015-01-08 10:29:11 -0800 |
| commit | cd9e071098d0539dda3a4a5d3f45cfd8814de4ed (patch) | |
| tree | 9ac962825d41c4fb8ad1ec0fc2e8b441b42d3869 /src/proguard/optimize/peephole/MethodFinalizer.java | |
| parent | 9961286c06c25cd03464d3e2b00bd9b9dedf96ba (diff) | |
| download | proguard-cd9e071098d0539dda3a4a5d3f45cfd8814de4ed.tar.gz | |
Upgrade Proguard to 5.1.
Downloaded from:
http://sourceforge.net/projects/proguard/files/proguard/5.1/
Bug: 17550647
(cherry picked from commit 2270795fbe0b277bfd49f40950ecaa78583175cc)
Change-Id: I4d4c6b4f11aca8d5595b7f285c675bc5873d5e24
Diffstat (limited to 'src/proguard/optimize/peephole/MethodFinalizer.java')
| -rw-r--r-- | src/proguard/optimize/peephole/MethodFinalizer.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/proguard/optimize/peephole/MethodFinalizer.java b/src/proguard/optimize/peephole/MethodFinalizer.java index 89174ac..2ce3029 100644 --- a/src/proguard/optimize/peephole/MethodFinalizer.java +++ b/src/proguard/optimize/peephole/MethodFinalizer.java @@ -2,7 +2,7 @@ * ProGuard -- shrinking, optimization, obfuscation, and preverification * of Java bytecode. * - * Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu) + * Copyright (c) 2002-2014 Eric Lafortune (eric@graphics.cornell.edu) * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -22,7 +22,7 @@ package proguard.optimize.peephole; import proguard.classfile.*; import proguard.classfile.util.*; -import proguard.classfile.visitor.*; +import proguard.classfile.visitor.MemberVisitor; import proguard.optimize.KeepMarker; /** @@ -61,7 +61,7 @@ implements MemberVisitor // Implementations for MemberVisitor. - + public void visitProgramMethod(ProgramClass programClass, ProgramMethod programMethod) { String name = programMethod.getName(programClass); @@ -71,17 +71,17 @@ implements MemberVisitor // and its class is final, // or it is not being kept and it is not overridden, // then make it final. - if ((programMethod.u2accessFlags & (ClassConstants.INTERNAL_ACC_PRIVATE | - ClassConstants.INTERNAL_ACC_STATIC | - ClassConstants.INTERNAL_ACC_FINAL | - ClassConstants.INTERNAL_ACC_ABSTRACT)) == 0 && - !name.equals(ClassConstants.INTERNAL_METHOD_NAME_INIT) && - ((programClass.u2accessFlags & ClassConstants.INTERNAL_ACC_FINAL) != 0 || + if ((programMethod.u2accessFlags & (ClassConstants.ACC_PRIVATE | + ClassConstants.ACC_STATIC | + ClassConstants.ACC_FINAL | + ClassConstants.ACC_ABSTRACT)) == 0 && + !name.equals(ClassConstants.METHOD_NAME_INIT) && + ((programClass.u2accessFlags & ClassConstants.ACC_FINAL) != 0 || (!KeepMarker.isKept(programMethod) && (programClass.subClasses == null || !memberFinder.isOverriden(programClass, programMethod))))) { - programMethod.u2accessFlags |= ClassConstants.INTERNAL_ACC_FINAL; + programMethod.u2accessFlags |= ClassConstants.ACC_FINAL; // Visit the method, if required. if (extraMemberVisitor != null) |