diff options
Diffstat (limited to 'src/proguard/optimize/info/ParameterUsageMarker.java')
| -rw-r--r-- | src/proguard/optimize/info/ParameterUsageMarker.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/proguard/optimize/info/ParameterUsageMarker.java b/src/proguard/optimize/info/ParameterUsageMarker.java index a2a264d..0061148 100644 --- a/src/proguard/optimize/info/ParameterUsageMarker.java +++ b/src/proguard/optimize/info/ParameterUsageMarker.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 @@ -89,7 +89,7 @@ implements MemberVisitor, // Must we mark the 'this' parameter? if (markThisParameter && - (accessFlags & ClassConstants.INTERNAL_ACC_STATIC) == 0) + (accessFlags & ClassConstants.ACC_STATIC) == 0) { // Mark the 'this' parameter. markParameterUsed(programMethod, 0); @@ -100,19 +100,19 @@ implements MemberVisitor, { // Mark all parameters, without the 'this' parameter. markUsedParameters(programMethod, - (accessFlags & ClassConstants.INTERNAL_ACC_STATIC) != 0 ? + (accessFlags & ClassConstants.ACC_STATIC) != 0 ? -1L : -2L); } // Is it a native method? - if ((accessFlags & ClassConstants.INTERNAL_ACC_NATIVE) != 0) + if ((accessFlags & ClassConstants.ACC_NATIVE) != 0) { // Mark all parameters. markUsedParameters(programMethod, -1L); } // Is it an abstract method? - else if ((accessFlags & ClassConstants.INTERNAL_ACC_ABSTRACT) != 0) + else if ((accessFlags & ClassConstants.ACC_ABSTRACT) != 0) { // Mark the 'this' parameter. markParameterUsed(programMethod, 0); @@ -123,10 +123,10 @@ implements MemberVisitor, { // Is the method not static, but synchronized, or can it have // other implementations, or is it a class instance initializer? - if ((accessFlags & ClassConstants.INTERNAL_ACC_STATIC) == 0 && - ((accessFlags & ClassConstants.INTERNAL_ACC_SYNCHRONIZED) != 0 || + if ((accessFlags & ClassConstants.ACC_STATIC) == 0 && + ((accessFlags & ClassConstants.ACC_SYNCHRONIZED) != 0 || programClass.mayHaveImplementations(programMethod) || - programMethod.getName(programClass).equals(ClassConstants.INTERNAL_METHOD_NAME_INIT))) + programMethod.getName(programClass).equals(ClassConstants.METHOD_NAME_INIT))) { // Mark the 'this' parameter. markParameterUsed(programMethod, 0); |